cgen 0.16.3 → 0.16.4

data/History.txt

@@ -1,3 +1,11 @@
+cgen 0.16.4
+
+  - api addition: module and symbol declarations can optionally be sent
+    to other file rather than libmain; this supports better separate
+    compilation (in redshift)
+
+  - generated main file is now called libmain.c
+  
 cgen 0.16.3
 
   - misc fixes for 1.9 compatibility

data/lib/cgen/cgen.rb

@@ -418,7 +418,7 @@ require 'cgen/inherit'
 # way that makes clear that the problem is really with commit.
 module CGenerator
 
-VERSION = '0.16.3'
+VERSION = '0.16.4'
 
 class Accumulator ## should be a mixin? "Cumulative"?
 
@@ -614,7 +614,7 @@ class Library < Template
         "\n  Name must be a C identifier."
     end
     
-    @include_file, @source_file = add_file name
+    @include_file, @source_file = add_file "libmain"
     @include_file.include '<ruby.h>'
     
     @init_library_function = define_c_function "Init_" + name
@@ -886,18 +886,23 @@ class Library < Template
   def makedepend
     return if /mswin/i =~ RUBY_PLATFORM ## what else can we do?
     build_wrapper do
+      cpat = "*.c"
+      chpat = "*.[ch]"
+      dep = "depend"
+      return if Dir[cpat].all? {|f| test ?<, f, dep}
+      
       cfg = Config::CONFIG
       dirs = [cfg["sitearchdir"], cfg["archdir"], cfg["includedir"]]
       
       case cfg["CC"]
       when /gcc/
         makedepend_cmd =
-          "#{cfg["CC"]} -MM *.c -I#{dirs.join " -I"} >depend 2>#{@logname}"
+          "#{cfg["CC"]} -MM #{cpat} -I#{dirs.join " -I"} >#{dep} 2>#{@logname}"
       
       else
         makedepend_cmd =
-          "touch depend && \
-          makedepend -fdepend *.c -I#{dirs.join " -I"} >#{@logname} 2>&1"
+          "touch #{dep} && \
+          makedepend -f#{dep} #{cpat} -I#{dirs.join " -I"} >#{@logname} 2>&1"
       end
 
       result = system makedepend_cmd
@@ -1028,6 +1033,7 @@ class Library < Template
       c_name  = spec[:c_name]
       mod     = spec[:mod]
       rb_name = spec[:rb_name]
+      cfile   = spec[:cfile]
       
       meth_rec =
         if c_name
@@ -1047,7 +1053,7 @@ class Library < Template
         
         kind = @name.to_s.sub(/\Arb_define_/, "")
         if mod
-          meth_rec[:mod_c_name] ||= @parent.declare_module(mod)  ## @parent ?
+          meth_rec[:mod_c_name] ||= @parent.declare_module(mod, cfile)  ## @parent ?
           meth_rec[:c_name] ||=
             ("#{CGenerator::make_c_name rb_name}" +
              "_#{meth_rec[:mod_c_name]}_#{kind}").intern
@@ -1200,20 +1206,20 @@ class Library < Template
   #
   # The second declaration notices that the library already has a variable that
   # will be initialized to the ID of the symbol, and uses it.
-  def declare_module mod
+  def declare_module mod, cfile = nil
     c_name = "module_#{CGenerator::make_c_name mod.to_s}"
     declare mod => "VALUE #{c_name}"
-    declare_extern mod => "extern VALUE #{c_name}"
+    (cfile || self).declare_extern mod => "extern VALUE #{c_name}"
     setup mod => "#{c_name} = rb_path2class(\"#{mod}\")"
     c_name.intern
   end
   alias declare_class declare_module
   
   # See #declare_module.
-  def declare_symbol sym
+  def declare_symbol sym, cfile = nil
     c_name = "ID_#{CGenerator::make_c_name sym}"
     declare sym => "ID #{c_name}"
-    declare_extern sym => "extern ID #{c_name}"
+    (cfile || self).declare_extern sym => "extern ID #{c_name}"
     setup sym => "#{c_name} = rb_intern(\"#{sym}\")"
     c_name.intern
   end
@@ -1221,10 +1227,10 @@ class Library < Template
   # Like Library#declare_symbol, but converts the ID to a VALUE at library
   # initialization time. Useful for looking up hash values keyed by symbol
   # objects, for example. +sym+ is a string or symbol.
-  def literal_symbol sym
+  def literal_symbol sym, cfile = nil
     c_name = "SYM_#{CGenerator::make_c_name sym}"
     declare sym => "VALUE #{c_name}"
-    declare_extern sym => "extern VALUE #{c_name}"
+    (cfile || self).declare_extern sym => "extern VALUE #{c_name}"
     setup sym => "#{c_name} = ID2SYM(rb_intern(\"#{sym}\"))"
     c_name.intern
   end
@@ -1328,10 +1334,10 @@ class CFile < CFragment
   
   attr_reader :include_file
   
