From 8e32cc1a5617f84d0bd7bf1fd898251675d5a653 Mon Sep 17 00:00:00 2001 From: Marc Vertes Date: Thu, 27 Nov 2025 12:46:13 +0100 Subject: chore: mv parser/interpreter.go interpreter/ --- interpreter/interpreter.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++ parser/interpreter.go | 54 ---------------------------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 interpreter/interpreter.go delete mode 100644 parser/interpreter.go diff --git a/interpreter/interpreter.go b/interpreter/interpreter.go new file mode 100644 index 0000000..06a4bc1 --- /dev/null +++ b/interpreter/interpreter.go @@ -0,0 +1,54 @@ +package interpreter + +import ( + "reflect" + + "github.com/mvertes/parscan/compiler" + "github.com/mvertes/parscan/scanner" + "github.com/mvertes/parscan/vm" +) + +const debug = true + +// Interpreter represents the state of an interpreter. +type Interpreter struct { + *compiler.Compiler + *vm.Machine +} + +// NewInterpreter returns a new interpreter state. +func NewInterpreter(s *scanner.Scanner) *Interpreter { + return &Interpreter{compiler.NewCompiler(s), &vm.Machine{}} +} + +// Eval interprets a src program and return the last produced value if any, or an error. +func (i *Interpreter) Eval(src string) (res reflect.Value, err error) { + codeOffset := len(i.Code) + dataOffset := 0 + if codeOffset > 0 { + // All data must be copied to the VM the first time only (re-entrance). + dataOffset = len(i.Data) + } + i.PopExit() // Remove last exit from previous run (re-entrance). + + t, err := i.Parse(src) + if err != nil { + return res, err + } + if err = i.Codegen(t); err != nil { + return res, err + } + i.Push(i.Data[dataOffset:]...) + i.PushCode(i.Code[codeOffset:]...) + if s, ok := i.Symbols["main"]; ok { + i.PushCode(vm.Instruction{Op: vm.Calli, Arg: []int{int(i.Data[s.Index].Data.Int())}}) + } + i.PushCode(vm.Instruction{Op: vm.Exit}) + i.SetIP(max(codeOffset, i.Entry)) + if debug { + i.PrintData() + i.PrintCode() + } + err = i.Run() + return i.Top().Data, err +} diff --git a/parser/interpreter.go b/parser/interpreter.go deleted file mode 100644 index 06a4bc1..0000000 --- a/parser/interpreter.go +++ /dev/null @@ -1,54 +0,0 @@ -package interpreter - -import ( - "reflect" - - "github.com/mvertes/parscan/compiler" - "github.com/mvertes/parscan/scanner" - "github.com/mvertes/parscan/vm" -) - -const debug = true - -// Interpreter represents the state of an interpreter. -type Interpreter struct { - *compiler.Compiler - *vm.Machine -} - -// NewInterpreter returns a new interpreter state. -func NewInterpreter(s *scanner.Scanner) *Interpreter { - return &Interpreter{compiler.NewCompiler(s), &vm.Machine{}} -} - -// Eval interprets a src program and return the last produced value if any, or an error. -func (i *Interpreter) Eval(src string) (res reflect.Value, err error) { - codeOffset := len(i.Code) - dataOffset := 0 - if codeOffset > 0 { - // All data must be copied to the VM the first time only (re-entrance). - dataOffset = len(i.Data) - } - i.PopExit() // Remove last exit from previous run (re-entrance). - - t, err := i.Parse(src) - if err != nil { - return res, err - } - if err = i.Codegen(t); err != nil { - return res, err - } - i.Push(i.Data[dataOffset:]...) - i.PushCode(i.Code[codeOffset:]...) - if s, ok := i.Symbols["main"]; ok { - i.PushCode(vm.Instruction{Op: vm.Calli, Arg: []int{int(i.Data[s.Index].Data.Int())}}) - } - i.PushCode(vm.Instruction{Op: vm.Exit}) - i.SetIP(max(codeOffset, i.Entry)) - if debug { - i.PrintData() - i.PrintCode() - } - err = i.Run() - return i.Top().Data, err -} -- cgit v1.2.3