RubyInline 3.6.2 → 3.6.3

data/History.txt

@@ -1,6 +1,20 @@
+*** 3.6.3 / 2007-04-27
+
++ 7 minor enhancements:
+	Added map_ruby_const and map_c_const to C builder.
+	Converted example.rb to a real benchmark setup.
+	Improved error messages.
+	Added options hash for all C builder methods.
+	Options hash can take optional :method_name param to have ruby name diff from c.
+	Converted to a more traditional setup. Now I can heckle!
+	Cleaned up ruby.h search.
++ 2 bug fixes:
+    Added CCDLFLAGS. _Should_ pick up -fPIC on misconfigured 64 bit machines.
+	Broke up all warnings so progress report was cleaner.
+
 *** 3.6.2 / 2006-10-12
 
-+ 2 bug fixes
++ 2 bug fixes:
 	+ comment stripper much more sane to fix problems on certain linux distros
 	+ fixed a nit with older C compilers.
 

data/Manifest.txt

@@ -2,12 +2,12 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/inline_package
 demo/fastmath.rb
 demo/hello.rb
 example.rb
 example2.rb
-inline.rb
-inline_package
-test_inline.rb
+lib/inline.rb
+test/test_inline.rb
 tutorial/example1.rb
 tutorial/example2.rb

data/README.txt

@@ -1,8 +1,7 @@
 ** Ruby Inline
 
-    http://www.zenspider.com/ZSS/Products/RubyInline/
     http://rubyforge.org/projects/rubyinline/
-    support@zenspider.com
+    http://www.zenspider.com/ZSS/Products/RubyInline/
 
 ** DESCRIPTION:
 

data/Rakefile

@@ -3,44 +3,28 @@
 require 'rubygems'
 require 'hoe'
 
-require './inline.rb'
+require './lib/inline.rb'
 
 Hoe.new("RubyInline", Inline::VERSION) do |p|
   p.summary = "Multi-language extension coding within ruby."
   p.description = p.paragraphs_of("README.txt", 3).join
+  p.url = p.paragraphs_of("README.txt", 1).join
   p.changes = p.paragraphs_of("History.txt", 0..1).join
   p.clean_globs << File.expand_path("~/.ruby_inline")
 
   p.spec_extras[:requirements] = "A POSIX environment and a compiler for your language."
-  p.spec_extras[:require_paths] = ["."]
-
-  p.lib_files = %w(inline.rb)
-  p.test_files = %w(test_inline.rb)
-  p.bin_files = %w(inline_package)
 end
 
 task :examples do
   %w(example.rb example2.rb tutorial/example1.rb tutorial/example2.rb).each do |e|
     rm_rf '~/.ruby_inline'
-    ruby "-I. -w #{e}"
+    ruby "-Ilib -w #{e}"
   end
 end
 
 task :bench do
   verbose(false) do
-    puts "Running native"
-    ruby "-I. ./example.rb 3"
-    puts "Running primer - preloads the compiler and stuff"
-    rm_rf '~/.ruby_inline'
-    ruby "-I. ./example.rb 0"
-    puts "With full builds"
-    (0..2).each do |i|
-      rm_rf '~/.ruby_inline'
-      ruby "-I. ./example.rb #{i}"
-    end
-    puts "Without builds"
-    (0..2).each do |i|
-      ruby "-I. ./example.rb #{i}"
-    end
+    ruby "-Ilib ./example.rb"
+    ruby "-Ilib ./example.rb 1000000 12" # 12 is the bignum cutoff for factorial
   end
 end

data/example.rb

@@ -1,6 +1,10 @@
 #!/usr/local/bin/ruby -w
 
-begin require 'rubygems' rescue LoadError end
+begin
+  require 'rubygems'
+rescue LoadError
+  $: << 'lib'
+end
 require 'inline'
 
 class MyTest
@@ -30,45 +34,53 @@ class MyTest
   end
 end
 
-t = MyTest.new()
-
-arg = ARGV.shift || 0
-arg = arg.to_i
-
 # breakeven for build run vs native doing 5 factorial:
 #   on a PIII/750 running FreeBSD:        about 5000
 #   on a PPC/G4/800 running Mac OSX 10.2: always faster
-max = ARGV.shift || 1000000
-max = max.to_i
 
+require 'benchmark'
 puts "RubyInline #{Inline::VERSION}" if $DEBUG
 
 MyTest.send(:alias_method, :factorial_alias, :factorial_c_raw)
 
-def validate(n)
-  if n != 120 then puts "ACK! - #{n}"; end
-end
+t = MyTest.new()
+max = (ARGV.shift || 1_000_000).to_i
+n   = (ARGV.shift || 5).to_i
+m   = t.factorial(n)
 
-tstart = Time.now
-case arg
-when 0 then
-  type = "Inline C "
-  (1..max).each { |m| n = t.factorial_c(5);     validate(n); }
-when 1 then
-  type = "InlineRaw"
-  (1..max).each { |m| n = t.factorial_c_raw(5); validate(n); }
-when 2 then
-  type = "Alias    "
-  (1..max).each { |m| n = t.factorial_alias(5); validate(n); }
-when 3 then
-  type = "Native   "
-  (1..max).each { |m| n = t.factorial(5);       validate(n); }
-else
-  $stderr.puts "ERROR: argument #{arg} not recognized"
-  exit(1)
+def validate(n, m)
+  if n != m then raise "#{n} != #{m}"; end
 end
-tend = Time.now
 
-total = tend - tstart
-avg = total / max
-printf "Type = #{type}, Iter = #{max}, T = %.8f sec, %.8f sec / iter\n", total, avg
+puts "# of iterations = #{max}, n = #{n}"
+Benchmark::bm(20) do |x|
+  x.report("null_time") do
+    for i in 0..max do
+      # do nothing
+    end
+  end
+
+  x.report("c") do
+    for i in 0..max do
+      validate(t.factorial_c(n), m)
+    end
+  end
+
+  x.report("c-raw") do
+    for i in 0..max do
+      validate(t.factorial_c_raw(n), m)
+    end
+  end
+
+  x.report("c-alias") do
+    for i in 0..max do
+      validate(t.factorial_alias(n), m)
+    end
+  end
+
+  x.report("pure ruby") do
+    for i in 0..max do
+      validate(t.factorial(n), m)
+    end
+  end
+end

data/example2.rb

@@ -1,6 +1,11 @@
 #!/usr/local/bin/ruby17 -w
 
-require "inline"
+begin
+  require 'rubygems'
+rescue LoadError
+  $: << 'lib'
+end
+require 'inline'
 
 class MyTest
 

data/{inline.rb → lib/inline.rb}

@@ -19,9 +19,9 @@
 #       }
 #     end
 #   end
-# 
+#
 # = DESCRIPTION
-# 
+#
 # Inline allows you to write foreign code within your ruby code. It
 # automatically determines if the code in question has changed and
 # builds it only when necessary. The extensions are then automatically
@@ -51,8 +51,8 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.6.2'
-  
+  VERSION = '3.6.3'
+
   WINDOZE  = /win32/ =~ RUBY_PLATFORM
   DEV_NULL = (WINDOZE ? 'nul' : '/dev/null')
   RAKE     = (WINDOZE ? 'rake.cmd' : 'rake')
@@ -84,8 +84,8 @@ module Inline
     directory = File.join(rootdir, ".ruby_inline")
     unless defined? @@directory and directory == @@directory and test ?d, @@directory then
       unless File.directory? directory then
-	$stderr.puts "NOTE: creating #{directory} for RubyInline" if $DEBUG
-	Dir.mkdir directory, 0700
+        $stderr.puts "NOTE: creating #{directory} for RubyInline" if $DEBUG
+        Dir.mkdir directory, 0700
       end
       Dir.assert_secure directory
       @@directory = directory
@@ -97,8 +97,8 @@ module Inline
   # Inline. It can be used as a template to write builders for other
   # languages. It understands type-conversions for the basic types and
   # can be extended as needed.
-  
-  class C 
+
+  class C
 
     protected unless $TESTING
 
@@ -109,23 +109,23 @@ module Inline
       'char'          => [ 'NUM2CHR',  'CHR2FIX' ],
       'char *'        => [ 'STR2CSTR', 'rb_str_new2' ],
       'double'        => [ 'NUM2DBL',  'rb_float_new' ],
-      'int'           => [ 'FIX2INT',  'INT2FIX' ],
+      'int'           => [ 'F'+'IX2INT',  'INT2FIX' ],
       'long'          => [ 'NUM2INT',  'INT2NUM' ],
       'unsigned int'  => [ 'NUM2UINT', 'UINT2NUM' ],
       'unsigned long' => [ 'NUM2UINT', 'UINT2NUM' ],
       'unsigned'      => [ 'NUM2UINT', 'UINT2NUM' ],
       'VALUE'         => [ '', '' ],
       # Can't do these converters because they conflict with the above:
-      # ID2SYM(x), SYM2ID(x), NUM2DBL(x), FIX2UINT(x)
+      # ID2SYM(x), SYM2ID(x), NUM2DBL(x), F\IX2UINT(x)
     }
 
     def ruby2c(type)
-      raise ArgumentError, "Unknown type #{type}" unless @@type_map.has_key? type
+      raise ArgumentError, "Unknown type #{type.inspect}" unless @@type_map.has_key? type
       @@type_map[type].first
     end
 
     def c2ruby(type)
-      raise ArgumentError, "Unknown type #{type}" unless @@type_map.has_key? type
+      raise ArgumentError, "Unknown type #{type.inspect}" unless @@type_map.has_key? type
       @@type_map[type].last
     end
 
@@ -137,7 +137,7 @@ module Inline
       src = src.gsub(%r%[ \t]*//[^\n]*%, '')
       src
     end
-    
+
     def parse_signature(src, raw=false)
 
       sig = self.strip_comments(src)
@@ -153,29 +153,29 @@ module Inline
       end
 
       if /(#{@types})\s*(\w+)\s*\(([^)]*)\)/ =~ sig then
-	return_type, function_name, arg_string = $1, $2, $3
-	args = []
-	arg_string.split(',').each do |arg|
-
-	  # helps normalize into 'char * varname' form
-	  arg = arg.gsub(/\s*\*\s*/, ' * ').strip
-
-	  if /(((#{@types})\s*\*?)+)\s+(\w+)\s*$/ =~ arg then
-	    args.push([$4, $1])
-	  elsif arg != "void" then
-	    $stderr.puts "WARNING: '#{arg}' not understood"
-	  end
-	end
-
-	arity = args.size
-	arity = MAGIC_ARITY if raw
-
-	return {
-	  'return' => return_type,
-	    'name' => function_name,
-	    'args' => args,
-	   'arity' => arity
-	}
+        return_type, function_name, arg_string = $1, $2, $3
+        args = []
+        arg_string.split(',').each do |arg|
+
+          # helps normalize into 'char * varname' form
+          arg = arg.gsub(/\s*\*\s*/, ' * ').strip
+
+          if /(((#{@types})\s*\*?)+)\s+(\w+)\s*$/ =~ arg then
+            args.push([$4, $1])
+          elsif arg != "void" then
+            $stderr.puts "WAR\NING: '#{arg}' not understood"
+          end
+        end
+
+        arity = args.size
+        arity = MAGIC_ARITY if raw
+
+        return {
+          'return' => return_type,
+          'name'   => function_name,
+          'args'   => args,
+          'arity'  => arity
+        }
       end
 
       raise SyntaxError, "Can't parse signature: #{sig}"
@@ -190,46 +190,47 @@ module Inline
 
       signature = parse_signature(src, !expand_types)
       function_name = signature['name']
+      method_name = options[:method_name] || function_name
       return_type = signature['return']
       arity = signature['arity']
 
       raise ArgumentError, "too many arguments" if arity > MAGIC_ARITY_THRESHOLD
 
       if expand_types then
-	prefix = "static VALUE #{function_name}("
-	if arity == MAGIC_ARITY then
-	  prefix += "int argc, VALUE *argv, VALUE self"
-	else
-	  prefix += "VALUE self"
+        prefix = "static VALUE #{function_name}("
+        if arity == MAGIC_ARITY then
+          prefix += "int argc, VALUE *argv, VALUE self"
+        else
+          prefix += "VALUE self"
           prefix += signature['args'].map { |arg, type| ", VALUE _#{arg}"}.join
-	end
-	prefix += ") {\n"
+        end
+        prefix += ") {\n"
         prefix += signature['args'].map { |arg, type|
           "  #{type} #{arg} = #{ruby2c(type)}(_#{arg});\n"
         }.join
 
-	# replace the function signature (hopefully) with new sig (prefix)
-	result.sub!(/[^;\/\"\>]+#{function_name}\s*\([^\{]+\{/, "\n" + prefix)
-	result.sub!(/\A\n/, '') # strip off the \n in front in case we added it
-	unless return_type == "void" then
-	  raise SyntaxError, "Couldn't find return statement for #{function_name}" unless 
-	    result =~ /return/ 
-	  result.gsub!(/return\s+([^\;\}]+)/) do
-	    "return #{c2ruby(return_type)}(#{$1})"
-	  end
-	else
-	  result.sub!(/\s*\}\s*\Z/, "\nreturn Qnil;\n}")
-	end
+        # replace the function signature (hopefully) with new sig (prefix)
+        result.sub!(/[^;\/\"\>]+#{function_name}\s*\([^\{]+\{/, "\n" + prefix)
+        result.sub!(/\A\n/, '') # strip off the \n in front in case we added it
+        unless return_type == "void" then
+          raise SyntaxError, "Couldn't find return statement for #{function_name}" unless
+            result =~ /return/
+          result.gsub!(/return\s+([^\;\}]+)/) do
+            "return #{c2ruby(return_type)}(#{$1})"
+          end
+        else
+          result.sub!(/\s*\}\s*\Z/, "\nreturn Qnil;\n}")
+        end
       else
-	prefix = "static #{return_type} #{function_name}("
-	result.sub!(/[^;\/\"\>]+#{function_name}\s*\(/, prefix)
-	result.sub!(/\A\n/, '') # strip off the \n in front in case we added it
+        prefix = "static #{return_type} #{function_name}("
+        result.sub!(/[^;\/\"\>]+#{function_name}\s*\(/, prefix)
+        result.sub!(/\A\n/, '') # strip off the \n in front in case we added it
       end
 
       delta = if result =~ /\A(static.*?\{)/m then
                 $1.split(/\n/).size
               else
-                warn "WARNING: Can't find signature in #{result.inspect}\n" unless $TESTING
+                warn "WAR\NING: Can't find signature in #{result.inspect}\n" unless $TESTING
                 0
               end
 
@@ -237,7 +238,7 @@ module Inline
       result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless $DEBUG and not $TESTING
 
       @src << result
-      @sig[function_name] = [arity,singleton]
+      @sig[function_name] = [arity,singleton,method_name]
 
       return result if $TESTING
     end # def generate
@@ -291,7 +292,7 @@ module Inline
         file = File.join("inline", File.basename(so_name))
         if require file then
           dir = Inline.directory
-          warn "WARNING: #{dir} exists but is not being used" if test ?d, dir
+          warn "WAR\NING: #{dir} exists but is not being used" if test ?d, dir
           return true
         end
       rescue LoadError
@@ -313,21 +314,21 @@ module Inline
       so_name = self.so_name
       so_exists = File.file? so_name
       unless so_exists and File.mtime(rb_file) < File.mtime(so_name)
-	
-	src_name = "#{Inline.directory}/#{module_name}.c"
-	old_src_name = "#{src_name}.old"
-	should_compare = File.write_with_backup(src_name) do |io|
-	  io.puts
-	  io.puts "#include \"ruby.h\""
-	  io.puts
-	  io.puts @src.join("\n\n")
-	  io.puts
-	  io.puts
-	  io.puts "#ifdef __cplusplus"
-	  io.puts "extern \"C\" {"
-	  io.puts "#endif"
+
+        src_name = "#{Inline.directory}/#{module_name}.c"
+        old_src_name = "#{src_name}.old"
+        should_compare = File.write_with_backup(src_name) do |io|
+          io.puts
+          io.puts "#include \"ruby.h\""
+          io.puts
+          io.puts @src.join("\n\n")
+          io.puts
+          io.puts
+          io.puts "#ifdef __cplusplus"
+          io.puts "extern \"C\" {"
+          io.puts "#endif"
           io.puts "  __declspec(dllexport)" if WINDOZE
-	  io.puts "  void Init_#{module_name}() {"
+          io.puts "  void Init_#{module_name}() {"
           io.puts "    VALUE c = rb_cObject;"
 
           # TODO: use rb_class2path
@@ -335,71 +336,53 @@ module Inline
             "    c = rb_const_get_at(c,rb_intern(\"#{n}\"));"
           }.join("\n")
 
-	  @sig.keys.sort.each do |name|
-	    arity, singleton = @sig[name]
+          @sig.keys.sort.each do |name|
+            arity, singleton, method_name = @sig[name]
             if singleton then
-              io.print "    rb_define_singleton_method(c, \"#{name}\", "
+              io.print "    rb_define_singleton_method(c, \"#{method_name}\", "
             else
-	      io.print "    rb_define_method(c, \"#{name}\", "
+              io.print "    rb_define_method(c, \"#{method_name}\", "
             end
-	    io.puts  "(VALUE(*)(ANYARGS))#{name}, #{arity});"
-	  end
-
+            io.puts  "(VALUE(*)(ANYARGS))#{name}, #{arity});"
+          end
           io.puts @init_extra.join("\n") unless @init_extra.empty?
 
-	  io.puts
-	  io.puts "  }"
-	  io.puts "#ifdef __cplusplus"
-	  io.puts "}"
-	  io.puts "#endif"
-	  io.puts
-	end
-
-	# recompile only if the files are different
-	recompile = true
-	if so_exists and should_compare and
+          io.puts
+          io.puts "  }"
+          io.puts "#ifdef __cplusplus"
+          io.puts "}"
+          io.puts "#endif"
+          io.puts
+        end
+
+        # recompile only if the files are different
+        recompile = true
+        if so_exists and should_compare and
             File::compare(old_src_name, src_name, $DEBUG) then
-	  recompile = false
+          recompile = false
 
-	  # Updates the timestamps on all the generated/compiled files.
-	  # Prevents us from entering this conditional unless the source
-	  # file changes again.
+          # Updates the timestamps on all the generated/compiled files.
+          # Prevents us from entering this conditional unless the source
+          # file changes again.
           t = Time.now
-	  File.utime(t, t, src_name, old_src_name, so_name)
-	end
-
-	if recompile then
-
-	  # extracted from mkmf.rb
-	  srcdir  = Config::CONFIG["srcdir"]
-	  archdir = Config::CONFIG["archdir"]
-	  if File.exist? archdir + "/ruby.h" then
-	    hdrdir = archdir
-	  elsif File.exist? srcdir + "/ruby.h" then
-	    hdrdir = srcdir
-	  else
-	    $stderr.puts "ERROR: Can't find header files for ruby. Exiting..."
-	    exit 1
-	  end
-
-	  flags = @flags.join(' ')
-	  libs  = @libs.join(' ')
-
-         cmd = "#{Config::CONFIG['LDSHARED']} #{flags} #{Config::CONFIG['CFLAGS']} -I #{hdrdir} -o \"#{so_name}\" \"#{File.expand_path(src_name)}\" #{libs}"
-	  
-          # gawd windoze land sucks
-          case RUBY_PLATFORM
-          when /mswin32/ then
-            cmd += " -link /LIBPATH:\"#{Config::CONFIG['libdir']}\" /DEFAULTLIB:\"#{Config::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
-          when /mingw32/ then
-            cmd += " -Wl,--enable-auto-import -L#{Config::CONFIG['libdir']} -lmsvcrt-ruby18"
-          when /i386-cygwin/ then
-            cmd += ' -L/usr/local/lib -lruby.dll'
-          end
+          File.utime(t, t, src_name, old_src_name, so_name)
+        end
+
+        if recompile then
+
+          hdrdir = %w(srcdir archdir).map { |name|
+            dir = Config::CONFIG[name]
+          }.find { |dir|
+            dir and File.exist? File.join(dir, "/ruby.h")
+          } or abort "ERROR: Can't find header dir for ruby. Exiting..."
 
+          flags = @flags.join(' ')
+          libs  = @libs.join(' ')
+
+          cmd = "#{Config::CONFIG['LDSHARED']} #{flags} #{Config::CONFIG['CCDLFLAGS']} #{Config::CONFIG['CFLAGS']} -I #{hdrdir} -I #{Config::CONFIG['includedir']} -o \"#{so_name}\" \"#{File.expand_path(src_name)}\" #{libs}" + crap_for_windoze
           cmd += " 2> #{DEV_NULL}" if $TESTING and not $DEBUG
-	  
-	  $stderr.puts "Building #{so_name} with '#{cmd}'" if $DEBUG
+
+          $stderr.puts "Building #{so_name} with '#{cmd}'" if $DEBUG
           result = `#{cmd}`
           $stderr.puts "Output:\n#{result}" if $DEBUG
           if $? != 0 then
@@ -420,19 +403,36 @@ module Inline
             end
           end
 
-	  $stderr.puts "Built successfully" if $DEBUG
-	end
+          $stderr.puts "Built successfully" if $DEBUG
+        end
 
       else
-	$stderr.puts "#{so_name} is up to date" if $DEBUG
+        $stderr.puts "#{so_name} is up to date" if $DEBUG
       end # unless (file is out of date)
     end # def build
-      
+
+    ##
+    # Returns extra compilation flags for windoze platforms. Ugh.
+
+    def crap_for_windoze
+      # gawd windoze land sucks
+      case RUBY_PLATFORM
+      when /mswin32/ then
+        " -link /LIBPATH:\"#{Config::CONFIG['libdir']}\" /DEFAULTLIB:\"#{Config::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
+      when /mingw32/ then
+        " -Wl,--enable-auto-import -L#{Config::CONFIG['libdir']} -lmsvcrt-ruby18"
+      when /i386-cygwin/ then
+        ' -L/usr/local/lib -lruby.dll'
+      else
+        ''
+      end
+    end
+
     ##
     # Adds compiler options to the compiler command line.  No
     # preprocessing is done, so you must have all your dashes and
     # everything.
-    
+
     def add_compile_flags(*flags)
       @flags.push(*flags)
     end
@@ -440,7 +440,7 @@ module Inline
     ##
     # Adds linker flags to the link command line.  No preprocessing is
     # done, so you must have all your dashes and everything.
-    
+
     def add_link_flags(*flags)
       @libs.push(*flags)
     end
@@ -454,61 +454,93 @@ module Inline
 
     ##
     # Registers C type-casts +r2c+ and +c2r+ for +type+.
-    
+
     def add_type_converter(type, r2c, c2r)
-      $stderr.puts "WARNING: overridding #{type} on #{caller[0]}" if @@type_map.has_key? type
+      $stderr.puts "WAR\NING: overridding #{type} on #{caller[0]}" if @@type_map.has_key? type
       @@type_map[type] = [r2c, c2r]
     end
 
+    ##
+    # Maps a ruby constant to C (with the same name)
+
+    def map_ruby_const(*names)
+      names.each do |name|
+        self.prefix "static VALUE #{name};"
+        self.add_to_init "    #{name} = rb_const_get(c, rb_intern(#{name.to_s.inspect}));"
+      end
+    end
+
+    ##
+    # Maps a C constant to ruby (with the same
+    # name). +names_and_types+ is a hash that maps the name of the
+    # constant to its C type.
+
+    def map_c_const(names_and_types)
+      names_and_types.each do |name, typ|
+        self.add_to_init "    rb_define_const(c, #{name.to_s.inspect}, #{c2ruby(typ.to_s)}(#{name}));"
+      end
+    end
+
     ##
     # Adds an include to the top of the file. Don't forget to use
     # quotes or angle brackets.
-    
+
     def include(header)
       @src << "#include #{header}"
     end
 
     ##
     # Adds any amount of text/code to the source
-    
+
     def prefix(code)
       @src << code
     end
 
     ##
     # Adds a C function to the source, including performing automatic
-    # type conversion to arguments and the return value. Unknown type
-    # conversions can be extended by using +add_type_converter+.
-    
-    def c src
-      self.generate(src,:expand_types=>true)
+    # type conversion to arguments and the return value. The Ruby
+    # method name can be overridden by providing method_name. Unknown
+    # type conversions can be extended by using +add_type_converter+.
+
+    def c src, options = {}
+      options = {
+        :expand_types => true,
+      }.merge options
+      self.generate src, options
     end
 
     ##
     # Same as +c+, but adds a class function.
-    
-    def c_singleton src
-      self.generate(src,:expand_types=>true,:singleton=>true)
+
+    def c_singleton src, options = {}
+      options = {
+        :expand_types => true,
+        :singleton    => true,
+      }.merge options
+      self.generate src, options
     end
-    
+
     ##
     # Adds a raw C function to the source. This version does not
     # perform any type conversion and must conform to the ruby/C
-    # coding conventions.
-    
-    def c_raw src
-      self.generate(src)
+    # coding conventions.  The Ruby method name can be overridden
+    # by providing method_name.
+
+    def c_raw src, options = {}
+      self.generate src, options
     end
 
     ##
     # Same as +c_raw+, but adds a class function.
-    
-    def c_raw_singleton src
-      self.generate(src, :singleton=>true)
+
+    def c_raw_singleton src, options = {}
+      options = {
+        :singleton => true,
+      }.merge options
+      self.generate src, options
     end
 
   end # class Inline::C
-
   class Packager
     attr_accessor :name, :version, :summary, :libs_copied, :inline_dir
 
@@ -548,7 +580,7 @@ module Inline
         return
       end
 
-      rakefile = eval RAKEFILE_TEMPLATE 
+      rakefile = eval RAKEFILE_TEMPLATE
 
       STDERR.puts "==> Generating Rakefile" unless $TESTING
       File.open 'Rakefile', 'w' do |fp|
@@ -561,7 +593,7 @@ module Inline
 
       cmd = "#{RAKE} package"
       cmd += "> #{DEV_NULL} 2> #{DEV_NULL}" if $TESTING unless $DEBUG
-      
+
       if system cmd then
         unless $TESTING then
           STDERR.puts
@@ -576,7 +608,7 @@ module Inline
       unless defined? @gem_libs then
         @gem_libs = Dir.glob File.join(@inline_dir, "*.#{@ext}")
         files = Dir.glob(File.join('lib', '*')).select { |f| test ?f, f }
-        
+
         @gem_libs.push(*files)
         @gem_libs.sort!
       end
@@ -599,11 +631,11 @@ class Module
   # Extends the Module class to have an inline method. The default
   # language/builder used is C, but can be specified with the +lang+
   # parameter.
-  
+
   def inline(lang = :C, options={})
     case options
     when TrueClass, FalseClass then
-      warn "WARNING: 2nd argument to inline is now a hash, changing to {:testing=>#{options}}" unless options
+      warn "WAR\NING: 2nd argument to inline is now a hash, changing to {:testing=>#{options}}" unless options
       options = { :testing => options  }
     when Hash
       options[:testing] ||= false
@@ -637,9 +669,9 @@ class File
   ##
   # Equivalent to +File::open+ with an associated block, but moves
   # any existing file with the same name to the side first.
-  
+
   def self.write_with_backup(path) # returns true if file already existed
-    
+
     # move previous version to the side if it exists
     renamed = false
     if test ?f, path then
@@ -662,15 +694,15 @@ class Dir
   # writable permissions. If not, it prints an error and exits. It
   # only works on +POSIX+ systems. Patches for other systems are
   # welcome.
-  
+
   def self.assert_secure(path)
     mode = File.stat(path).mode
     unless ((mode % 01000) & 0022) == 0 then
       if $TESTING then
-	raise SecurityError, "Directory #{path} is insecure"
+        raise SecurityError, "Directory #{path} is insecure"
       else
-	$stderr.puts "#{path} is insecure (#{'%o' % mode}). It may not be group or world writable. Exiting."
-	exit 1
+        $stderr.puts "#{path} is insecure (#{'%o' % mode}). It may not be group or world writable. Exiting."
+        exit 1
       end
     end
   end

data/{test_inline.rb → test/test_inline.rb}

@@ -30,7 +30,7 @@ class InlineTestCase < Test::Unit::TestCase
 
   def teardown
     unless $DEBUG then
-      FileUtils.rm_rf @rootdir 
+      FileUtils.rm_rf @rootdir
       ENV.delete 'INLINEDIR'
     end
   end
@@ -178,7 +178,7 @@ class TestC < InlineTestCase
 
     @builder.add_type_converter t, a, b unless t.nil?
     result = @builder.parse_signature(src)
-    
+
     assert_equal(expected, result)
   end
 
@@ -198,16 +198,16 @@ class TestC < InlineTestCase
       'return' => 'int',
       'arity' => 2,
       'args' => [
-	['x', 'int'],
-	['y', 'int']
+    ['x', 'int'],
+    ['y', 'int']
       ]
     }
-    
+
     util_parse_signature(src, expected)
   end
-  
+
   def test_parse_signature_custom
-    
+
     src = "// stupid cpp comment
     #include \"header.h\"
     /* stupid c comment */
@@ -217,19 +217,19 @@ class TestC < InlineTestCase
       return result;
     }
     "
-    
+
     expected = {
       'name' => 'add',
       'return' => 'int',
       'arity' => 2,
       'args' => [
-	[ 'x', 'fooby' ],
-	['y', 'int']
+    [ 'x', 'fooby' ],
+    ['y', 'int']
       ]
     }
-    
+
     util_parse_signature(src, expected,
-			 "fooby", "r2c_fooby", "c2r_fooby") 
+             "fooby", "r2c_fooby", "c2r_fooby")
   end
 
   def test_parse_signature_register
@@ -249,14 +249,14 @@ class TestC < InlineTestCase
       'return' => 'int',
       'arity' => 2,
       'args' => [
-	[ 'x', 'register int' ],
-	['y', 'int']
+    [ 'x', 'register int' ],
+    ['y', 'int']
       ]
     }
 
-    
+
     util_parse_signature(src, expected,
-			 "register int", 'FIX2INT', 'INT2FIX')
+             "register int", 'FIX2INT', 'INT2FIX')
   end
 
   def util_generate(src, expected, expand_types=true)
@@ -532,7 +532,7 @@ puts(s); return rb_str_new2(s)}"
 
   def test_build_bad
     code = util_simple_code(:DumbTest2, "void should_puke() { 1+1  2+2 }")
-    assert_raises(CompilationError) do 
+    assert_raises(CompilationError) do
       util_test_build(code) do
         flunk
       end
@@ -650,7 +650,7 @@ class TestModule < InlineTestCase
 
   def test_argument_check_fewer
     fb = Foo::Bar.new
-    
+
     assert_raise(ArgumentError) do
       assert_equal 13, fb.arity6(1, 2, 3)
     end
@@ -668,12 +668,12 @@ class TestModule < InlineTestCase
       builder.c "int add(int a, int b) { return a + b; }"
     end
     assert(test(?d, Inline.directory),
-	   "inline dir should have been created")
+       "inline dir should have been created")
     matches = Dir[File.join(Inline.directory, "Inline_TestModule_*.c")]
     assert_equal(1, matches.length, "Source should have been created")
     library_file = matches.first.gsub(/\.c$/) { "." + Config::CONFIG["DLEXT"] }
     assert(test(?f, library_file),
-	   "Library file should have been created")
+       "Library file should have been created")
   end
 
 end
@@ -721,7 +721,7 @@ class TestInlinePackager < InlineTestCase
       @packager.package
     end
   end
-  
+
   def test_copy_libs
     assert_equal false, @packager.libs_copied
 
@@ -744,7 +744,7 @@ class TestInlinePackager < InlineTestCase
   def test_generate_rakefile_has_rakefile
     FileUtils.rm 'Rakefile' if test ?f, 'Rakefile' and $DEBUG
     FileUtils.touch 'Rakefile'
-    
+
     @packager.generate_rakefile
 
     assert_equal "", File.read('Rakefile')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.9
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.6.2
-date: 2006-10-12 00:00:00 -07:00
+  version: 3.6.3
+date: 2007-04-27 00:00:00 -07:00
 summary: Multi-language extension coding within ruby.
 require_paths: 
-- .
+- lib
 email: ryand-ruby@zenspider.com
-homepage: http://www.zenspider.com/ZSS/Products/RubyInline/
+homepage: "    http://rubyforge.org/projects/rubyinline/\n"
 rubyforge_project: rubyinline
 description: Ruby Inline is an analog to Perl's Inline::C. Out of the box, it allows you to embed C/++ external module code in your ruby script directly. By writing simple builder classes, you can teach how to cope with new languages (fortran, perl, whatever). The code is compiled and run on the fly when needed.
 autorequire: 
@@ -33,23 +33,23 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/inline_package
 - demo/fastmath.rb
 - demo/hello.rb
 - example.rb
 - example2.rb
-- inline.rb
-- inline_package
-- test_inline.rb
+- lib/inline.rb
+- test/test_inline.rb
 - tutorial/example1.rb
 - tutorial/example2.rb
-test_files: []
-
+test_files: 
+- test/test_inline.rb
 rdoc_options: []
 
 extra_rdoc_files: []
 
-executables: []
-
+executables: 
+- inline_package
 extensions: []
 
 requirements: 
@@ -62,5 +62,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.2.0
     version: