koi-vm 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/koi-vm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koi-vm}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
@@ -45,6 +45,13 @@ Gem::Specification.new do |s|
      "lib/koi-vm/opcodes/function_operations/push_function.rb",
      "lib/koi-vm/opcodes/function_operations/return.rb",
      "lib/koi-vm/opcodes/function_operations/tailcall.rb",
+     "lib/koi-vm/opcodes/hash_operations/get_key.rb",
+     "lib/koi-vm/opcodes/hash_operations/has_key.rb",
+     "lib/koi-vm/opcodes/hash_operations/length.rb",
+     "lib/koi-vm/opcodes/hash_operations/num_pairs.rb",
+     "lib/koi-vm/opcodes/hash_operations/pairs.rb",
+     "lib/koi-vm/opcodes/hash_operations/push_hash.rb",
+     "lib/koi-vm/opcodes/hash_operations/set_key.rb",
      "lib/koi-vm/opcodes/io_operations/gets.rb",
      "lib/koi-vm/opcodes/io_operations/print.rb",
      "lib/koi-vm/opcodes/math_operations/add.rb",
@@ -87,6 +94,13 @@ Gem::Specification.new do |s|
      "test/unit/opcodes/function_operations/push_function_test.rb",
      "test/unit/opcodes/function_operations/return_test.rb",
      "test/unit/opcodes/function_operations/tailcall_test.rb",
+     "test/unit/opcodes/hash_operations/get_key_test.rb",
+     "test/unit/opcodes/hash_operations/has_key_test.rb",
+     "test/unit/opcodes/hash_operations/length_test.rb",
+     "test/unit/opcodes/hash_operations/num_pairs_test.rb",
+     "test/unit/opcodes/hash_operations/pairs_test.rb",
+     "test/unit/opcodes/hash_operations/push_hash_test.rb",
+     "test/unit/opcodes/hash_operations/set_key_test.rb",
      "test/unit/opcodes/io_operations/gets_test.rb",
      "test/unit/opcodes/io_operations/print_test.rb",
      "test/unit/opcodes/math_operations/add_test.rb",
@@ -135,6 +149,13 @@ Gem::Specification.new do |s|
      "test/unit/opcodes/function_operations/push_function_test.rb",
      "test/unit/opcodes/function_operations/return_test.rb",
      "test/unit/opcodes/function_operations/tailcall_test.rb",
+     "test/unit/opcodes/hash_operations/get_key_test.rb",
+     "test/unit/opcodes/hash_operations/has_key_test.rb",
+     "test/unit/opcodes/hash_operations/length_test.rb",
+     "test/unit/opcodes/hash_operations/num_pairs_test.rb",
+     "test/unit/opcodes/hash_operations/pairs_test.rb",
+     "test/unit/opcodes/hash_operations/push_hash_test.rb",
+     "test/unit/opcodes/hash_operations/set_key_test.rb",
      "test/unit/opcodes/io_operations/gets_test.rb",
      "test/unit/opcodes/io_operations/print_test.rb",
      "test/unit/opcodes/math_operations/add_test.rb",

data/lib/koi-vm/opcodes/_opcode_constants.rb

@@ -53,6 +53,15 @@ module KoiVM
   RETURN        = 163
   TAILCALL      = 164
   
+  # 180
+  PUSH_HASH     = 180
+  SET_KEY       = 181
+  GET_KEY       = 182
+  HAS_KEY       = 183
+  LENGTH        = 184
+  NUM_PAIRS     = 185
+  PAIRS         = 186
+  
   # 240
   NO_OP         = 240
   EXIT          = 255

data/lib/koi-vm/opcodes/_value_constants.rb

@@ -4,6 +4,7 @@ module KoiVM
   INTEGER_   = 2
   FLOAT_     = 3
   STRING_    = 4
+  HASH_      = 5
   
   
   FUNCTION_  = 16

data/lib/koi-vm/opcodes/hash_operations/get_key.rb

@@ -0,0 +1,14 @@
+module KoiVM
+  class VM
+    
+    @@instruction[GET_KEY] = Proc.new() do |vm|
+      raise StackError, "Expecting at least two items on the data stack" unless(vm.data_stack.length > 1)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-2][0] == HASH_)
+      key = vm.data_stack.pop
+      vm.data_stack.push( vm.data_stack.pop[1][key] )
+      vm.data_stack[-1] = [NIL_, nil] if(vm.data_stack[-1] == nil)
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/has_key.rb

