Fix panic error when evaluating an empty expression

MCDevKit · Aug 9, 2024 · f925ab3 · f925ab3
1 parent e9ffd3d
commit f925ab3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jsonte/evaluator.go b/jsonte/evaluator.go
@@ -88,7 +88,7 @@ func EvalScript(text string, scope deque.Deque[*types.JsonObject], path string)
 	p.BuildParseTrees = true
 	tree := p.Script()
 	if listener.Error != nil {
-		return Result{}, burrito.WrapErrorf(listener.Error, "Failed to parse expression \"%s\"", text)
+		return Result{}, burrito.WrapErrorf(listener.Error, "Failed to parse script \"%s\"", text)
 	}
 	visitor := ExpressionVisitor{
 		scope:         scope,

diff --git a/main.go b/main.go
@@ -538,9 +538,9 @@ func repl(scope *types.JsonObject) {
 			fmt.Println(err)
 		} else {
 			fmt.Println(types.ToString(eval.Value))
-		}
-		if !eval.VariableScope.IsEmpty() {
-			s.PushBack(eval.VariableScope)
+			if !eval.VariableScope.IsEmpty() {
+				s.PushBack(eval.VariableScope)
+			}
 		}
 		fmt.Print("> ")
 	}