Move dump functions to gork-ztools

Author: danieledapo

gork-ztools/main.go

@@ -54,15 +54,15 @@ func dumpStoryInfo(story string, conf *config) {
 }
 
 if conf.showObjects {
-gork.DumpAllZObjects(mem, header)
+DumpAllZObjects(mem, header)
 }
 
 if conf.showObjectTree {
-gork.DumpZObjectsTree(mem, header)
+DumpZObjectsTree(mem, header)
 }
 
 if conf.showAbbreviations {
-gork.DumpAbbreviations(mem, header)
+DumpAbbreviations(mem, header)
 }
 
 if conf.showDictionary {
@@ -71,3 +71,68 @@ func dumpStoryInfo(story string, conf *config) {
 
 fmt.Println("")
 }
+
+func DumpAbbreviations(mem *gork.ZMemory, header *gork.ZHeader) {
+fmt.Print("\n **** Abbreviations ****\n\n")
+
+abbrs := gork.GetAbbreviations(mem, header)
+
+if len(abbrs) == 0 {
+fmt.Printf(" No abbreviation information.\n")
+return
+}
+
+for i, abbr := range abbrs {
+fmt.Printf(" [%2d] \"%s\"\n", i, abbr)
+}
+}
+
+func DumpAllZObjects(mem *gork.ZMemory, header *gork.ZHeader) {
+total := gork.ZObjectsCount(mem, header)
+
+fmt.Print("\n **** Objects ****\n\n")
+fmt.Printf(" Object count = %d\n\n", total)
+
+for i := uint8(1); i <= total; i++ {
+fmt.Printf("%3d. %s", i, gork.NewZObject(mem, i, header))
+}
+}
+
+func DumpZObjectsTree(mem *gork.ZMemory, header *gork.ZHeader) {
+
+fmt.Print("\n **** Object tree ****\n\n")
+
+total := gork.ZObjectsCount(mem, header)
+
+var printObject func(obj *gork.ZObject, depth int)
+printObject = func(obj *gork.ZObject, depth int) {
+for {
+
+for j := 0; j < depth; j++ {
+fmt.Print(" . ")
+}
+fmt.Printf("[%3d] ", obj.Id())
+fmt.Printf("\"%s\"\n", obj.Name())
+
+if obj.ChildId() != 0 {
+childobj := gork.NewZObject(mem, obj.ChildId(), header)
+printObject(childobj, depth+1)
+}
+
+if obj.SiblingId() == 0 {
+break
+}
+obj = gork.NewZObject(mem, obj.SiblingId(), header)
+}
+}
+
+for i := uint8(1); i <= total; i++ {
+zobj := gork.NewZObject(mem, i, header)
+
+// root
+if zobj.ParentId() == 0 {
+printObject(zobj, 0)
+break
+}
+}
+}

gork/zabbreviations.go

@@ -1,9 +1,5 @@
 package gork
 
-import (
-"fmt"
-)
-
 // v3 3 tables * 32 entries each
 const abbrCount = 32 * 3
 
@@ -20,18 +16,3 @@ func GetAbbreviations(mem *ZMemory, header *ZHeader) []string {
 
 return ret
 }
-
-func DumpAbbreviations(mem *ZMemory, header *ZHeader) {
-fmt.Print("\n **** Abbreviations ****\n\n")
-
-abbrs := GetAbbreviations(mem, header)
-
-if len(abbrs) == 0 {
-fmt.Printf(" No abbreviation information.\n")
-return
-}
-
-for i, abbr := range abbrs {
-fmt.Printf(" [%2d] \"%s\"\n", i, abbr)
-}
-}

gork/zobject.go

@@ -304,6 +304,26 @@ func (obj *ZObject) PropertiesIds() []byte {
 return ret
 }
 
+func (obj *ZObject) Id() uint8 {
+return obj.number
+}
+
+func (obj *ZObject) Name() string {
+return obj.name
+}
+
+func (obj *ZObject) ParentId() uint8 {
+return obj.parent
+}
+
+func (obj *ZObject) SiblingId() uint8 {
+return obj.sibling
+}
+
+func (obj *ZObject) ChildId() uint8 {
+return obj.child
+}
+
 func (obj *ZObject) String() string {
 ret := ""
 
@@ -341,52 +361,3 @@ func (obj *ZObject) String() string {
 
 return ret
 }
-
-func DumpAllZObjects(mem *ZMemory, header *ZHeader) {
-total := ZObjectsCount(mem, header)
-
-fmt.Print("\n **** Objects ****\n\n")
-fmt.Printf(" Object count = %d\n\n", total)
-
-for i := uint8(1); i <= total; i++ {
-fmt.Printf("%3d. %s", i, NewZObject(mem, i, header))
-}
-}
-
-func DumpZObjectsTree(mem *ZMemory, header *ZHeader) {
-
-fmt.Print("\n **** Object tree ****\n\n")
-
-total := ZObjectsCount(mem, header)
-
-var printObject func(obj *ZObject, depth int)
-printObject = func(obj *ZObject, depth int) {
-for {
-
-for j := 0; j < depth; j++ {
-fmt.Print(" . ")
-}
-fmt.Printf("[%3d] ", obj.number)
-fmt.Printf("\"%s\"\n", obj.name)
-
-if obj.child != 0 {
-childobj := NewZObject(mem, obj.child, header)
-printObject(childobj, depth+1)
-}
-
-if obj.sibling == 0 {
-break
-}
-obj = NewZObject(mem, obj.sibling, header)
-}
-}
-
-for i := uint8(1); i <= total; i++ {
-zobj := NewZObject(mem, i, header)
-
-// root
-if zobj.parent == 0 {
-printObject(zobj, 0)
-}
-}
-}