Add func names in disassemble

Author: antonmedv

compiler/compiler.go

@@ -54,6 +54,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 		Bytecode:  c.bytecode,
 		Arguments: c.arguments,
 		Functions: c.functions,
+		FuncNames: c.functionNames,
 	}
 	return
 }
@@ -64,6 +65,7 @@ type compiler struct {
 	constants      []interface{}
 	constantsIndex map[interface{}]int
 	functions      []Function
+	functionNames  []string
 	functionsIndex map[string]int
 	mapEnv         bool
 	cast           reflect.Kind
@@ -154,6 +156,7 @@ func (c *compiler) addFunction(fn *builtin.Function) int {
 	}
 	p := len(c.functions)
 	c.functions = append(c.functions, fn.Func)
+	c.functionNames = append(c.functionNames, fn.Name)
 	c.functionsIndex[fn.Name] = p
 	return p
 }

vm/program.go

@@ -23,6 +23,7 @@ type Program struct {
 	Bytecode  []Opcode
 	Arguments []int
 	Functions []Function
+	FuncNames []string
 }
 
 func (program *Program) Disassemble() string {
@@ -74,6 +75,9 @@ func (program *Program) Opcodes(w io.Writer) {
 		builtin := func(label string) {
 			_, _ = fmt.Fprintf(w, "%v\t%v\t<%v>\t%v\n", pp, label, arg, builtin.Functions[arg].Name)
 		}
+		funcName := func(label string) {
+			_, _ = fmt.Fprintf(w, "%v\t%v\t<%v>\t%v()\n", pp, label, arg, program.FuncNames[arg])
+		}
 
 		switch op {
 		case OpInvalid:
@@ -218,16 +222,16 @@ func (program *Program) Opcodes(w io.Writer) {
 			argument("OpCall")
 
 		case OpCall0:
-			argument("OpCall0")
+			funcName("OpCall0")
 
 		case OpCall1:
-			argument("OpCall1")
+			funcName("OpCall1")
 
 		case OpCall2:
-			argument("OpCall2")
+			funcName("OpCall2")
 
 		case OpCall3:
-			argument("OpCall3")
+			funcName("OpCall3")
 
 		case OpCallN:
 			argument("OpCallN")

vm/program_test.go

@@ -13,6 +13,7 @@ func TestProgram_Disassemble(t *testing.T) {
 			Constants: []interface{}{1, 2},
 			Bytecode:  []vm.Opcode{op},
 			Arguments: []int{1},
+			FuncNames: []string{"foo", "bar"},
 		}
 		d := program.Disassemble()
 		if strings.Contains(d, "(unknown)") {