Improve location storage in program

Author: antonmedv

compiler/compiler.go

@@ -21,7 +21,8 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 	}()
 
 	c := &compiler{
-		index: make(map[interface{}]uint16),
+		index:     make(map[interface{}]uint16),
+		locations: make(map[int]file.Location),
 	}
 	if config != nil {
 		c.mapEnv = config.MapEnv
@@ -47,7 +48,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 }
 
 type compiler struct {
-	locations []file.Location
+	locations map[int]file.Location
 	constants []interface{}
 	bytecode  []byte
 	index     map[interface{}]uint16
@@ -61,13 +62,11 @@ func (c *compiler) emit(op byte, b ...byte) int {
 	current := len(c.bytecode)
 	c.bytecode = append(c.bytecode, b...)
 
-	for i := 0; i < 1+len(b); i++ {
-		var loc file.Location
-		if len(c.nodes) > 0 {
-			loc = c.nodes[len(c.nodes)-1].Location()
-		}
-		c.locations = append(c.locations, loc)
+	var loc file.Location
+	if len(c.nodes) > 0 {
+		loc = c.nodes[len(c.nodes)-1].Location()
 	}
+	c.locations[current-1] = loc
 
 	return current
 }

vm/program.go

@@ -10,7 +10,7 @@ import (
 
 type Program struct {
 	Source    *file.Source
-	Locations []file.Location
+	Locations map[int]file.Location
 	Constants []interface{}
 	Bytecode  []byte
 }

vm/vm_test.go

@@ -107,3 +107,19 @@ func TestRun_memory_budget(t *testing.T) {
 	_, err = vm.Run(program, nil)
 	require.Error(t, err)
 }
+
+func TestRun_runtime_error(t *testing.T) {
+	input := `map(1..3, {1/(#-3)})`
+
+	tree, err := parser.Parse(input)
+	require.NoError(t, err)
+
+	program, err := compiler.Compile(tree, nil)
+	require.NoError(t, err)
+
+	_, err = vm.Run(program, nil)
+	require.Error(t, err)
+	require.Equal(t, `runtime error: integer divide by zero (1:13)
+ | map(1..3, {1/(#-3)})
+ | ............^`, err.Error())
+}