Split arguments

Author: antonmedv

compiler/compiler.go

@@ -21,7 +21,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 	}()
 
 	c := &compiler{
-		index:     make(map[interface{}]Opcode),
+		index:     make(map[interface{}]int),
 		locations: make([]file.Location, 0),
 	}
 
@@ -44,6 +44,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 		Locations: c.locations,
 		Constants: c.constants,
 		Bytecode:  c.bytecode,
+		Arguments: c.arguments,
 	}
 	return
 }
@@ -54,23 +55,24 @@ type compiler struct {
 	locations []file.Location
 	constants []interface{}
 	bytecode  []Opcode
-	index     map[interface{}]Opcode
+	index     map[interface{}]int
 	mapEnv    bool
 	cast      reflect.Kind
 	nodes     []ast.Node
 	chains    [][]int
+	arguments []int
 }
 
-func (c *compiler) emitLocation(loc file.Location, op Opcode, arg Opcode) int {
+func (c *compiler) emitLocation(loc file.Location, op Opcode, arg int) int {
 	c.bytecode = append(c.bytecode, op)
 	current := len(c.bytecode)
-	c.bytecode = append(c.bytecode, arg)
+	c.arguments = append(c.arguments, arg)
 	c.locations = append(c.locations, loc)
 	return current
 }
 
-func (c *compiler) emit(op Opcode, args ...Opcode) int {
-	var arg Opcode = 0
+func (c *compiler) emit(op Opcode, args ...int) int {
+	var arg int = 0
 	if len(args) > 1 {
 		panic("too many arguments")
 	}
@@ -88,7 +90,7 @@ func (c *compiler) emitPush(value interface{}) int {
 	return c.emit(OpPush, c.addConstant(value))
 }
 
-func (c *compiler) addConstant(constant interface{}) Opcode {
+func (c *compiler) addConstant(constant interface{}) int {
 	indexable := true
 	hash := constant
 	switch reflect.TypeOf(constant).Kind() {
@@ -111,7 +113,7 @@ func (c *compiler) addConstant(constant interface{}) Opcode {
 		panic("exceeded constants max space limit")
 	}
 
-	p := Opcode(len(c.constants) - 1)
+	p := len(c.constants) - 1
 	if indexable {
 		c.index[hash] = p
 	}
@@ -120,11 +122,11 @@ func (c *compiler) addConstant(constant interface{}) Opcode {
 
 func (c *compiler) patchJump(placeholder int) {
 	offset := len(c.bytecode) - 1 - placeholder
-	c.bytecode[placeholder] = Opcode(offset)
+	c.arguments[placeholder-1] = offset
 }
 
-func (c *compiler) calcBackwardJump(to int) Opcode {
-	return Opcode(len(c.bytecode) + 2 - to)
+func (c *compiler) calcBackwardJump(to int) int {
+	return len(c.bytecode) - 1 - to
 }
 
 func (c *compiler) compile(node ast.Node) {
@@ -502,7 +504,7 @@ func (c *compiler) CallNode(node *ast.CallNode) {
 		op = OpCallFast
 	}
 	c.compile(node.Callee)
-	c.emit(op, Opcode(len(node.Arguments)))
+	c.emit(op, len(node.Arguments))
 }
 
 func (c *compiler) BuiltinNode(node *ast.BuiltinNode) {
@@ -632,7 +634,7 @@ func (c *compiler) emitCond(body func()) {
 	c.patchJump(jmp)
 }
 
-func (c *compiler) emitLoop(body func()) Opcode {
+func (c *compiler) emitLoop(body func()) int {
 	i := c.addConstant("i")
 	size := c.addConstant("size")
 	array := c.addConstant("array")

vm/program.go

@@ -13,15 +13,17 @@ type Program struct {
 	Locations []file.Location
 	Constants []interface{}
 	Bytecode  []Opcode
+	Arguments []int
 }
 
 func (program *Program) Disassemble() string {
 	out := ""
 	ip := 0
 	for ip < len(program.Bytecode) {
 		pp := ip
-		op, arg := program.Bytecode[ip], program.Bytecode[ip+1]
-		ip += 2
+		op := program.Bytecode[ip]
+		arg := program.Arguments[ip]
+		ip += 1
 
 		code := func(label string) {
 			out += fmt.Sprintf("%v\t%v\n", pp, label)

vm/vm.go

@@ -49,7 +49,7 @@ func (vm *VM) Run(program *Program, env interface{}) (out interface{}, err error
 	defer func() {
 		if r := recover(); r != nil {
 			f := &file.Error{
-				Location: program.Locations[(vm.ip-2)/2],
+				Location: program.Locations[vm.ip-1],
 				Message:  fmt.Sprintf("%v", r),
 			}
 			err = f.Bind(program.Source)
@@ -75,8 +75,9 @@ func (vm *VM) Run(program *Program, env interface{}) (out interface{}, err error
 			<-vm.step
 		}
 
-		op, arg := program.Bytecode[vm.ip], program.Bytecode[vm.ip+1]
-		vm.ip += 2
+		op := program.Bytecode[vm.ip]
+		arg := program.Arguments[vm.ip]
+		vm.ip += 1
 
 		switch op {