rubber-generate 0.0.7 → 0.0.8

data/README.textile

@@ -1,6 +1,6 @@
 h1. Rubber Generate
 
-h2. v0.0.7
+h2. v0.0.8
  
 Template language for generating Ruby bindings for C libraries
 by Geoff Youngs <g@intersect-uk.co.uk>
@@ -20,6 +20,9 @@ functions and some rudimentary understanding of C code.
 
 h3. Changes
 
+ * 0.0.8 - 10th May 2010
+   - Add support for %min-version <MAJOR>.<MINOR>.<MICRO>
+
  * 0.0.7 - 7th May 2010
    - Add support for array constants (including autmatic type detection) - e.g array <ConstantName> = [ "Text", NULL, 3 ]
    - Add syntax_error function to parser which reports slightly more helpful syntax error messages for a .cr file

data/lib/rubber/scanner.rb

@@ -1,5 +1,6 @@
 require 'rubber/struct'
 module Rubber
+VERSION = [0,0,8]
 class ScanState
   define_members(:in_code, :in_class, :in_func, :braces)
 end
@@ -73,7 +74,7 @@ def scan(fp)
       break if off > @str.pos
       ind += 1
     end
-    p @state, @str, ind
+    #p @state, @str, ind
     raise
 end
 def _scan(fp)
@@ -114,6 +115,14 @@ def _scan(fp)
       func.text += " " if state.in_func
     elsif @str.skip(/%name */) # Extension name
       @ext = @str.scan(/[a-zA-Z0-9]+/)
+	elsif @str.skip(/%min-version */)
+	  @version = @str.scan(/([0-9]+)\.([0-9]+)\.([0-9])/)
+	  version = [1,2,3].map{|i|@str[i].to_i}
+	  Rubber::VERSION.each_with_index do |ver,idx|
+		  if ver < version[idx]
+			  misc_error "This version of rubber-generate (#{Rubber::VERSION}) is too old: #{@file} requires version #{version.map{|i|i.to_s}.join('.')}"
+		  end
+	  end
     elsif @str.skip(/%pkg-config\s*([-a-z.0-9+]+)/) # pkg-config library
       @pkgs ||= []
       @pkgs << @str[1]
@@ -363,7 +372,7 @@ def _scan(fp)
       @str.skip(/\s+/)
       if @str.scan(/([a-zA-Z_* ]+):/)
         returntype = @str[1]
-	  elsif @str.skip(/(GS?List){([^}]+)}:/)
+	  elsif @str.skip(/(GS?List)[{]([^}]+)[}]:/)
 		container = @str[1]
 		ct = @str[2]
 		cn = ct.gsub(/\s+/,'').gsub(/[*]/,'__p')
@@ -486,6 +495,15 @@ end
 	end
 	exit 1
   end
+  def misc_error(message)
+	STDERR.puts "Error: #{message} at line #{current_line}\n"
+	if @str.rest.size > 255
+		STDERR.puts @str.rest[0..255]+"..."
+	else
+		STDERR.puts @str.rest
+	end
+	exit 1
+  end
 
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Geoff Youngs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +01:00
+date: 2010-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: []