rubber-generate 0.0.13 → 0.0.15

data/bin/rubber-generate

@@ -6,6 +6,7 @@ else
   file = __FILE__
 end
 
+require 'fileutils'
 require 'rbconfig'
 require 'ftools'
 

data/lib/rubber/codegen/genum.rb

@@ -3,6 +3,7 @@ require 'rubber/codegen/enum'
 module Rubber
 
 class C_GEnum < C_Enum
+  attr_accessor :define_on_self
   define_members :name, :g_type, :prefix, :parent
   def init()
     ($custom_maps[name] ||= {})["VALUE"] = "GENUM2RVAL(%%, #{g_type})"
@@ -11,12 +12,14 @@ class C_GEnum < C_Enum
   def code(io)
   end
   def declare(io)
+	  io.puts " VALUE #{cname} = Qnil;"
   end
   include RegisterChildren
   def default_cname
-    "enum"+name
+    "genum"+name
   end
-  def get_root(); is_root? ? self : parent.get_root; end; def is_root?()
+  def get_root(); is_root? ? self : parent.get_root; end;
+  def is_root?()
     not parent.respond_to?(:fullname)
   end
   def doc_rd(io)
@@ -24,9 +27,14 @@ class C_GEnum < C_Enum
     io.puts "=#{'=' * depth} enum #{fullname}"
   end
   def register(io, already_defined=false)
-      io.puts "  G_DEF_CLASS(#{g_type}, #{name.inspect}, #{get_root.cname});"
-      io.puts "  G_DEF_CONSTANTS(#{parent.cname}, #{g_type}, #{prefix.inspect});"
-#    strip = args.first.length - splits.first.length 
+      io.puts "  #{cname} = G_DEF_CLASS(#{g_type}, #{name.inspect}, #{get_root.cname});"
+	  if @define_on_self
+     	 io.puts "  G_DEF_CONSTANTS(#{cname}, #{g_type}, #{prefix.inspect});"
+	  else
+     	 io.puts "  G_DEF_CONSTANTS(#{parent.cname}, #{g_type}, #{prefix.inspect});"
+	  end
+      #io.puts "  G_DEF_CONSTANTS(#{cname}, #{g_type}, #{prefix.inspect});"
+#    strip = args.first.length - splits.first.length
   end
 end
 

data/lib/rubber/mkextconf.rb

@@ -1,9 +1,27 @@
 
 module Rubber
 def generate_extconf(scanner, io)
-  if true
-    io.puts "require 'mkmf'"
-    io.puts "require 'mkmf-gnome2'" if scanner.pkgs
+	io << <<-EOMK
+require 'mkmf'
+
+begin
+  require 'mkmf-gnome2'
+rescue LoadError
+  require 'rubygems'
+  gem 'glib2'
+  require 'mkmf-gnome2'
+  %w[rbglib.h rbgtk.h rbpango.h rbatk.h].each do |header|
+  	Gem.find_files(header).each do |f|
+		$CFLAGS += " '-I\#{File.dirname(f)}'"
+	end
+  end
+end
+
+have_func("rb_errinfo")
+EOMK
+
+    #io.puts "require 'mkmf'"
+    #io.puts "require 'mkmf-gnome2'" if scanner.pkgs
     #io.puts "$defs ||= []"
 
     if scanner.inc_dirs
@@ -89,7 +107,6 @@ rescue Interrupt
 end
 
     EOB
-  end
 end
 module_function :generate_extconf
 end

data/lib/rubber/scanner.rb

@@ -1,6 +1,6 @@
 require 'rubber/struct'
 module Rubber
-VERSION = [0,0,13]
+VERSION = [0,0,15]
 def VERSION.to_s
 	self.map{|i|i.to_s}.join('.')
 end
@@ -269,14 +269,17 @@ def _scan(fp)
       @str.skip(/\s+/)
       g_type = @str.scan(/[A-Z][_0-9A-Z]*/)
       @str.skip(/\s+/)
