From 493b0ff282b5fa44067b9a371b585f56ddcf51eb Mon Sep 17 00:00:00 2001 From: oabrivard Date: Tue, 31 Oct 2023 10:50:30 +0100 Subject: [PATCH] Started chapter 5 on Bytecode --- monkey4/ast/ast.go | 3 ++- monkey4/ast/ast_test.go | 3 ++- monkey4/evaluator/builtins.go | 3 ++- monkey4/evaluator/evaluator.go | 5 +++-- monkey4/evaluator/evaluator_test.go | 7 ++++--- monkey4/go.mod | 2 +- monkey4/lexer/lexer.go | 2 +- monkey4/lexer/lexer_test.go | 2 +- monkey4/main.go | 3 ++- monkey4/object/object.go | 3 ++- monkey4/parser/parser.go | 7 ++++--- monkey4/parser/parser_test.go | 5 +++-- monkey4/repl/repl.go | 9 +++++---- 13 files changed, 32 insertions(+), 22 deletions(-) diff --git a/monkey4/ast/ast.go b/monkey4/ast/ast.go index c7221ba..dcee79a 100644 --- a/monkey4/ast/ast.go +++ b/monkey4/ast/ast.go @@ -2,8 +2,9 @@ package ast import ( "bytes" - "monkey/token" "strings" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/token" ) // The base Node interface diff --git a/monkey4/ast/ast_test.go b/monkey4/ast/ast_test.go index 14a49dc..145dc4f 100644 --- a/monkey4/ast/ast_test.go +++ b/monkey4/ast/ast_test.go @@ -1,8 +1,9 @@ package ast import ( - "monkey/token" "testing" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/token" ) func TestString(t *testing.T) { diff --git a/monkey4/evaluator/builtins.go b/monkey4/evaluator/builtins.go index c4fb0f3..12aee40 100644 --- a/monkey4/evaluator/builtins.go +++ b/monkey4/evaluator/builtins.go @@ -2,7 +2,8 @@ package evaluator import ( "fmt" - "monkey/object" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/object" ) var builtins = map[string]*object.Builtin{ diff --git a/monkey4/evaluator/evaluator.go b/monkey4/evaluator/evaluator.go index 50b2ab5..b1aa16c 100644 --- a/monkey4/evaluator/evaluator.go +++ b/monkey4/evaluator/evaluator.go @@ -2,8 +2,9 @@ package evaluator import ( "fmt" - "monkey/ast" - "monkey/object" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/ast" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/object" ) var ( diff --git a/monkey4/evaluator/evaluator_test.go b/monkey4/evaluator/evaluator_test.go index 2304e6f..1b7c8b7 100644 --- a/monkey4/evaluator/evaluator_test.go +++ b/monkey4/evaluator/evaluator_test.go @@ -1,10 +1,11 @@ package evaluator import ( - "monkey/lexer" - "monkey/object" - "monkey/parser" "testing" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/lexer" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/object" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/parser" ) func TestEvalIntegerExpression(t *testing.T) { diff --git a/monkey4/go.mod b/monkey4/go.mod index 3064854..bc9827b 100644 --- a/monkey4/go.mod +++ b/monkey4/go.mod @@ -1,3 +1,3 @@ -module monkey +module gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4 go 1.14 diff --git a/monkey4/lexer/lexer.go b/monkey4/lexer/lexer.go index db4f5f7..fbfb2ec 100644 --- a/monkey4/lexer/lexer.go +++ b/monkey4/lexer/lexer.go @@ -1,6 +1,6 @@ package lexer -import "monkey/token" +import "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/token" type Lexer struct { input string diff --git a/monkey4/lexer/lexer_test.go b/monkey4/lexer/lexer_test.go index e4e64a4..5b9f852 100644 --- a/monkey4/lexer/lexer_test.go +++ b/monkey4/lexer/lexer_test.go @@ -3,7 +3,7 @@ package lexer import ( "testing" - "monkey/token" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/token" ) func TestNextToken(t *testing.T) { diff --git a/monkey4/main.go b/monkey4/main.go index 1d27138..63474f5 100644 --- a/monkey4/main.go +++ b/monkey4/main.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "monkey/repl" "os" "os/user" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/repl" ) func main() { diff --git a/monkey4/object/object.go b/monkey4/object/object.go index 2c2a1b0..ebe8ad6 100644 --- a/monkey4/object/object.go +++ b/monkey4/object/object.go @@ -4,8 +4,9 @@ import ( "bytes" "fmt" "hash/fnv" - "monkey/ast" "strings" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/ast" ) type BuiltinFunction func(args ...Object) Object diff --git a/monkey4/parser/parser.go b/monkey4/parser/parser.go index 0a1f19c..2baba9c 100644 --- a/monkey4/parser/parser.go +++ b/monkey4/parser/parser.go @@ -2,10 +2,11 @@ package parser import ( "fmt" - "monkey/ast" - "monkey/lexer" - "monkey/token" "strconv" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/ast" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/lexer" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/token" ) const ( diff --git a/monkey4/parser/parser_test.go b/monkey4/parser/parser_test.go index 26f66ec..474474f 100644 --- a/monkey4/parser/parser_test.go +++ b/monkey4/parser/parser_test.go @@ -2,9 +2,10 @@ package parser import ( "fmt" - "monkey/ast" - "monkey/lexer" "testing" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/ast" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/lexer" ) func TestLetStatements(t *testing.T) { diff --git a/monkey4/repl/repl.go b/monkey4/repl/repl.go index 82287ab..b2698cd 100644 --- a/monkey4/repl/repl.go +++ b/monkey4/repl/repl.go @@ -4,10 +4,11 @@ import ( "bufio" "fmt" "io" - "monkey/evaluator" - "monkey/lexer" - "monkey/object" - "monkey/parser" + + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/evaluator" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/lexer" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/object" + "gitea.paas.celticinfo.fr/oabrivard/monkeylang/monkey4/parser" ) const PROMPT = ">> "