RubyInline 3.6.1 → 3.6.2

data/History.txt

@@ -1,3 +1,9 @@
+*** 3.6.2 / 2006-10-12
+
++ 2 bug fixes
+	+ comment stripper much more sane to fix problems on certain linux distros
+	+ fixed a nit with older C compilers.
+
 *** 3.6.1 / 2006-10-11
 
 + 1 minor enhancement

data/Rakefile

@@ -6,9 +6,9 @@ require 'hoe'
 require './inline.rb'
 
 Hoe.new("RubyInline", Inline::VERSION) do |p|
-  p.rubyforge_name = "rubyinline"
   p.summary = "Multi-language extension coding within ruby."
   p.description = p.paragraphs_of("README.txt", 3).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."

data/inline.rb

@@ -51,7 +51,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.6.1'
+  VERSION = '3.6.2'
   
   WINDOZE  = /win32/ =~ RUBY_PLATFORM
   DEV_NULL = (WINDOZE ? 'nul' : '/dev/null')
@@ -131,9 +131,10 @@ module Inline
 
     def strip_comments(src)
       # strip c-comments
-      src = src.gsub(/\s*(?:(?:\/\*)(?:(?:(?!\*\/)[\s\S])*)(?:\*\/))/, '')
+      src = src.gsub(%r%\s*/\*.*?\*/%m, '')
       # strip cpp-comments
-      src.gsub!(/\s*(?:\/\*(?:(?!\*\/)[\s\S])*\*\/|\/\/[^\n]*\n)/, '')
+      src = src.gsub(%r%^\s*//.*?\n%, '')
+      src = src.gsub(%r%[ \t]*//[^\n]*%, '')
       src
     end
     

data/test_inline.rb

@@ -392,6 +392,7 @@ return INT2FIX(42)}"
     expected = "static VALUE add(VALUE self, VALUE _x, VALUE _y) {
   int x = FIX2INT(_x);
   int y = FIX2INT(_y);
+
       return INT2FIX(x+y);
     }
     "
@@ -413,6 +414,7 @@ add(int x, int y) { // add two numbers
 static VALUE add(VALUE self, VALUE _x, VALUE _y) {
   int x = FIX2INT(_x);
   int y = FIX2INT(_y);
+
   return INT2FIX(x+y);
 }
 "
@@ -432,6 +434,7 @@ add(int x, int y) { // add two numbers
 static VALUE add(VALUE self, VALUE _x, VALUE _y) {
   int x = FIX2INT(_x);
   int y = FIX2INT(_y);
+
   return INT2FIX(x+y);
 }
 "
@@ -536,6 +539,49 @@ puts(s); return rb_str_new2(s)}"
     end
   end
 
+  def util_strip_comments(input)
+    expect = 'line 1
+
+#if 0
+  line 2
+#endif
+  line 3
+
+'
+
+    assert_equal expect, @builder.strip_comments(input)
+  end
+
+  def test_strip_comments_cpp
+    input = 'line 1
+
+#if 0
+  line 2
+#endif
+  // 1 comment
+  // 2 comment
+  line 3               // trailing comment
+
+'
+    util_strip_comments(input)
+  end
+
+  def test_strip_comments_c
+    input = 'line 1
+
+#if 0
+  line 2
+#endif
+  /*
+   * 1 comment
+   * 2 comment
+   */
+  line 3               /* trailing comment */
+
+'
+    util_strip_comments(input)
+  end
+
   def test_load
     # totally tested by test_build
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.6.1
-date: 2006-10-11 00:00:00 -07:00
+  version: 3.6.2
+date: 2006-10-12 00:00:00 -07:00
 summary: Multi-language extension coding within ruby.
 require_paths: 
 - .