-      prefix = @str.scan(/[A-Z][_0-9A-Z]*/)
+      prefix = @str.scan(/(prefix=)?[A-Z][_0-9A-Z]*/i).to_s.sub(/^prefix=/i,'')
+      @str.skip(/\s*/)
+      define_on_self = @str.scan(/define_on_self/)
       @str.skip(/\s*;/)
       if what == "gflags"
-        stack.last.classes.push(C_GFlags.new(name, g_type, prefix, stack.last))
+        obj = C_GFlags.new(name, g_type, prefix, stack.last)
       else
-        stack.last.classes.push(C_GEnum.new(name, g_type, prefix, stack.last))
-      end
-      
+        obj = C_GEnum.new(name, g_type, prefix, stack.last)
+		obj.define_on_self = !! define_on_self;
+	  end
+	  stack.last.classes.push(obj)
     elsif state.in_func == false and @str.skip(/(gobject|ginterface|gboxed)(?= )/x) # Class defn
       type=@str[1]
       @str.skip(/\s+/)
@@ -373,7 +376,7 @@ def _scan(fp)
       @class.post_func= @str[1] if @class.respond_to?(:post_func)
     elsif @str.skip(/def(?=\s+)/x) # Function defn
       @str.skip(/\s+/)
-      if @str.scan(/([a-zA-Z_* ]+):/)
+      if @str.scan(/([a-zA-Z_* 0-9]+):/)
         returntype = @str[1]
 	  elsif @str.skip(/(GS?List)[{]([^}]+)[}]:/)
 		container = @str[1]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber-generate
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Geoff Youngs
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 +01:00
-default_executable: 
+date: 2011-10-18 00:00:00 Z
 dependencies: []
 
 description: "    rubber-c-binder allows a rubyish means of generating bindings for C libraries,\n    including (but not limited to) GObject based libraries.\n\n    It allows C code to be written in the context of a ruby style class/method layout\n    and eases type checking and conversion between Ruby & C datatypes.\n"
@@ -29,32 +28,31 @@ extra_rdoc_files:
 - README.textile
 files: 
 - bin/rubber-generate
-- lib/rubber/mkextconf.rb
-- lib/rubber/codegen/enum.rb
-- lib/rubber/codegen/gobject.rb
-- lib/rubber/codegen/gcrefpool.rb
-- lib/rubber/codegen/class.rb
+- lib/rubber/codegen/param.rb
+- lib/rubber/codegen/ginterface.rb
 - lib/rubber/codegen/genum.rb
-- lib/rubber/codegen/gboxed.rb
-- lib/rubber/codegen/function.rb
-- lib/rubber/codegen/module.rb
-- lib/rubber/codegen/float.rb
-- lib/rubber/codegen/flags.rb
-- lib/rubber/codegen/array.rb
 - lib/rubber/codegen/gflags.rb
-- lib/rubber/codegen/struct.rb
+- lib/rubber/codegen/flags.rb
 - lib/rubber/codegen/string.rb
-- lib/rubber/codegen/ginterface.rb
-- lib/rubber/codegen/param.rb
+- lib/rubber/codegen/struct.rb
+- lib/rubber/codegen/module.rb
+- lib/rubber/codegen/gcrefpool.rb
+- lib/rubber/codegen/function.rb
+- lib/rubber/codegen/gboxed.rb
 - lib/rubber/codegen/integer.rb
+- lib/rubber/codegen/gobject.rb
+- lib/rubber/codegen/class.rb
+- lib/rubber/codegen/enum.rb
+- lib/rubber/codegen/array.rb
+- lib/rubber/codegen/float.rb
 - lib/rubber/autord.rb
-- lib/rubber/types.rb
-- lib/rubber/codegen.rb
 - lib/rubber/struct.rb
+- lib/rubber/mkextconf.rb
+- lib/rubber/codegen.rb
+- lib/rubber/types.rb
 - lib/rubber/scanner.rb
 - README.textile
 - example/vte.cr
-has_rdoc: true
 homepage: http://github.com/geoffyoungs/rubber-generate
 licenses: []
 
@@ -84,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Template language for generating Ruby bindings for C libraries