@@ -0,0 +1,18 @@
+module KoiVM
+  class VM
+    
+    @@instruction[HAS_KEY] = Proc.new() do |vm|
+      raise StackError, "Expecting at least two items on the data stack" unless(vm.data_stack.length > 1)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-2][0] == HASH_)
+      key = vm.data_stack.pop
+      hash = vm.data_stack.pop[1]
+      if(hash.has_key?(key))
+        vm.data_stack.push([BOOL_, true])
+      else
+        vm.data_stack.push([BOOL_, false])
+      end
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/length.rb

@@ -0,0 +1,19 @@
+module KoiVM
+  class VM
+    
+    @@instruction[LENGTH] = Proc.new() do |vm|
+      raise StackError, "Expecting at least one item on the data stack" unless(vm.data_stack.length > 0)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-1][0] == HASH_)
+      hash = vm.data_stack.pop[1]
+      integer_keys = hash.keys.reject{|x| x[0] != INTEGER_ }.map{|x| x[1]}
+      highest_key = integer_keys.sort.last
+      if(highest_key.nil?)
+        vm.data_stack.push([INTEGER_, 0])
+      else
+        vm.data_stack.push([INTEGER_, highest_key + 1])
+      end
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/num_pairs.rb

@@ -0,0 +1,12 @@
+module KoiVM
+  class VM
+    
+    @@instruction[NUM_PAIRS] = Proc.new() do |vm|
+      raise StackError, "Expecting at least one item on the data stack" unless(vm.data_stack.length > 0)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-1][0] == HASH_)
+      vm.data_stack.push([INTEGER_, vm.data_stack.pop[1].length ])
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/pairs.rb

@@ -0,0 +1,22 @@
+module KoiVM
+  class VM
+    
+    @@instruction[PAIRS] = Proc.new() do |vm|
+      raise StackError, "Expecting at least one item on the data stack" unless(vm.data_stack.length > 0)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-1][0] == HASH_)
+      hash = vm.data_stack.pop[1]
+      hashed_hash = {}
+      index = 0
+      hash.each_pair do |k,v|
+        hashed_hash[[INTEGER_, index]] = [HASH_, {
+          [INTEGER_, 0] => k,
+          [INTEGER_, 1] => v
+        }]
+        index += 1
+      end
+      vm.data_stack.push([HASH_, hashed_hash])
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/push_hash.rb

@@ -0,0 +1,10 @@
+module KoiVM
+  class VM
+    
+    @@instruction[PUSH_HASH] = Proc.new() do |vm|
+      vm.data_stack.push([HASH_, {}])
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/hash_operations/set_key.rb

@@ -0,0 +1,14 @@
+module KoiVM
+  class VM
+    
+    @@instruction[SET_KEY] = Proc.new() do |vm|
+      raise StackError, "Expecting at least three items on the data stack" unless(vm.data_stack.length > 2)
+      raise StackError, "Expecting a hash" unless(vm.data_stack[-3][0] == HASH_)
+      value = vm.data_stack.pop
+      key = vm.data_stack.pop
+      vm.data_stack[-1][1][key] = value
+      vm.instruction_pointer = vm.instruction_pointer + 1
+    end
+    
+  end
+end

data/lib/koi-vm/opcodes/stack_operations/typeof.rb

@@ -9,6 +9,8 @@ module KoiVM
       vm.data_stack.push([STRING_, "integer"]) if(value[0] == INTEGER_)
       vm.data_stack.push([STRING_, "float"]) if(value[0] == FLOAT_)
       vm.data_stack.push([STRING_, "string"]) if(value[0] == STRING_)
+      vm.data_stack.push([STRING_, "hash"]) if(value[0] == HASH_)
+      vm.data_stack.push([STRING_, "function"]) if(value[0] == FUNCTION_)
       vm.instruction_pointer = vm.instruction_pointer + 1
     end
     

data/test/unit/opcodes/hash_operations/get_key_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class GetKeyTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should get key in hash" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {[INTEGER_, 1] => [STRING_, "yay"]}], [INTEGER_, 1]]
+    vm.run [
+      GET_KEY
+    ]
+    assert_equal [[STRING_, "yay"]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should get unset key in hash" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}], [INTEGER_, 1]]
+    vm.run [
+      GET_KEY
+    ]
+    assert_equal [[NIL_, nil]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-2] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1], [INTEGER_, 1]]
+      vm.run [
+        GET_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there is only 1 item on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[HASH_, {}]]
+      vm.run [
+        GET_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        GET_KEY
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/hash_operations/has_key_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class HasKeyTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should return true as hash has key" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {[INTEGER_, 1] => [STRING_, "yay"]}], [INTEGER_, 1]]
+    vm.run [
+      HAS_KEY
+    ]
+    assert_equal [[BOOL_, true]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should return false as hash does not have key" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}], [INTEGER_, 1]]
+    vm.run [
+      HAS_KEY
+    ]
+    assert_equal [[BOOL_, false]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-2] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1], [INTEGER_, 1]]
+      vm.run [
+        HAS_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there is only 1 item on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[HASH_, {}]]
+      vm.run [
+        HAS_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        HAS_KEY
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/hash_operations/length_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class LengthTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should return value of highest integer key + 1" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {[INTEGER_, 1] => [STRING_, "yay"], [INTEGER_, 2] => [STRING_, "yay"], [INTEGER_, 6] => [STRING_, "yay"]}]]
+    vm.run [
+      LENGTH
+    ]
+    assert_equal [[INTEGER_, 7]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should return 0" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {[STRING_, "1"] => [STRING_, "yay"], [STRING_, "2"] => [STRING_, "yay"], [STRING_, "3"] => [STRING_, "yay"]}]]
+    vm.run [
+      LENGTH
+    ]
+    assert_equal [[INTEGER_, 0]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-1] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1]]
+      vm.run [
+        LENGTH
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        LENGTH
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/hash_operations/num_pairs_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class NumPairsTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should return number of key-value pairs in hash" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {[INTEGER_, 1] => [STRING_, "yay"], [INTEGER_, 2] => [STRING_, "yay"], [INTEGER_, 6] => [STRING_, "yay"]}]]
+    vm.run [
+      NUM_PAIRS
+    ]
+    assert_equal [[INTEGER_, 3]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should return 0" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}]]
+    vm.run [
+      NUM_PAIRS
+    ]
+    assert_equal [[INTEGER_, 0]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-1] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1]]
+      vm.run [
+        NUM_PAIRS
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        NUM_PAIRS
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/hash_operations/pairs_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class PairsTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should return new hash containing all the pairs from the previous hash with numeric indices" do
+    vm = VM.new
+    vm.data_stack = [
+      [HASH_, {
+        [INTEGER_, 1] => [STRING_, "yay"], 
+        [INTEGER_, 2] => [STRING_, "yay"], 
+        [INTEGER_, 6] => [STRING_, "yay"]
+      }]
+    ]
+    vm.run [
+      PAIRS
+    ]
+    assert_equal [
+      [HASH_, {
+        [INTEGER_, 0] => [ HASH_, {
+          [INTEGER_, 0] => [INTEGER_, 1],
+          [INTEGER_, 1] => [STRING_, "yay"]
+        }],
+        [INTEGER_, 1] => [ HASH_, {
+          [INTEGER_, 0] => [INTEGER_, 2],
+          [INTEGER_, 1] => [STRING_, "yay"]
+        }],
+        [INTEGER_, 2] => [ HASH_, {
+          [INTEGER_, 0] => [INTEGER_, 6],
+          [INTEGER_, 1] => [STRING_, "yay"]
+        }]
+      }]
+    ], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should return empty hash" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}]]
+    vm.run [
+      PAIRS
+    ]
+    assert_equal [[HASH_, {}]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-1] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1]]
+      vm.run [
+        PAIRS
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        PAIRS
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/hash_operations/push_hash_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class PushHashTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should push hash onto stack" do
+    vm = VM.new
+    vm.run [
+      PUSH_HASH
+    ]
+    assert_equal [[HASH_, {}]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+end

data/test/unit/opcodes/hash_operations/set_key_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper.rb'))
+
+class SetKeyTest < Test::Unit::TestCase
+
+  include KoiVM
+  
+  test "should set key in hash" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}], [INTEGER_, 1], [STRING_, "yay"]]
+    vm.run [
+      SET_KEY
+    ]
+    assert_equal [[HASH_, {[INTEGER_, 1] => [STRING_, "yay"]}]], vm.data_stack
+    assert_equal 1, vm.instruction_pointer
+  end
+  
+  test "should raise StackError if stack[-3] is not a hash" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[INTEGER_, 1], [INTEGER_, 1], [STRING_, "yay"]]
+      vm.run [
+        SET_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are only 2 items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[HASH_, {}], [INTEGER_, 1]]
+      vm.run [
+        SET_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there is only 1 item on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.data_stack = [[HASH_, {}]]
+      vm.run [
+        SET_KEY
+      ]
+    end
+  end
+  
+  test "should raise StackError if there are no items on the stack" do
+    assert_raises StackError do
+      vm = VM.new
+      vm.run [
+        SET_KEY
+      ]
+    end
+  end
+  
+end

data/test/unit/opcodes/stack_operations/typeof_test.rb

@@ -49,6 +49,24 @@ class TypeofTest < Test::Unit::TestCase
     assert_equal [[STRING_, "string"]], vm.data_stack
   end
   
+  test "should push string representing type of topmost stack item onto the stack (hash)" do
+    vm = VM.new
+    vm.data_stack = [[HASH_, {}]]
+    vm.run [
+      TYPEOF
+    ]
+    assert_equal [[STRING_, "hash"]], vm.data_stack
+  end
+  
+  test "should push string representing type of topmost stack item onto the stack (function)" do
+    vm = VM.new
+    vm.data_stack = [[FUNCTION_, 12]]
+    vm.run [
+      TYPEOF
+    ]
+    assert_equal [[STRING_, "function"]], vm.data_stack
+  end
+  
   test "should raise StackError if there are no items on the stack" do
     assert_raises StackError do
       vm = VM.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Aaron Gough
@@ -56,6 +56,13 @@ files:
 - lib/koi-vm/opcodes/function_operations/push_function.rb
 - lib/koi-vm/opcodes/function_operations/return.rb
 - lib/koi-vm/opcodes/function_operations/tailcall.rb
+- lib/koi-vm/opcodes/hash_operations/get_key.rb
+- lib/koi-vm/opcodes/hash_operations/has_key.rb
+- lib/koi-vm/opcodes/hash_operations/length.rb
+- lib/koi-vm/opcodes/hash_operations/num_pairs.rb
+- lib/koi-vm/opcodes/hash_operations/pairs.rb
+- lib/koi-vm/opcodes/hash_operations/push_hash.rb
+- lib/koi-vm/opcodes/hash_operations/set_key.rb
 - lib/koi-vm/opcodes/io_operations/gets.rb
 - lib/koi-vm/opcodes/io_operations/print.rb
 - lib/koi-vm/opcodes/math_operations/add.rb
@@ -98,6 +105,13 @@ files:
 - test/unit/opcodes/function_operations/push_function_test.rb
 - test/unit/opcodes/function_operations/return_test.rb
 - test/unit/opcodes/function_operations/tailcall_test.rb
+- test/unit/opcodes/hash_operations/get_key_test.rb
+- test/unit/opcodes/hash_operations/has_key_test.rb
+- test/unit/opcodes/hash_operations/length_test.rb
+- test/unit/opcodes/hash_operations/num_pairs_test.rb
+- test/unit/opcodes/hash_operations/pairs_test.rb
+- test/unit/opcodes/hash_operations/push_hash_test.rb
+- test/unit/opcodes/hash_operations/set_key_test.rb
 - test/unit/opcodes/io_operations/gets_test.rb
 - test/unit/opcodes/io_operations/print_test.rb
 - test/unit/opcodes/math_operations/add_test.rb
@@ -174,6 +188,13 @@ test_files:
 - test/unit/opcodes/function_operations/push_function_test.rb
 - test/unit/opcodes/function_operations/return_test.rb
 - test/unit/opcodes/function_operations/tailcall_test.rb
+- test/unit/opcodes/hash_operations/get_key_test.rb
+- test/unit/opcodes/hash_operations/has_key_test.rb
+- test/unit/opcodes/hash_operations/length_test.rb
+- test/unit/opcodes/hash_operations/num_pairs_test.rb
+- test/unit/opcodes/hash_operations/pairs_test.rb
+- test/unit/opcodes/hash_operations/push_hash_test.rb
+- test/unit/opcodes/hash_operations/set_key_test.rb
 - test/unit/opcodes/io_operations/gets_test.rb
 - test/unit/opcodes/io_operations/print_test.rb
 - test/unit/opcodes/math_operations/add_test.rb