From a71a7714248b1a9cc5dc55822cff395b5c86e6f7 Mon Sep 17 00:00:00 2001 From: Dylan Moore Date: Wed, 23 Oct 2024 19:47:55 -0700 Subject: [PATCH] Revert "antonmedv -> techdroplabs" This reverts commit e1a90da6475ca8bc7317de8413aa753db6d74190. --- ast/node.go | 2 +- ast/visitor_test.go | 2 +- bench_test.go | 4 ++-- checker/checker.go | 8 ++++---- checker/checker_test.go | 10 +++++----- checker/types.go | 2 +- cmd/exe/debugger.go | 10 +++++----- cmd/exe/dot.go | 2 +- cmd/exe/main.go | 14 +++++++------- compiler/compiler.go | 10 +++++----- compiler/compiler_test.go | 8 ++++---- compiler/patcher.go | 4 ++-- conf/config.go | 4 ++-- docgen/docgen.go | 2 +- docgen/docgen_test.go | 2 +- docs/examples/dates_test.go | 2 +- expr.go | 16 ++++++++-------- expr_test.go | 6 +++--- file/source_test.go | 4 ++-- optimizer/const_expr.go | 4 ++-- optimizer/const_range.go | 2 +- optimizer/fold.go | 4 ++-- optimizer/in_array.go | 2 +- optimizer/in_range.go | 2 +- optimizer/optimizer.go | 4 ++-- optimizer/optimizer_test.go | 10 +++++----- parser/lexer/lexer.go | 2 +- parser/lexer/lexer_test.go | 4 ++-- parser/lexer/token.go | 2 +- parser/parser.go | 6 +++--- parser/parser_test.go | 4 ++-- vm/program.go | 2 +- vm/program_test.go | 2 +- vm/vm.go | 2 +- vm/vm_test.go | 12 ++++++------ 35 files changed, 88 insertions(+), 88 deletions(-) diff --git a/ast/node.go b/ast/node.go index 4d9dfaa48..4b2b5c277 100644 --- a/ast/node.go +++ b/ast/node.go @@ -4,7 +4,7 @@ import ( "reflect" "regexp" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/file" ) // Node represents items of abstract syntax tree. diff --git a/ast/visitor_test.go b/ast/visitor_test.go index 9aa11b94c..16ea69222 100644 --- a/ast/visitor_test.go +++ b/ast/visitor_test.go @@ -3,7 +3,7 @@ package ast_test import ( "testing" - "github.com/techdroplabs/expr/ast" + "github.com/antonmedv/expr/ast" "github.com/stretchr/testify/assert" ) diff --git a/bench_test.go b/bench_test.go index ef7862487..ee34c0713 100644 --- a/bench_test.go +++ b/bench_test.go @@ -3,8 +3,8 @@ package expr_test import ( "testing" - "github.com/techdroplabs/expr" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr" + "github.com/antonmedv/expr/vm" ) func Benchmark_expr(b *testing.B) { diff --git a/checker/checker.go b/checker/checker.go index d4460aa81..282031a1f 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -4,10 +4,10 @@ import ( "fmt" "reflect" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/file" - "github.com/techdroplabs/expr/parser" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/file" + "github.com/antonmedv/expr/parser" ) var errorType = reflect.TypeOf((*error)(nil)).Elem() diff --git a/checker/checker_test.go b/checker/checker_test.go index b1e7c6708..a7fb4d2ab 100644 --- a/checker/checker_test.go +++ b/checker/checker_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/techdroplabs/expr" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/parser" + "github.com/antonmedv/expr" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/parser" "github.com/stretchr/testify/assert" ) diff --git a/checker/types.go b/checker/types.go index d06b57abb..756ed8f5d 100644 --- a/checker/types.go +++ b/checker/types.go @@ -3,7 +3,7 @@ package checker import ( "reflect" - "github.com/techdroplabs/expr/ast" + "github.com/antonmedv/expr/ast" ) var ( diff --git a/cmd/exe/debugger.go b/cmd/exe/debugger.go index db51ac2dc..8ca9a871c 100644 --- a/cmd/exe/debugger.go +++ b/cmd/exe/debugger.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/compiler" - "github.com/techdroplabs/expr/optimizer" - "github.com/techdroplabs/expr/parser" - . "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/compiler" + "github.com/antonmedv/expr/optimizer" + "github.com/antonmedv/expr/parser" + . "github.com/antonmedv/expr/vm" "github.com/gdamore/tcell" "github.com/rivo/tview" "github.com/sanity-io/litter" diff --git a/cmd/exe/dot.go b/cmd/exe/dot.go index c248b7ac1..46c62eb65 100644 --- a/cmd/exe/dot.go +++ b/cmd/exe/dot.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/techdroplabs/expr/ast" + . "github.com/antonmedv/expr/ast" ) const format = `digraph { diff --git a/cmd/exe/main.go b/cmd/exe/main.go index 7e6b9e9ba..5a0394073 100644 --- a/cmd/exe/main.go +++ b/cmd/exe/main.go @@ -4,16 +4,16 @@ import ( "bufio" "flag" "fmt" - "github.com/techdroplabs/expr/ast" + "github.com/antonmedv/expr/ast" "io/ioutil" "os" - "github.com/techdroplabs/expr" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/compiler" - "github.com/techdroplabs/expr/optimizer" - "github.com/techdroplabs/expr/parser" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/compiler" + "github.com/antonmedv/expr/optimizer" + "github.com/antonmedv/expr/parser" + "github.com/antonmedv/expr/vm" "github.com/sanity-io/litter" ) diff --git a/compiler/compiler.go b/compiler/compiler.go index 5563a4e93..36ac92f23 100644 --- a/compiler/compiler.go +++ b/compiler/compiler.go @@ -6,11 +6,11 @@ import ( "math" "reflect" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/file" - "github.com/techdroplabs/expr/parser" - . "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/file" + "github.com/antonmedv/expr/parser" + . "github.com/antonmedv/expr/vm" ) func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err error) { diff --git a/compiler/compiler_test.go b/compiler/compiler_test.go index 61b305348..51a9b6af6 100644 --- a/compiler/compiler_test.go +++ b/compiler/compiler_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/techdroplabs/expr/compiler" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/parser" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/compiler" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/parser" + "github.com/antonmedv/expr/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/compiler/patcher.go b/compiler/patcher.go index fdf5a7938..2491dec9d 100644 --- a/compiler/patcher.go +++ b/compiler/patcher.go @@ -1,8 +1,8 @@ package compiler import ( - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/conf" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/conf" ) type operatorPatcher struct { diff --git a/conf/config.go b/conf/config.go index bb78f36cd..7ba07fe0d 100644 --- a/conf/config.go +++ b/conf/config.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/vm" ) type Config struct { diff --git a/docgen/docgen.go b/docgen/docgen.go index dc2962159..f3907389f 100644 --- a/docgen/docgen.go +++ b/docgen/docgen.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/techdroplabs/expr/conf" + "github.com/antonmedv/expr/conf" ) // Kind can be any of array, map, struct, func, string, int, float, bool or any. diff --git a/docgen/docgen_test.go b/docgen/docgen_test.go index 503821931..e8421ed0c 100644 --- a/docgen/docgen_test.go +++ b/docgen/docgen_test.go @@ -1,7 +1,7 @@ package docgen_test import ( - . "github.com/techdroplabs/expr/docgen" + . "github.com/antonmedv/expr/docgen" "github.com/sanity-io/litter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/docs/examples/dates_test.go b/docs/examples/dates_test.go index c1fb77c57..5d431c3e2 100644 --- a/docs/examples/dates_test.go +++ b/docs/examples/dates_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/techdroplabs/expr" + "github.com/antonmedv/expr" "github.com/stretchr/testify/require" ) diff --git a/expr.go b/expr.go index c6302b7c3..05c54adb1 100644 --- a/expr.go +++ b/expr.go @@ -2,16 +2,16 @@ package expr import ( "fmt" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/file" "reflect" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/compiler" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/optimizer" - "github.com/techdroplabs/expr/parser" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/compiler" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/optimizer" + "github.com/antonmedv/expr/parser" + "github.com/antonmedv/expr/vm" ) // Option for configuring config. diff --git a/expr_test.go b/expr_test.go index 454b1cb14..13cb55c8e 100644 --- a/expr_test.go +++ b/expr_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/file" - "github.com/techdroplabs/expr" + "github.com/antonmedv/expr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/file/source_test.go b/file/source_test.go index 8933801e7..2d2c881f1 100644 --- a/file/source_test.go +++ b/file/source_test.go @@ -48,8 +48,8 @@ func TestStringSource_SnippetSingleLine(t *testing.T) { t.Errorf(unexpectedSnippet, t.Name(), str, "hello, world") } if str2, found := source.Snippet(2); found { - t.Errorf(snippetFound, t.Name(), 2) + t.Error(snippetFound, t.Name(), 2) } else if str2 != "" { - t.Errorf(unexpectedSnippet, t.Name(), str2, "") + t.Error(unexpectedSnippet, t.Name(), str2, "") } } diff --git a/optimizer/const_expr.go b/optimizer/const_expr.go index aa7bf2c34..85fcc337f 100644 --- a/optimizer/const_expr.go +++ b/optimizer/const_expr.go @@ -2,8 +2,8 @@ package optimizer import ( "fmt" - . "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/file" + . "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/file" "reflect" "strings" ) diff --git a/optimizer/const_range.go b/optimizer/const_range.go index 9723f1ec8..5205aa14f 100644 --- a/optimizer/const_range.go +++ b/optimizer/const_range.go @@ -1,7 +1,7 @@ package optimizer import ( - . "github.com/techdroplabs/expr/ast" + . "github.com/antonmedv/expr/ast" ) type constRange struct{} diff --git a/optimizer/fold.go b/optimizer/fold.go index d0b6ccd9a..666912541 100644 --- a/optimizer/fold.go +++ b/optimizer/fold.go @@ -4,8 +4,8 @@ import ( "math" "reflect" - . "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/file" + . "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/file" ) type fold struct { diff --git a/optimizer/in_array.go b/optimizer/in_array.go index 1c6d0d767..8156faa5e 100644 --- a/optimizer/in_array.go +++ b/optimizer/in_array.go @@ -3,7 +3,7 @@ package optimizer import ( "reflect" - . "github.com/techdroplabs/expr/ast" + . "github.com/antonmedv/expr/ast" ) type inArray struct{} diff --git a/optimizer/in_range.go b/optimizer/in_range.go index 9ee873642..177c91933 100644 --- a/optimizer/in_range.go +++ b/optimizer/in_range.go @@ -1,7 +1,7 @@ package optimizer import ( - . "github.com/techdroplabs/expr/ast" + . "github.com/antonmedv/expr/ast" ) type inRange struct{} diff --git a/optimizer/optimizer.go b/optimizer/optimizer.go index b49923a72..738348dc3 100644 --- a/optimizer/optimizer.go +++ b/optimizer/optimizer.go @@ -1,8 +1,8 @@ package optimizer import ( - . "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/conf" + . "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/conf" ) func Optimize(node *Node, config *conf.Config) error { diff --git a/optimizer/optimizer_test.go b/optimizer/optimizer_test.go index cea7a5a3f..ec75192ee 100644 --- a/optimizer/optimizer_test.go +++ b/optimizer/optimizer_test.go @@ -4,11 +4,11 @@ import ( "strings" "testing" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/optimizer" - "github.com/techdroplabs/expr/parser" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/optimizer" + "github.com/antonmedv/expr/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/parser/lexer/lexer.go b/parser/lexer/lexer.go index 78ba4c46f..6e4848a83 100644 --- a/parser/lexer/lexer.go +++ b/parser/lexer/lexer.go @@ -5,7 +5,7 @@ import ( "strings" "unicode/utf8" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/file" ) func Lex(source *file.Source) ([]Token, error) { diff --git a/parser/lexer/lexer_test.go b/parser/lexer/lexer_test.go index 7baacb092..32fd8a0ce 100644 --- a/parser/lexer/lexer_test.go +++ b/parser/lexer/lexer_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/techdroplabs/expr/file" - . "github.com/techdroplabs/expr/parser/lexer" + "github.com/antonmedv/expr/file" + . "github.com/antonmedv/expr/parser/lexer" ) type lexTest struct { diff --git a/parser/lexer/token.go b/parser/lexer/token.go index 798864ce5..8917b26dc 100644 --- a/parser/lexer/token.go +++ b/parser/lexer/token.go @@ -3,7 +3,7 @@ package lexer import ( "fmt" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/file" ) type Kind string diff --git a/parser/parser.go b/parser/parser.go index 5d6a9fedc..821de9d35 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -7,9 +7,9 @@ import ( "strings" "unicode/utf8" - . "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/file" - . "github.com/techdroplabs/expr/parser/lexer" + . "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/file" + . "github.com/antonmedv/expr/parser/lexer" ) type associativity int diff --git a/parser/parser_test.go b/parser/parser_test.go index eb720e137..989829b37 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/parser" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/parser" "github.com/stretchr/testify/assert" ) diff --git a/vm/program.go b/vm/program.go index 73e3843d4..5a41f8af4 100644 --- a/vm/program.go +++ b/vm/program.go @@ -5,7 +5,7 @@ import ( "fmt" "regexp" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/file" ) type Program struct { diff --git a/vm/program_test.go b/vm/program_test.go index b15f10a3b..33ac2bf6c 100644 --- a/vm/program_test.go +++ b/vm/program_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/vm" ) func TestProgram_Disassemble(t *testing.T) { diff --git a/vm/vm.go b/vm/vm.go index 2a3c8b8a0..6957dfa64 100644 --- a/vm/vm.go +++ b/vm/vm.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/techdroplabs/expr/file" + "github.com/antonmedv/expr/file" ) var errorType = reflect.TypeOf((*error)(nil)).Elem() diff --git a/vm/vm_test.go b/vm/vm_test.go index b3b261fcd..8b0146c97 100644 --- a/vm/vm_test.go +++ b/vm/vm_test.go @@ -6,12 +6,12 @@ import ( "reflect" "testing" - "github.com/techdroplabs/expr/ast" - "github.com/techdroplabs/expr/checker" - "github.com/techdroplabs/expr/compiler" - "github.com/techdroplabs/expr/conf" - "github.com/techdroplabs/expr/parser" - "github.com/techdroplabs/expr/vm" + "github.com/antonmedv/expr/ast" + "github.com/antonmedv/expr/checker" + "github.com/antonmedv/expr/compiler" + "github.com/antonmedv/expr/conf" + "github.com/antonmedv/expr/parser" + "github.com/antonmedv/expr/vm" "github.com/stretchr/testify/require" )