From ad4772002357d25d37b2d9449e1ba516c9c7a47d Mon Sep 17 00:00:00 2001 From: chechyotka Date: Fri, 6 Oct 2023 13:18:28 +0300 Subject: [PATCH] refactored --- ast/array_literal.go | 3 ++- ast/ast.go | 2 +- ast/ast_test.go | 3 ++- ast/block_stmt.go | 3 ++- ast/boolean_literal.go | 2 +- ast/call_expression.go | 3 ++- ast/expression_stmt.go | 2 +- ast/for_loop_expression.go | 2 +- ast/function_literal.go | 3 ++- ast/if_else_expression.go | 2 +- ast/index_expression.go | 3 ++- ast/infix_expression.go | 3 ++- ast/integer_literal.go | 2 +- ast/prefix_expression.go | 3 ++- ast/return_stmt.go | 3 ++- ast/string_literal.go | 2 +- ast/variable_stmt.go | 3 ++- cmd/main.go | 4 +--- evaluator/builtins.go | 2 +- evaluator/evaluator.go | 6 +++--- evaluator/evaluator_test.go | 5 +++-- go.mod | 3 --- lexer/lexer.go | 2 +- lexer/lexer_test.go | 2 +- object/function.go | 2 +- parser/array_literal_test.go | 3 ++- parser/call_expression_test.go | 3 ++- parser/expression_stmt_test.go | 2 +- parser/for_loop_test.go | 2 +- parser/function_test.go | 3 ++- parser/if_expression_test.go | 2 +- parser/index_expression_test.go | 3 ++- parser/parser.go | 6 +++--- parser/variable_stmt_test.go | 4 ++-- repl/repl.go | 6 +++--- 35 files changed, 57 insertions(+), 47 deletions(-) delete mode 100644 go.mod diff --git a/ast/array_literal.go b/ast/array_literal.go index 2f9ad32..ee37bef 100644 --- a/ast/array_literal.go +++ b/ast/array_literal.go @@ -3,7 +3,8 @@ package ast import ( "bytes" "strings" - "uman/token" + + "github.com/usamaroman/uman/token" ) type ArrayLiteral struct { diff --git a/ast/ast.go b/ast/ast.go index 69faad2..8a264b0 100644 --- a/ast/ast.go +++ b/ast/ast.go @@ -3,7 +3,7 @@ package ast import ( "bytes" - "uman/token" + "github.com/usamaroman/uman/token" ) type Node interface { diff --git a/ast/ast_test.go b/ast/ast_test.go index 447b7ea..54d1194 100644 --- a/ast/ast_test.go +++ b/ast/ast_test.go @@ -3,7 +3,8 @@ package ast import ( "log" "testing" - "uman/token" + + "github.com/usamaroman/uman/token" ) func TestAst(t *testing.T) { diff --git a/ast/block_stmt.go b/ast/block_stmt.go index b14cda2..532b382 100644 --- a/ast/block_stmt.go +++ b/ast/block_stmt.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) type BlockStatement struct { diff --git a/ast/boolean_literal.go b/ast/boolean_literal.go index 40b56b5..5e7d52f 100644 --- a/ast/boolean_literal.go +++ b/ast/boolean_literal.go @@ -1,6 +1,6 @@ package ast -import "uman/token" +import "github.com/usamaroman/uman/token" type BooleanLiteral struct { Token token.Token diff --git a/ast/call_expression.go b/ast/call_expression.go index 20b616e..ae3709c 100644 --- a/ast/call_expression.go +++ b/ast/call_expression.go @@ -3,7 +3,8 @@ package ast import ( "bytes" "strings" - "uman/token" + + "github.com/usamaroman/uman/token" ) type CallExpression struct { diff --git a/ast/expression_stmt.go b/ast/expression_stmt.go index 4c2ef80..82a451d 100644 --- a/ast/expression_stmt.go +++ b/ast/expression_stmt.go @@ -1,6 +1,6 @@ package ast -import "uman/token" +import "github.com/usamaroman/uman/token" type ExpressionStatement struct { Token token.Token // first token diff --git a/ast/for_loop_expression.go b/ast/for_loop_expression.go index b5d7302..3c8c2f8 100644 --- a/ast/for_loop_expression.go +++ b/ast/for_loop_expression.go @@ -3,7 +3,7 @@ package ast import ( "bytes" - "uman/token" + "github.com/usamaroman/uman/token" ) type ForLoopExpression struct { diff --git a/ast/function_literal.go b/ast/function_literal.go index c8d446e..a53e227 100644 --- a/ast/function_literal.go +++ b/ast/function_literal.go @@ -3,7 +3,8 @@ package ast import ( "bytes" "strings" - "uman/token" + + "github.com/usamaroman/uman/token" ) type FunctionLiteral struct { diff --git a/ast/if_else_expression.go b/ast/if_else_expression.go index df4a6d0..0047791 100644 --- a/ast/if_else_expression.go +++ b/ast/if_else_expression.go @@ -3,7 +3,7 @@ package ast import ( "bytes" - "uman/token" + "github.com/usamaroman/uman/token" ) type IfExpression struct { diff --git a/ast/index_expression.go b/ast/index_expression.go index 1be77a2..bd8659f 100644 --- a/ast/index_expression.go +++ b/ast/index_expression.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) type IndexExpression struct { diff --git a/ast/infix_expression.go b/ast/infix_expression.go index 60208b6..d44645a 100644 --- a/ast/infix_expression.go +++ b/ast/infix_expression.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) type InfixExpression struct { diff --git a/ast/integer_literal.go b/ast/integer_literal.go index dd21565..26bead6 100644 --- a/ast/integer_literal.go +++ b/ast/integer_literal.go @@ -1,6 +1,6 @@ package ast -import "uman/token" +import "github.com/usamaroman/uman/token" type IntegerLiteral struct { Token token.Token diff --git a/ast/prefix_expression.go b/ast/prefix_expression.go index 5368d16..5c577c8 100644 --- a/ast/prefix_expression.go +++ b/ast/prefix_expression.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) type PrefixExpression struct { diff --git a/ast/return_stmt.go b/ast/return_stmt.go index 02d76c8..79aecb1 100644 --- a/ast/return_stmt.go +++ b/ast/return_stmt.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) // ReturnStatement returns variable from function diff --git a/ast/string_literal.go b/ast/string_literal.go index 7dbdce9..8229b46 100644 --- a/ast/string_literal.go +++ b/ast/string_literal.go @@ -1,7 +1,7 @@ package ast import ( - "uman/token" + "github.com/usamaroman/uman/token" ) type StringLiteral struct { diff --git a/ast/variable_stmt.go b/ast/variable_stmt.go index 0be1980..abdfe2b 100644 --- a/ast/variable_stmt.go +++ b/ast/variable_stmt.go @@ -2,7 +2,8 @@ package ast import ( "bytes" - "uman/token" + + "github.com/usamaroman/uman/token" ) // VariableStatement variable creates using : diff --git a/cmd/main.go b/cmd/main.go index f66807c..db7c6c8 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,12 +4,10 @@ import ( "log" "os" - "uman/repl" + "github.com/usamaroman/uman/repl" ) func main() { - // TODO: реализовать переприсваивание infix Fn for = - args := os.Args switch len(args) { case 1: diff --git a/evaluator/builtins.go b/evaluator/builtins.go index b60c638..1d8d9df 100644 --- a/evaluator/builtins.go +++ b/evaluator/builtins.go @@ -3,7 +3,7 @@ package evaluator import ( "fmt" - "uman/object" + "github.com/usamaroman/uman/object" ) var builtins = map[string]*object.Builtin{ diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go index 495c416..2a4da21 100644 --- a/evaluator/evaluator.go +++ b/evaluator/evaluator.go @@ -3,9 +3,9 @@ package evaluator import ( "fmt" - "uman/ast" - "uman/object" - "uman/token" + "github.com/usamaroman/uman/ast" + "github.com/usamaroman/uman/object" + "github.com/usamaroman/uman/token" ) var ( diff --git a/evaluator/evaluator_test.go b/evaluator/evaluator_test.go index 1b55974..962cff8 100644 --- a/evaluator/evaluator_test.go +++ b/evaluator/evaluator_test.go @@ -2,8 +2,9 @@ package evaluator import ( "testing" - "uman/object" - "uman/parser" + + "github.com/usamaroman/uman/object" + "github.com/usamaroman/uman/parser" ) func testEval(input string) object.Object { diff --git a/go.mod b/go.mod deleted file mode 100644 index 4088890..0000000 --- a/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module uman - -go 1.21.0 diff --git a/lexer/lexer.go b/lexer/lexer.go index c13e9ae..11b2d23 100644 --- a/lexer/lexer.go +++ b/lexer/lexer.go @@ -3,7 +3,7 @@ package lexer import ( "unicode" - "uman/token" + "github.com/usamaroman/uman/token" ) type Lexer struct { diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go index 8b8830e..a1fa91e 100644 --- a/lexer/lexer_test.go +++ b/lexer/lexer_test.go @@ -3,7 +3,7 @@ package lexer import ( "testing" - "uman/token" + "github.com/usamaroman/uman/token" ) func TestNextToken(t *testing.T) { diff --git a/object/function.go b/object/function.go index 604ff67..029f096 100644 --- a/object/function.go +++ b/object/function.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "uman/ast" + "github.com/usamaroman/uman/ast" ) type Function struct { diff --git a/parser/array_literal_test.go b/parser/array_literal_test.go index 1d29564..25b0c8f 100644 --- a/parser/array_literal_test.go +++ b/parser/array_literal_test.go @@ -2,7 +2,8 @@ package parser import ( "testing" - "uman/ast" + + "github.com/usamaroman/uman/ast" ) func TestParsingArrayLiterals(t *testing.T) { diff --git a/parser/call_expression_test.go b/parser/call_expression_test.go index a33689a..aa1827c 100644 --- a/parser/call_expression_test.go +++ b/parser/call_expression_test.go @@ -2,7 +2,8 @@ package parser import ( "testing" - "uman/ast" + + "github.com/usamaroman/uman/ast" ) func TestCallExpressionParsing(t *testing.T) { diff --git a/parser/expression_stmt_test.go b/parser/expression_stmt_test.go index ebcf2a7..ccd6d71 100644 --- a/parser/expression_stmt_test.go +++ b/parser/expression_stmt_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "uman/ast" + "github.com/usamaroman/uman/ast" ) func TestIdentifierExpression(t *testing.T) { diff --git a/parser/for_loop_test.go b/parser/for_loop_test.go index 99a9416..5ac039e 100644 --- a/parser/for_loop_test.go +++ b/parser/for_loop_test.go @@ -3,7 +3,7 @@ package parser import ( "testing" - "uman/ast" + "github.com/usamaroman/uman/ast" ) func TestForLoopExpression(t *testing.T) { diff --git a/parser/function_test.go b/parser/function_test.go index 6a83720..86098c6 100644 --- a/parser/function_test.go +++ b/parser/function_test.go @@ -2,7 +2,8 @@ package parser import ( "testing" - "uman/ast" + + "github.com/usamaroman/uman/ast" ) func TestFunctionExpression(t *testing.T) { diff --git a/parser/if_expression_test.go b/parser/if_expression_test.go index 6201e9b..172092d 100644 --- a/parser/if_expression_test.go +++ b/parser/if_expression_test.go @@ -3,7 +3,7 @@ package parser import ( "testing" - "uman/ast" + "github.com/usamaroman/uman/ast" ) func TestIfExpression(t *testing.T) { diff --git a/parser/index_expression_test.go b/parser/index_expression_test.go index b1ab3ab..852f81c 100644 --- a/parser/index_expression_test.go +++ b/parser/index_expression_test.go @@ -2,7 +2,8 @@ package parser import ( "testing" - "uman/ast" + + "github.com/usamaroman/uman/ast" ) func TestParsingIndexExpressions(t *testing.T) { diff --git a/parser/parser.go b/parser/parser.go index 8a6fc7a..b8c41a5 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "uman/ast" - "uman/lexer" - "uman/token" + "github.com/usamaroman/uman/ast" + "github.com/usamaroman/uman/lexer" + "github.com/usamaroman/uman/token" ) type ( diff --git a/parser/variable_stmt_test.go b/parser/variable_stmt_test.go index 50c2c35..488a031 100644 --- a/parser/variable_stmt_test.go +++ b/parser/variable_stmt_test.go @@ -3,8 +3,8 @@ package parser import ( "testing" - "uman/ast" - "uman/token" + "github.com/usamaroman/uman/ast" + "github.com/usamaroman/uman/token" ) func TestVariableStatements(t *testing.T) { diff --git a/repl/repl.go b/repl/repl.go index 5bc1414..b40fb31 100644 --- a/repl/repl.go +++ b/repl/repl.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "uman/evaluator" - "uman/object" - "uman/parser" + "github.com/usamaroman/uman/evaluator" + "github.com/usamaroman/uman/object" + "github.com/usamaroman/uman/parser" ) var ErrWrongExtension = errors.New("wrong file extension")