gruesome 0.0.5 → 0.0.6

data/lib/gruesome/version.rb

@@ -1,3 +1,3 @@
 module Grue
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/gruesome/z/object_table.rb

@@ -317,6 +317,34 @@ module Gruesome
         { :size => size, :property_number => property_number, :property_data_address => prop_address }
       end
 
+	  def object_properties_array(index)
+        entry = object_entry(index)
+        prop_address = entry[:properties_address]
+
+        # get the length of the string in bytes
+        text_len = @memory.force_readb(prop_address) * 2
+        prop_address += 1
+
+        prop_address += text_len
+
+        properties = []
+
+        while true do
+          entry_info = object_get_size_and_number(prop_address)
+
+          if entry_info == nil
+            break
+          end
+
+          # regardless of version, we now have the property size and the number
+
+          properties << {:property_number => entry_info[:property_number], :size => entry_info[:size], :property_data_address => entry_info[:property_data_address]}
+          prop_address = entry_info[:property_data_address] + entry_info[:size]
+        end
+
+        properties
+	  end
+
       def object_properties(index)
         entry = object_entry(index)
         prop_address = entry[:properties_address]
@@ -377,6 +405,34 @@ module Gruesome
         end
       end
 
+	  def object_get_next_property(index, property_number)
+		  properties = object_properties_array(index)
+		  if property_number == 0
+			  next_number = properties[0][:property_number]
+		  else
+			  cur_prop_index = nil
+			  properties.each_with_index do |p, i|
+				  if p[:property_number] == property_number
+					  cur_prop_index = i
+				  end
+			  end
+
+			  if cur_prop_index == nil
+				  # Error: Cannot get the next property when the property given is invalid
+				  raise "get_prop_addr gave incorrect property_number"
+			  end
+
+			  next_prop_index = cur_prop_index + 1
+
+			  if next_prop_index == properties.length
+				  next_number = 0
+			  else
+				  next_number = properties[next_prop_index][:property_number]
+			  end
+		  end
+		  next_number
+	  end
+
       def object_get_property_data_size_from_address(address)
         if @header.version <= 3
           prop_address = address - 1

data/lib/gruesome/z/opcode.rb

@@ -24,7 +24,7 @@ module Gruesome
       LOADB      = (0x10 << 3) | OpcodeClass::OP2
       GET_PROP    = (0x11 << 3) | OpcodeClass::OP2
       GET_PROP_ADDR  = (0x12 << 3) | OpcodeClass::OP2
-      GET_NPROP    = (0x13 << 3) | OpcodeClass::OP2
+      GET_NEXT_PROP  = (0x13 << 3) | OpcodeClass::OP2
       ADD        = (0x14 << 3) | OpcodeClass::OP2
       SUB        = (0x15 << 3) | OpcodeClass::OP2
       MUL        = (0x16 << 3) | OpcodeClass::OP2
@@ -161,7 +161,7 @@ module Gruesome
       if opcode_class == OpcodeClass::OP2
         case opcode
         when Opcode::OR, Opcode::AND, Opcode::LOADB, Opcode::LOADW,
-          Opcode::GET_PROP, Opcode::GET_PROP_ADDR, Opcode::GET_NPROP,
+          Opcode::GET_PROP, Opcode::GET_PROP_ADDR, Opcode::GET_NEXT_PROP,
           Opcode::ADD, Opcode::SUB, Opcode::MUL, Opcode::DIV, Opcode::MOD,
           Opcode::CALL_2S
           result = true
@@ -426,7 +426,7 @@ module Gruesome
         when Opcode::LOADB then "loadb"
         when Opcode::GET_PROP then "get_prop"
         when Opcode::GET_PROP_ADDR then "get_prop_addr"
-        when Opcode::GET_NPROP then "get_next_prop"
+        when Opcode::GET_NEXT_PROP then "get_next_prop"
         when Opcode::ADD then "add"
         when Opcode::SUB then "sub"
         when Opcode::MUL then "mul"

data/lib/gruesome/z/processor.rb

@@ -126,6 +126,9 @@ module Gruesome
           @memory.writev(instruction.destination, child)
           result = child != 0
           branch(instruction.branch_to, instruction.branch_on, result)
+        when Opcode::GET_NEXT_PROP
+          next_prop = @object_table.object_get_next_property(operands[0], operands[1])
+          @memory.writev(instruction.destination, next_prop)
         when Opcode::GET_PARENT
           parent = @object_table.object_get_parent(operands[0])
           @memory.writev(instruction.destination, parent)

data/spec/z/memory_spec.rb

@@ -3,7 +3,7 @@ require_relative '../../lib/gruesome/z/memory'
 describe Gruesome::Z::Memory do
   before(:each) do
     zork = File.open('test/zork1.z3', 'r')
-    @zork_memory = Gruesome::Z::Memory.new(zork.read(zork.size))
+    @zork_memory = Gruesome::Z::Memory.new(zork.read(zork.size), '')
   end
 
   describe "#readb" do

data/spec/z/processor_spec.rb

@@ -13,7 +13,7 @@ describe Gruesome::Z::Processor do
   describe "#execute" do
     before(:each) do
       zork = File.open('test/zork1.z3', 'r')
-      @zork_memory = Gruesome::Z::Memory.new(zork.read(zork.size))
+      @zork_memory = Gruesome::Z::Memory.new(zork.read(zork.size), '')
       @processor = Gruesome::Z::Processor.new(@zork_memory)
       @zork_memory.program_counter = 12345
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dave Wilkinson
@@ -80,6 +80,7 @@ files:
 - spec/z/memory_spec.rb
 - spec/z/processor_spec.rb
 - test/logo.txt
+- test/zork1.z3
 has_rdoc: true
 homepage: http://github.com/wilkie/gruesome
 licenses: []
@@ -116,3 +117,4 @@ test_files:
 - spec/z/memory_spec.rb
 - spec/z/processor_spec.rb
 - test/logo.txt
+- test/zork1.z3