koi-vm 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/koi-vm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koi-vm}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
-  s.date = %q{2010-08-25}
+  s.date = %q{2010-08-27}
   s.description = %q{A prototype Virtual Machine written in Ruby. Why would anyone write such a thing? Because it's fun, and it's a great learning tool.}
   s.email = %q{aaron@aarongough.com}
   s.extra_rdoc_files = [

data/lib/koi-vm/opcodes/function_operations/push_function.rb

@@ -5,8 +5,12 @@ module KoiVM
       vm.data_stack.push([FUNCTION_, vm.instruction_pointer + 2])
       function_id = vm.opcodes[vm.instruction_pointer + 1]
       while(true)
-        vm.instruction_pointer = vm.opcodes.slice(vm.instruction_pointer, vm.opcodes.length).index(END_FUNCTION)
-        break if(vm.opcodes.slice(vm.instruction_pointer, 4) == [END_FUNCTION, 0, END_FUNCTION, function_id])
+        vm.instruction_pointer = vm.opcodes.slice(vm.instruction_pointer, vm.opcodes.length).index(END_FUNCTION) + vm.instruction_pointer
+        if(vm.opcodes.slice(vm.instruction_pointer, 4) == [END_FUNCTION, 0, END_FUNCTION, function_id])
+          break
+        else
+          vm.instruction_pointer = vm.instruction_pointer + 1
+        end
       end
       vm.instruction_pointer = vm.instruction_pointer + 4
     end

data/test/unit/opcodes/function_operations/push_function_test.rb

@@ -10,12 +10,32 @@ class PushFunctionTest < Test::Unit::TestCase
       PUSH_FUNCTION, 1,
       NO_OP,
       NO_OP,
+      RETURN,
       END_FUNCTION, 0,
       END_FUNCTION, 1
     ]
     assert_equal [[FUNCTION_, 2]], vm.data_stack
-    assert_equal 8, vm.instruction_pointer
+    assert_equal 9, vm.instruction_pointer
+  end
+  
+  test "should push function reference onto stack that contains nested function definition" do
+    vm = VM.new
+    vm.run [
+      PUSH_FUNCTION, 6,
+      NO_OP,
+        PUSH_FUNCTION, 2,
+        NO_OP,
+        RETURN,
+        END_FUNCTION, 0,
+        END_FUNCTION, 2,
+      NO_OP,
+      RETURN,
+      END_FUNCTION, 0,
+      END_FUNCTION, 6
+    ]
+    assert_equal [[FUNCTION_, 2]], vm.data_stack
+    assert_equal 17, vm.instruction_pointer
   end
-
   
+    
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Aaron Gough
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: []