Fix up chunks a little bit

chunk.go

@@ -0,0 +1,49 @@
+package main
+
+// A chunk consists of opcodes or constants, represented
+// as "value" types:
+const (
+ typ_opcode = iota
+ typ_constant
+)
+
+type Entry struct {
+ typ int
+ opcode
+ value
+}
+
+type chunk struct {
+ entries []Entry
+ index int
+}
+
+func newChunk() *chunk {
+ return &chunk{[]Entry{}, 0}
+}
+
+func (c *chunk) add(e Entry) {
+ c.entries = append(c.entries, e)
+}
+
+func opEntry(o opcode) Entry {
+ return Entry{typ_opcode, o, 0}
+}
+
+func constantEntry(v value) Entry {
+ return Entry{typ_constant, 0, v}
+}
+
+func (c *chunk) next() Entry {
+ e := c.entries[c.index]
+ c.index++
+ return e
+}
+
+func (c *chunk) rewind() {
+ c.index = 0
+}
+
+func (c *chunk) hasMore() bool {
+ return c.index < len(c.entries)
+}

opcode_test.go → chunk_test.go

@@ -29,4 +29,8 @@ func TestChunk(t *testing.T) {
  if c.hasMore() {
  t.Error("chunk should not have more")
  }
+ c.rewind()
+ if !c.hasMore() {
+ t.Error("chunk should have more")
+ }
 }

constant.go

@@ -3,7 +3,7 @@ package main
 
 // for now, constants are just ints with integer index
 // in the constant table
-type constant int
+type constant value
 
 var constantTable = []constant{}
 

opcode.go

@@ -41,51 +41,3 @@ func (o opcode) String() string {
  return "UNKNOWN_OPCODE"
  }
 }
-
-// A chunk consists of opcodes or constants, represented
-// as "value" types:
-const (
- typ_opcode = iota
- typ_constant
-)
-
-type Entry struct {
- typ int
- opcode
- value
-}
-
-type chunk struct {
- entries []Entry
- index int
-}
-
-func newChunk() *chunk {
- return &chunk{[]Entry{}, 0}
-}
-
-func (c *chunk) add(e Entry) {
- c.entries = append(c.entries, e)
-}
-
-func opEntry(o opcode) Entry {
- return Entry{typ_opcode, o, 0}
-}
-
-func constantEntry(v value) Entry {
- return Entry{typ_constant, 0, v}
-}
-
-func (c *chunk) next() Entry {
- e := c.entries[c.index]
- c.index++
- return e
-}
-
-func (c *chunk) rewind() {
- c.index = 0
-}
-
-func (c *chunk) hasMore() bool {
- return c.index < len(c.entries)
-}