Fix severe bug in ZGetPropAddr

ZGetPropAddr must return the address of the property data not the size byte. Add other simple operations.

Author: danieledapo

gork/zdictionary_test.go

@@ -1,9 +1,6 @@
 package gork
 
-import (
-"fmt"
-"testing"
-)
+import "testing"
 
 var dictBuf []byte = []byte{
 3,
@@ -63,7 +60,6 @@ func TestZDictionarySearch(t *testing.T) {
 "golang",
 }
 
-fmt.Println(dict.words)
 for i, w := range dictExpected.words {
 pos := dictExpected.entriesPos + uint32(i)*uint32(dictExpected.entrySize)
 

gork/zobject.go

@@ -161,15 +161,17 @@ func GetPropertyLen(mem *ZMemory, propertyPos uint32) uint16 {
 return uint16(nbytes)
 }
 
-func (obj *ZObject) GetFirstPropertyAddr() uint32 {
+func (obj *ZObject) GetFirstPropertySizeAddr() uint32 {
+// returns the address of the size byte
+
 // text length is in words
 textLength := obj.mem.ByteAt(uint32(obj.propertiesPos))
 return uint32(obj.propertiesPos) + 1 + uint32(textLength)*2
 }
 
 func (obj *ZObject) GetPropertyAddr(propertyId byte) uint32 {
 // v3
-addr := obj.GetFirstPropertyAddr()
+addr := obj.GetFirstPropertySizeAddr()
 
 for {
 size := obj.mem.ByteAt(addr)
@@ -182,11 +184,11 @@ func (obj *ZObject) GetPropertyAddr(propertyId byte) uint32 {
 return 0
 }
 
+// skip size
+addr++
 if propno == propertyId {
 return addr
 }
-// skip size
-addr++
 
 addr += uint32((size >> 5) + 1)
 }

gork/zobject_test.go

@@ -261,7 +261,7 @@ func TestZObjectGetFirstPropertyAddr(t *testing.T) {
 seq.DecodeZString(header)
 }
 
-if obj.GetFirstPropertyAddr() != seq.pos {
+if obj.GetFirstPropertySizeAddr() != seq.pos {
 t.Fail()
 }
 }
@@ -279,24 +279,28 @@ func TestZObjectGetPropertyAddr(t *testing.T) {
 // skip name
 seq.DecodeZString(header)
 }
+
 propPos := seq.pos
 
 keys := obj.PropertiesIds()
 
-if len(keys) > 0 && obj.GetPropertyAddr(keys[0]) != obj.GetFirstPropertyAddr() {
+if len(keys) > 0 && obj.GetPropertyAddr(keys[0]) != obj.GetFirstPropertySizeAddr()+1 {
 t.Fail()
 }
 
 // v3
 keyIdx := 0
 for propId := byte(31); propId > 0; propId-- {
 expected := uint32(0)
+
 if keyIdx < len(keys) && keys[keyIdx] == propId {
+// skip size
+propPos++
+
 expected = propPos
+
 keyIdx++
 
-// skip size
-propPos++
 propPos += uint32(len(zobjectExpected[i].properties[propId]))
 }
 

gork/zoptable.go

@@ -33,7 +33,7 @@ var oneOpFuncs = []OneOpFunc{
 ZGetSibling,
 ZGetChild,
 ZGetParent,
-nil,
+ZGetPropLen,
 ZInc,
 nil,
 ZPrintAt,
@@ -52,10 +52,10 @@ var twoOpFuncs = []TwoOpFunc{
 nil, // ZJe is a two op func but it accepts VAR count of args
 ZJl,
 ZJg,
-nil,
+ZDecChk,
 ZIncChk,
 ZJin,
-nil,
+ZTest,
 ZOr,
 ZAnd,
 ZTestAttr,
@@ -66,7 +66,7 @@ var twoOpFuncs = []TwoOpFunc{
 ZLoadW,
 ZLoadB,
 ZGetProp,
-nil,
+ZGetPropAddr,
 nil,
 ZAdd,
 ZSub,
@@ -300,6 +300,10 @@ func ZJin(zm *ZMachine, childId uint16, parentId uint16) {
 zm.Branch(condition)
 }
 
+func ZTest(zm *ZMachine, bitmap uint16, flags uint16) {
+zm.Branch(bitmap&flags == flags)
+}
+
 func ZGetSibling(zm *ZMachine, objectId uint16) {
 sibling := zm.objects[objectId-1].sibling
 zm.StoreReturn(uint16(sibling))