-  def initialize name, library, include_file = nil
+  def initialize name, library, include_file = nil, bare = !!include_file
     super name, library
     @include_file = include_file
-    if include_file
+    if bare
       add preamble!, include!, declare!, define!
     else
       ## it's a little hacky to decide in this way that this is a .h file
@@ -1416,7 +1422,7 @@ class CFile < CFragment
     unless subclass <= Method ## should use assert
       raise "#{subclass.name} is not <= Method"
     end
-    c_name = library.rb_define_method :mod => mod, :rb_name => name
+    c_name = rb_define_method :mod => mod, :rb_name => name, :cfile => self
     define c_name, subclass
   end
   
@@ -1424,7 +1430,7 @@ class CFile < CFragment
   # Used to break large projects up into many files.
   def define_c_module_function mod, name, subclass = ModuleFunction
     raise unless subclass <= ModuleFunction
-    c_name = library.rb_define_module_function :mod => mod, :rb_name => name
+    c_name = rb_define_module_function :mod => mod, :rb_name => name, :cfile => self
     define c_name, subclass
   end
   
@@ -1432,7 +1438,7 @@ class CFile < CFragment
   # Used to break large projects up into many files.
   def define_c_global_function name, subclass = GlobalFunction
     raise unless subclass <= GlobalFunction
-    c_name = library.rb_define_global_function :rb_name => name
+    c_name = rb_define_global_function :rb_name => name, :cfile => self
     define c_name, subclass
   end
   
@@ -1440,13 +1446,13 @@ class CFile < CFragment
   # Used to break large projects up into many files.
   def define_c_singleton_method mod, name, subclass = SingletonMethod
     raise unless subclass <= SingletonMethod
-    c_name = library.rb_define_singleton_method :mod => mod, :rb_name => name
+    c_name = rb_define_singleton_method :mod => mod, :rb_name => name, :cfile => self
     define c_name, subclass
   end
   alias define_c_class_method define_c_singleton_method
   
   def define_alloc_func klass
-    klass_c_name = declare_class klass
+    klass_c_name = declare_class klass, self # cfile
     c_name = "alloc_func_#{klass_c_name}"
     library.init_library_function.body \
       %{rb_define_alloc_func(#{klass_c_name}, #{c_name})}

data/rakefile

@@ -11,9 +11,7 @@ Bones {
   name            'cgen'
   authors         'Joel VanderWerf'
   email           'vjoel@users.sourceforge.net'
-#  url             'http://rubyforge.org/projects/cgen'
-#  url             'http://rubygems.org/gems/cgen'
-  url          'http://gemcutter.org/gems/cgen'
+  url             'http://rubyforge.org/projects/cgen'
   rubyforge.name  'cgen'
   version         CGenerator::VERSION
   readme_file     'README.txt'
@@ -32,6 +30,8 @@ END
   test.files = Dir["test/test-*.rb"]
 }
 
+task 'gem:release' => 'rubyforge:release' # to release to rubyforge as well
+
 task :release => ["rubyforge:release", "rubyforge:doc_release"]
 
 # EOF

data/test/test-attribute.rb

@@ -53,6 +53,12 @@ class ObjectAttributeTest < AttributeTest
   def make_thing c
     @oas.x = c.new
   end
+  
+  def make_things c, n
+    10.times do
+      make_thing c
+    end
+  end
 
   def trash_thing
     @oas.x = nil
@@ -62,9 +68,8 @@ class ObjectAttributeTest < AttributeTest
     @oas = ObjectAttributeSample.new
     c = Class.new
 
-    10.times do
-      make_thing c
-    end
+    make_things c, 10
+
     GC.start
     assert_equal(1, ObjectSpace.each_object(c) {})
   end
@@ -130,6 +135,12 @@ class ShadowObjectAttributeTest < AttributeTest
   def make_thing c
     @sas.x = c.new
   end
+  
+  def make_things c, n
+    n.times do
+      make_thing c
+    end
+  end
 
   def trash_thing
     @sas.x = nil
@@ -141,9 +152,7 @@ class ShadowObjectAttributeTest < AttributeTest
 
     GC.start
     n = ObjectSpace.each_object(c) {}
-    10.times do
-      make_thing c
-    end
+    make_things c, 10
     GC.start
     assert_equal(n+1, ObjectSpace.each_object(c) {})
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cgen
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 16
-  - 3
-  version: 0.16.3
+  - 4
+  version: 0.16.4
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -07:00
+date: 2010-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 25
         segments: 
         - 3
         - 4
-        - 3
-        version: 3.4.3
+        - 7
+        version: 3.4.7
   type: :development
   version_requirements: *id001
 description: |
@@ -89,7 +89,7 @@ files:
 - test/test-cshadow.rb
 - test/test.rb
 has_rdoc: true
-homepage: http://gemcutter.org/gems/cgen
+homepage: http://rubyforge.org/projects/cgen
 licenses: []
 
 post_install_message: