RubyInline 3.4.0 → 3.5.0

data/History.txt

@@ -1,3 +1,13 @@
+*** 3.5.0 / 2005-10-15
+
++ 4 minor enhancements
+	+ Switched to install for Makefile.
+	+ Lots of minor cleanup.
+	+ Added add_to_init to extend init methods. Great hack!
+	+ Added 2 demo files used in the rubyconf 2005 presentation.
++ 1 bug fix
+	+ Fixed example in README.txt. OOPS!
+
 *** 3.4.0 / 2005-07-13
 
 + 2 minor enhancement

data/Makefile

@@ -30,17 +30,12 @@ bench:
 	@$(RUBY) -I. ./example.rb 2 2> /dev/null
 
 install:
-	echo "installing inline.rb in $(RUBYLIB)"
-	cp -f inline.rb $(RUBYLIB)
-	cp -f inline_package $(PREFIX)/bin
-	chmod 755 $(PREFIX)/bin/inline_package
-	echo Installed
+	install -m 0444 inline.rb $(RUBYLIB)
+	install -m 0555 inline_package $(PREFIX)/bin
 
 uninstall:
-	echo "Removing inline.rb from $(RUBYLIB)"
-	rm $(RUBYLIB)/inline.rb
+	rm -f $(RUBYLIB)/inline.rb
 	rm -f $(PREFIX)/bin/inline_package
-	echo Removed
 
 clean:
 	rm -rf *~ doc ~/.ruby_inline

data/Manifest.txt

@@ -2,6 +2,8 @@ History.txt
 Makefile
 Manifest.txt
 README.txt
+demo/fastmath.rb
+demo/hello.rb
 example.rb
 example2.rb
 inline.gemspec

data/README.txt

@@ -32,31 +32,31 @@ compiler (read: windows)!
 
   require "inline"
   class MyTest
-    inline_c "
-      long factorial(int max) {
-        int i=max, result=1;
-        while (i >= 2) { result *= i--; }
-        return result;
-      }"
+    inline do |builder|
+      builder.c "
+        long factorial(int max) {
+          int i=max, result=1;
+          while (i >= 2) { result *= i--; }
+          return result;
+        }"
   end
   t = MyTest.new()
   factorial_5 = t.factorial(5)
 
 ** SYNOPSYS (C++):
 
-  $INLINE_FLAGS = " -x c++ "
-  $INLINE_LIBS  = " -lstdc++ "
-  require "inline"
+  require 'inline'
   class MyTest
-    inline_c "
-      #include <iostream>
-      static
-      VALUE
-      hello(int i) {
-        while (i-- > 0) {
-          std::cout << \"hello\" << std::endl;
-        }
-      }"
+    inline(:C) do |builder|
+      builder.include '<iostream>'
+      builder.add_compile_flags '-x c++', '-lstdc++'
+      builder.c '
+        void hello(int i) {
+          while (i-- > 0) {
+            std::cout << "hello" << std::endl;
+          }
+        }'
+    end
   end
   t = MyTest.new()
   t.hello(3)
@@ -95,7 +95,7 @@ compiler (read: windows)!
 
 ** REQUIREMENTS:
 
-+ Ruby - 1.6.7 & 1.8.2 has been used on FreeBSD 4.6+ and MacOSX.
++ Ruby - 1.8.2 has been used on FreeBSD 4.6+ and MacOSX.
 + POSIX compliant system (ie pretty much any UNIX, or Cygwin on MS platforms).
 + A C/C++ compiler (the same one that compiled your ruby interpreter).
 + test::unit for running tests ( http://testunit.talbott.ws/ ).

data/demo/fastmath.rb

@@ -0,0 +1,27 @@
+
+begin require 'rubygems' rescue LoadError end
+require 'inline'
+
+class FastMath
+  def factorial(n)
+    f = 1
+    n.downto(2) { |x| f *= x }
+    return f
+  end
+  inline do |builder|
+    builder.c "
+    long factorial_c(int max) {
+      int i=max, result=1;
+      while (i >= 2) { result *= i--; }
+      return result;
+    }"
+  end
+end
+
+math = FastMath.new
+
+if ARGV.empty? then
+  30000.times do math.factorial(20); end
+else
+  30000.times do math.factorial_c(20); end
+end

data/demo/hello.rb

@@ -0,0 +1,13 @@
+#!/usr/local/bin/ruby -w
+
+begin require 'rubygems' rescue LoadError end
+require 'inline'
+
+class Hello
+  inline do |builder|
+    builder.include "<stdio.h>"
+    builder.c 'void hello() { puts("hello world"); }'
+  end
+end
+
+Hello.new.hello

data/example.rb

@@ -12,8 +12,6 @@ class MyTest
   end
 
   inline do |builder|
-    builder.include "<math.h>"
-
     builder.c "
     long factorial_c(int max) {
       int i=max, result=1;

data/inline.rb

@@ -51,7 +51,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.4.0'
+  VERSION = '3.5.0'
 
   $stderr.puts "RubyInline v #{VERSION}" if $DEBUG
 
@@ -276,6 +276,7 @@ module Inline
       @sig = {}
       @flags = []
       @libs = []
+      @init_extra = []
     end
 
     ##
@@ -337,6 +338,9 @@ module Inline
             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"
@@ -386,7 +390,7 @@ module Inline
             cmd += ' -L/usr/local/lib -lruby.dll'
           end
 
-          cmd += " 2> /dev/null" if $TESTING
+          cmd += " 2> /dev/null" if $TESTING and not $DEBUG
 	  
 	  $stderr.puts "Building #{so_name} with '#{cmd}'" if $DEBUG
           `#{cmd}`
@@ -420,6 +424,13 @@ module Inline
       @libs.push(*flags)
     end
 
+    ##
+    # Adds custom content to the end of the init function.
+
+    def add_to_init(*src)
+      @init_extra.push(*src)
+    end
+
     ##
     # Registers C type-casts +r2c+ and +c2r+ for +type+.
     

data/test_inline.rb

@@ -248,7 +248,7 @@ class TestC < InlineTestCase
       result = builder.generate src, expand_types
     end
     result.gsub!(/\# line \d+/, '# line N')
-    expected = '# line N "./test_inline.rb"' + "\n" + expected
+    expected = "# line N \"#{$0}\"\n" + expected
     assert_equal(expected, result)
   end
 
@@ -462,7 +462,7 @@ puts(s); return rb_str_new2(s)}"
       result = builder.c "int add(int a, int b) { return a + b; }"
     end
 
-    expected = "# line N \"./test_inline.rb\"\nstatic VALUE add(VALUE self, VALUE _a, VALUE _b) {\n  int a = FIX2INT(_a);\n  int b = FIX2INT(_b);\n return INT2FIX(a + b); }"
+    expected = "# line N \"#{$0}\"\nstatic VALUE add(VALUE self, VALUE _a, VALUE _b) {\n  int a = FIX2INT(_a);\n  int b = FIX2INT(_b);\n return INT2FIX(a + b); }"
 
     result.gsub!(/\# line \d+/, '# line N')
 
@@ -479,7 +479,7 @@ puts(s); return rb_str_new2(s)}"
     end
 
     result.gsub!(/\# line \d+/, '# line N')
-    expected = "# line N \"./test_inline.rb\"\n" + src
+    expected = "# line N \"#{$0}\"\n" + src
 
     assert_equal expected, result
     assert_equal [expected], builder.src

metadata

@@ -1,54 +1,58 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10.1
+!ruby/object:Gem::Specification 
+rubygems_version: 0.8.11.1
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.4.0
-date: 2005-07-13
+  version: 3.5.0
+date: 2005-10-16 00:00:00 -07:00
 summary: Multi-language extension coding within ruby.
 require_paths: 
-  - "."
+- .
 email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/RubyInline/
 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."
+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: inline
 default_executable: 
-bindir: "."
+bindir: .
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Ryan Davis
+- Ryan Davis
 files: 
-  - History.txt
-  - Makefile
-  - Manifest.txt
-  - README.txt
-  - example.rb
-  - example2.rb
-  - inline.gemspec
-  - inline.rb
-  - inline_package
-  - test_inline.rb
-  - tutorial/example1.rb
-  - tutorial/example2.rb
+- History.txt
+- Makefile
+- Manifest.txt
+- README.txt
+- demo/fastmath.rb
+- demo/hello.rb
+- example.rb
+- example2.rb
+- inline.gemspec
+- inline.rb
+- inline_package
+- test_inline.rb
+- tutorial/example1.rb
+- tutorial/example2.rb
 test_files: 
-  - test_inline.rb
+- test_inline.rb
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: 
-  - inline_package
+- inline_package
 extensions: []
+
 requirements: 
-  - A POSIX environment and a compiler for your language.
-dependencies: []
+- A POSIX environment and a compiler for your language.
+dependencies: []
+