octave-ruby 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 2.0.1 / 2012-11-09
+
+* 1 major bug fix
+  * Fix crash when defining functions using eval
+  
 == 2.0.0 / 2012-11-08
 
 * 2 major enhancements

data/ext/octave_api/octave-ruby.cpp

@@ -28,6 +28,8 @@ VALUE or_feval(VALUE function_name, VALUE arguments)
   
   n = RARRAY_LEN(arguments);
   
+  bool is_function_definition = (n == 1 && FIXNUM_P(RARRAY_PTR(arguments)[0]) == 0 && strncmp(RSTRING_PTR(StringValue(RARRAY_PTR(arguments)[0])), "function ", 9) == 0);
+  
   for (i = 0; i < n; i++) {
     argList(i) = OR_Variable(RARRAY_PTR(arguments)[i]).to_octave();
   }
@@ -44,7 +46,8 @@ VALUE or_feval(VALUE function_name, VALUE arguments)
     symbol_table::set_scope(symbol_table::top_scope());
     reset_error_handler();
     
-    octave_value_list val = feval(std::string(RSTRING_PTR(function_name)), argList, 1);
+    int nargout = (is_function_definition ? 0 : 1);
+    octave_value_list val = feval(std::string(RSTRING_PTR(function_name)), argList, nargout);
     if(val.length() > 0 && val(0).is_defined()) {
       ruby_val = OR_Variable(val(0)).to_ruby();
     }

data/octave-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{octave-ruby}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Younger"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Jonathan Younger