Merge pull request #27 from JunNishimura/feature/update_repl

udpate repl
JunNishimura · Jul 15, 2024 · 44ccf0a · 44ccf0a
2 parents 629581b + 69ef1c1
commit 44ccf0a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/repl/repl.go b/repl/repl.go
@@ -16,6 +16,7 @@ const PROMPT = ">> "
 func Start(in io.Reader, out io.Writer) {
 	scanner := bufio.NewScanner(in)
 	env := object.NewEnvironment()
+	macroEnv := object.NewEnvironment()
 
 	for {
 		fmt.Printf("%s", PROMPT)
@@ -34,7 +35,10 @@ func Start(in io.Reader, out io.Writer) {
 			continue
 		}
 
-		evaluated := evaluator.Eval(program, env)
+		evaluator.DefineMacros(program, macroEnv)
+		expanded := evaluator.ExpandMacros(program, macroEnv)
+
+		evaluated := evaluator.Eval(expanded, env)
 		if evaluated != nil {
 			_, _ = io.WriteString(out, evaluated.Inspect())
 			_, _ = io.WriteString(out, "\n")