diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 83 | ||||
| -rw-r--r-- | deps.mk | 118 | ||||
| -rw-r--r-- | src/urubu/cmd/ucdgen/main.go (renamed from cmd/ucdgen/main.go) | 2 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan-go/generate.go (renamed from cmd/vartan-go/generate.go) | 6 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan-go/main.go (renamed from cmd/vartan-go/main.go) | 0 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/compile.go (renamed from cmd/vartan/compile.go) | 8 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/main.go (renamed from cmd/vartan/main.go) | 0 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/parse.go (renamed from cmd/vartan/parse.go) | 4 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/root.go (renamed from cmd/vartan/root.go) | 0 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/show.go (renamed from cmd/vartan/show.go) | 4 | ||||
| -rw-r--r-- | src/urubu/cmd/vartan/test.go (renamed from cmd/vartan/test.go) | 2 | ||||
| -rw-r--r-- | src/urubu/compressor/compressor.go (renamed from compressor/compressor.go) | 0 | ||||
| -rw-r--r-- | src/urubu/driver/lexer/lexer.go (renamed from driver/lexer/lexer.go) | 0 | ||||
| -rw-r--r-- | src/urubu/driver/lexer/spec.go (renamed from driver/lexer/spec.go) | 2 | ||||
| -rw-r--r-- | src/urubu/driver/lexer/template.go (renamed from driver/lexer/template.go) | 4 | ||||
| -rw-r--r-- | src/urubu/driver/parser/parser.go (renamed from driver/parser/parser.go) | 0 | ||||
| -rw-r--r-- | src/urubu/driver/parser/semantic_action.go (renamed from driver/parser/semantic_action.go) | 0 | ||||
| -rw-r--r-- | src/urubu/driver/parser/spec.go (renamed from driver/parser/spec.go) | 2 | ||||
| -rw-r--r-- | src/urubu/driver/parser/template.go (renamed from driver/parser/template.go) | 2 | ||||
| -rw-r--r-- | src/urubu/driver/parser/token_stream.go (renamed from driver/parser/token_stream.go) | 4 | ||||
| -rw-r--r-- | src/urubu/error/error.go (renamed from error/error.go) | 0 | ||||
| -rw-r--r-- | src/urubu/grammar/first.go (renamed from grammar/first.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/grammar.go (renamed from grammar/grammar.go) | 10 | ||||
| -rw-r--r-- | src/urubu/grammar/item.go (renamed from grammar/item.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lalr1.go (renamed from grammar/lalr1.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/compiler.go (renamed from grammar/lexical/compiler.go) | 8 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/dfa/dfa.go (renamed from grammar/lexical/dfa/dfa.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/dfa/symbol_position.go (renamed from grammar/lexical/dfa/symbol_position.go) | 0 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/dfa/tree.go (renamed from grammar/lexical/dfa/tree.go) | 6 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/entry.go (renamed from grammar/lexical/entry.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/parser/error.go (renamed from grammar/lexical/parser/error.go) | 0 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/parser/fragment.go (renamed from grammar/lexical/parser/fragment.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/parser/lexer.go (renamed from grammar/lexical/parser/lexer.go) | 0 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/parser/parser.go (renamed from grammar/lexical/parser/parser.go) | 4 | ||||
| -rw-r--r-- | src/urubu/grammar/lexical/parser/tree.go (renamed from grammar/lexical/parser/tree.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/lr0.go (renamed from grammar/lr0.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/parsing_table.go (renamed from grammar/parsing_table.go) | 4 | ||||
| -rw-r--r-- | src/urubu/grammar/production.go (renamed from grammar/production.go) | 2 | ||||
| -rw-r--r-- | src/urubu/grammar/semantic_error.go (renamed from grammar/semantic_error.go) | 0 | ||||
| -rw-r--r-- | src/urubu/grammar/symbol/symbol.go (renamed from grammar/symbol/symbol.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/description.go (renamed from spec/grammar/description.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/grammar.go (renamed from spec/grammar/grammar.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/clexspec.json (renamed from spec/grammar/parser/clexspec.json) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/lexer.go (renamed from spec/grammar/parser/lexer.go) | 2 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/lexspec.json (renamed from spec/grammar/parser/lexspec.json) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/parser.go (renamed from spec/grammar/parser/parser.go) | 4 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/syntax_error.go (renamed from spec/grammar/parser/syntax_error.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/parser/vartan_lexer.go (renamed from spec/grammar/parser/vartan_lexer.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/grammar/util.go (renamed from spec/grammar/util.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/parser.go (renamed from spec/test/parser.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree-report.json (renamed from spec/test/tree-report.json) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree.json (renamed from spec/test/tree.json) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree.vartan (renamed from spec/test/tree.vartan) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree_lexer.go (renamed from spec/test/tree_lexer.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree_parser.go (renamed from spec/test/tree_parser.go) | 0 | ||||
| -rw-r--r-- | src/urubu/spec/test/tree_semantic_action.go (renamed from spec/test/tree_semantic_action.go) | 0 | ||||
| -rw-r--r-- | src/urubu/tester/tester.go (renamed from tester/tester.go) | 6 | ||||
| -rw-r--r-- | src/urubu/ucd/api.go (renamed from ucd/api.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/codepoint.go (renamed from ucd/codepoint.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/codepoint.go.tmpl (renamed from ucd/codepoint.go.tmpl) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/parser.go (renamed from ucd/parser.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/prop_list.go (renamed from ucd/prop_list.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/property.go (renamed from ucd/property.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/property_value_aliases.go (renamed from ucd/property_value_aliases.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/scripts.go (renamed from ucd/scripts.go) | 0 | ||||
| -rw-r--r-- | src/urubu/ucd/unicode_data.go (renamed from ucd/unicode_data.go) | 0 | ||||
| -rw-r--r-- | src/urubu/utf8/utf8.go (renamed from utf8/utf8.go) | 0 | ||||
| -rw-r--r-- | tests/unit/compressor/compressor_test.go (renamed from compressor/compressor_test.go) | 0 | ||||
| -rw-r--r-- | tests/unit/driver/lexer/lexer_test.go (renamed from driver/lexer/lexer_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/driver/parser/conflict_test.go (renamed from driver/parser/conflict_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/driver/parser/lac_test.go (renamed from driver/parser/lac_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/driver/parser/parser_test.go (renamed from driver/parser/parser_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/driver/parser/semantic_action_test.go (renamed from driver/parser/semantic_action_test.go) | 6 | ||||
| -rw-r--r-- | tests/unit/driver/parser/syntax_error_test.go (renamed from driver/parser/syntax_error_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/first_test.go (renamed from grammar/first_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/grammar_test.go (renamed from grammar/grammar_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/lalr1_test.go (renamed from grammar/lalr1_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/compiler_test.go (renamed from grammar/lexical/compiler_test.go) | 2 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/dfa/dfa_test.go (renamed from grammar/lexical/dfa/dfa_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/dfa/symbol_position_test.go (renamed from grammar/lexical/dfa/symbol_position_test.go) | 0 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/dfa/tree_test.go (renamed from grammar/lexical/dfa/tree_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/parser/lexer_test.go (renamed from grammar/lexical/parser/lexer_test.go) | 0 | ||||
| -rw-r--r-- | tests/unit/grammar/lexical/parser/parser_test.go (renamed from grammar/lexical/parser/parser_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/lr0_test.go (renamed from grammar/lr0_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/parsing_table_test.go (renamed from grammar/parsing_table_test.go) | 4 | ||||
| -rw-r--r-- | tests/unit/grammar/symbol/symbol_test.go (renamed from grammar/symbol/symbol_test.go) | 0 | ||||
| -rw-r--r-- | tests/unit/grammar/test_helper_test.go (renamed from grammar/test_helper_test.go) | 2 | ||||
| -rw-r--r-- | tests/unit/spec/grammar/parser/lexer_test.go (renamed from spec/grammar/parser/lexer_test.go) | 2 | ||||
| -rw-r--r-- | tests/unit/spec/grammar/parser/parser_test.go (renamed from spec/grammar/parser/parser_test.go) | 2 | ||||
| -rw-r--r-- | tests/unit/spec/test/parser_test.go (renamed from spec/test/parser_test.go) | 0 | ||||
| -rw-r--r-- | tests/unit/tester/tester_test.go (renamed from tester/tester_test.go) | 6 | ||||
| -rw-r--r-- | tests/unit/utf8/utf8_test.go (renamed from utf8/utf8_test.go) | 0 |
93 files changed, 189 insertions, 189 deletions
@@ -17,8 +17,7 @@ /tests/fuzz/corpus/ *.a -*.ta -/cmd/*.bin +/src/urubu/cmd/*.bin @@ -24,7 +24,7 @@ GOLDFLAGS = -L $(GOLIBDIR) .SUFFIXES: -.SUFFIXES: .go .a .ta .bin .bin-check +.SUFFIXES: .go .a .bin .bin-check .go.a: go tool compile -I $(@D) $(GOCFLAGS) -o $@ -p $(*F) \ @@ -48,44 +48,44 @@ fuzz-targets/lib.a = $(fuzz-targets/lib.go:.go=.a) benchmarks/lib.a = $(benchmarks/lib.go:.go=.a) existing = \ - utf8 \ - ucd \ - error \ - compressor \ - spec/grammar \ - spec/grammar/parser \ - spec/test \ - grammar/symbol \ - grammar/lexical/parser \ - grammar/lexical/dfa \ - grammar/lexical \ - grammar \ - driver/lexer \ - driver/parser \ - tester \ + src/urubu/utf8 \ + src/urubu/ucd \ + src/urubu/error \ + src/urubu/compressor \ + src/urubu/spec/grammar \ + src/urubu/spec/grammar/parser \ + src/urubu/spec/test \ + src/urubu/grammar/symbol \ + src/urubu/grammar/lexical/parser \ + src/urubu/grammar/lexical/dfa \ + src/urubu/grammar/lexical \ + src/urubu/grammar \ + src/urubu/driver/lexer \ + src/urubu/driver/parser \ + src/urubu/tester \ xtests = \ - compressor \ - grammar/symbol \ - spec/test \ - utf8 \ - spec/grammar/parser \ - grammar \ - tester \ - grammar/lexical/dfa \ - grammar/lexical/parser \ - grammar/lexical \ - driver/lexer \ - driver/parser \ + tests/unit/compressor \ + tests/unit/grammar/symbol \ + tests/unit/spec/test \ + tests/unit/utf8 \ + tests/unit/spec/grammar/parser \ + tests/unit/grammar \ + tests/unit/tester \ + tests/unit/grammar/lexical/dfa \ + tests/unit/grammar/lexical/parser \ + tests/unit/grammar/lexical \ + tests/unit/driver/lexer \ + tests/unit/driver/parser \ xmains = \ - cmd/ucdgen \ - cmd/vartan \ - cmd/vartan-go \ + src/urubu/cmd/ucdgen \ + src/urubu/cmd/vartan \ + src/urubu/cmd/vartan-go \ existing.a = $(existing:=.a) xmains.a = $(xmains:=.a) -xtests.ta = $(xtests:=.ta) +xtests.a = $(xtests:=.a) xmains.bin = $(xmains:=.bin) _xtests.bin = $(xtests:=.bin) @@ -105,7 +105,7 @@ derived-assets = \ $(existing.a) \ $(xmains.a) \ $(xmains.bin) \ - $(xtests.ta) \ + $(xtests.a) \ $(xtest.bin) \ side-assets = \ @@ -119,28 +119,29 @@ side-assets = \ all: $(derived-assets) -$(existing.a) $(xmains.a): Makefile deps.mk -$(libs.a): Makefile deps.mk +#$(existing.a) $(xmains.a): Makefile deps.mk +#$(libs.a): Makefile deps.mk $(libs.a): src/$(NAME).go src/version.go $(existing.a): - go tool compile -I . -o $@ -p $* `find $*/*.go | grep -v _test` + go tool compile -I src -o $@ -p `echo $* | sed 's,^src/,,'` `find $*/*.go` -$(xtests.ta): - go tool compile -I . -o $@ -p $* $*/*.go +$(xtests.a): + p="`echo $* | sed 's,^tests/unit/,urubu/,'`"; \ + go tool compile -I src -o $@ -p $$p src/$$p/*.go $*/*.go $(xmains.a): - go tool compile -I . -o $@ -p main $*/*.go + go tool compile -I src -o $@ -p main $*/*.go $(xmains.bin) $(xtests.bin): - go tool link -L . -o $@ --extldflags '$(LDLIBS)' $*.a + go tool link -L src -o $@ --extldflags '$(LDLIBS)' $*.a $(fuzz-targets/lib.a): go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \ $*.go src/$(NAME).go src/version.go -src/version.go: Makefile +src/version.go: #Makefile echo 'package $(NAME); const Version = "$(VERSION)"' > $@ $(NAME).bin: src/main.bin @@ -75,62 +75,62 @@ tests/fuzz/generated-parser-check/main.a: tests/fuzz/generated-parser-check/$(NA tests/main.a: tests/$(NAME).a -spec/grammar/parser.a spec/grammar/parser.ta: error.a spec/grammar.a -grammar.a grammar.ta: grammar/symbol.a spec/grammar/parser.a error.a grammar/lexical.a -tester.a tester.ta: spec/test.a driver/parser.a spec/grammar.a -grammar/lexical/dfa.a grammar/lexical/dfa.ta: grammar/lexical/parser.a utf8.a -grammar/lexical/parser.a grammar/lexical/parser.ta: ucd.a spec/grammar.a -grammar/lexical.a grammar/lexical.ta: compressor.a grammar/lexical/dfa.a grammar/lexical/parser.a -driver/lexer.a driver/lexer.ta: grammar/lexical.a -driver/parser.a driver/parser.ta: spec/grammar.a driver/lexer.a - -driver/parser.ta: grammar.a spec/grammar/parser.a -tester.ta: grammar.a spec/grammar/parser.a - - -cmd/ucdgen.a: ucd.a -cmd/vartan.a: error.a grammar.a spec/grammar.a spec/grammar/parser.a driver/parser.a tester.a -cmd/vartan-go.a: spec/grammar.a - - - -cmd/ucdgen.bin: cmd/ucdgen.a -cmd/vartan.bin: cmd/vartan.a -cmd/vartan-go.bin: cmd/vartan-go.a - - - -compressor.a: compressor/compressor.go -error.a: error/error.go -grammar/symbol.a: grammar/symbol/symbol.go -spec/grammar.a: spec/grammar/description.go spec/grammar/grammar.go spec/grammar/util.go -spec/test.a: spec/test/parser.go spec/test/tree_lexer.go spec/test/tree_parser.go spec/test/tree_semantic_action.go -ucd.a: ucd/api.go ucd/codepoint.go ucd/parser.go ucd/property.go ucd/property_value_aliases.go ucd/prop_list.go ucd/scripts.go ucd/unicode_data.go -utf8.a: utf8/utf8.go -spec/grammar/parser.a: spec/grammar/parser/lexer.go spec/grammar/parser/parser.go spec/grammar/parser/syntax_error.go spec/grammar/parser/vartan_lexer.go -grammar.a: grammar/first.go grammar/grammar.go grammar/item.go grammar/lalr1.go grammar/lr0.go grammar/parsing_table.go grammar/production.go grammar/semantic_error.go -tester.a: tester/tester.go -grammar/lexical/dfa.a: grammar/lexical/dfa/dfa.go grammar/lexical/dfa/symbol_position.go grammar/lexical/dfa/tree.go -grammar/lexical/parser.a: grammar/lexical/parser/error.go grammar/lexical/parser/fragment.go grammar/lexical/parser/lexer.go grammar/lexical/parser/parser.go grammar/lexical/parser/tree.go -grammar/lexical.a: grammar/lexical/compiler.go grammar/lexical/entry.go -driver/lexer.a: driver/lexer/lexer.go driver/lexer/spec.go driver/lexer/spec.go -driver/parser.a: driver/parser/parser.go driver/parser/semantic_action.go driver/parser/spec.go driver/parser/template.go driver/parser/token_stream.go - -cmd/ucdgen.a: cmd/ucdgen/main.go -cmd/vartan.a: cmd/vartan/compile.go cmd/vartan/main.go cmd/vartan/parse.go cmd/vartan/root.go cmd/vartan/show.go cmd/vartan/test.go -cmd/vartan-go.a: cmd/vartan-go/generate.go cmd/vartan-go/main.go - - - -compressor.ta: compressor/compressor.go compressor/compressor_test.go -grammar/symbol.ta: grammar/symbol/symbol.go grammar/symbol/symbol_test.go -spec/test.ta: spec/test/parser.go spec/test/tree_lexer.go spec/test/tree_parser.go spec/test/tree_semantic_action.go spec/test/parser_test.go -utf8.ta: utf8/utf8.go utf8/utf8_test.go -spec/grammar/parser.ta: spec/grammar/parser/lexer.go spec/grammar/parser/parser.go spec/grammar/parser/syntax_error.go spec/grammar/parser/vartan_lexer.go spec/grammar/parser/lexer_test.go spec/grammar/parser/parser_test.go -grammar.ta: grammar/first.go grammar/grammar.go grammar/item.go grammar/lalr1.go grammar/lr0.go grammar/parsing_table.go grammar/production.go grammar/semantic_error.go grammar/first_test.go grammar/grammar_test.go grammar/lalr1_test.go grammar/lr0_test.go grammar/parsing_table_test.go grammar/test_helper_test.go -tester.ta: tester/tester.go tester/tester_test.go -grammar/lexical/dfa.ta: grammar/lexical/dfa/dfa.go grammar/lexical/dfa/symbol_position.go grammar/lexical/dfa/tree.go grammar/lexical/dfa/dfa_test.go grammar/lexical/dfa/symbol_position_test.go grammar/lexical/dfa/tree_test.go -grammar/lexical/parser.ta: grammar/lexical/parser/error.go grammar/lexical/parser/fragment.go grammar/lexical/parser/lexer.go grammar/lexical/parser/parser.go grammar/lexical/parser/tree.go grammar/lexical/parser/lexer_test.go grammar/lexical/parser/parser_test.go -grammar/lexical.ta: grammar/lexical/compiler.go grammar/lexical/entry.go grammar/lexical/compiler_test.go -driver/lexer.ta: driver/lexer/lexer.go driver/lexer/spec.go driver/lexer/spec.go driver/lexer/lexer_test.go -driver/parser.a: driver/parser/parser.go driver/parser/semantic_action.go driver/parser/spec.go driver/parser/template.go driver/parser/token_stream.go driver/parser/conflict_test.go driver/parser/lac_test.go driver/parser/parser_test.go driver/parser/semantic_action_test.go driver/parser/syntax_error_test.go +src/urubu/spec/grammar/parser.a tests/unit/spec/grammar/parser.a: src/urubu/error.a src/urubu/spec/grammar.a +src/urubu/grammar.a tests/unit/grammar.a: src/urubu/grammar/symbol.a src/urubu/spec/grammar/parser.a src/urubu/error.a src/urubu/grammar/lexical.a +src/urubu/tester.a tests/unit/tester.a: src/urubu/spec/test.a src/urubu/driver/parser.a src/urubu/spec/grammar.a +src/urubu/grammar/lexical/dfa.a tests/unit/grammar/lexical/dfa.a: src/urubu/grammar/lexical/parser.a src/urubu/utf8.a +src/urubu/grammar/lexical/parser.a tests/unit/grammar/lexical/parser.a: src/urubu/ucd.a src/urubu/spec/grammar.a +src/urubu/grammar/lexical.a tests/unit/grammar/lexical.a: src/urubu/compressor.a src/urubu/grammar/lexical/dfa.a src/urubu/grammar/lexical/parser.a +src/urubu/driver/lexer.a tests/unit/driver/lexer.a: src/urubu/grammar/lexical.a +src/urubu/driver/parser.a tests/unit/driver/parser.a: src/urubu/spec/grammar.a src/urubu/driver/lexer.a + +tests/unit/driver/parser.a: src/urubu/grammar.a src/urubu/spec/grammar/parser.a +tests/unit/tester.a: src/urubu/grammar.a src/urubu/spec/grammar/parser.a + + +src/urubu/cmd/ucdgen.a: src/urubu/ucd.a +src/urubu/cmd/vartan.a: src/urubu/error.a src/urubu/grammar.a src/urubu/spec/grammar.a src/urubu/spec/grammar/parser.a src/urubu/driver/parser.a src/urubu/tester.a +src/urubu/cmd/vartan-go.a: src/urubu/spec/grammar.a src/urubu/driver/lexer.a src/urubu/driver/parser.a + + + +src/urubu/cmd/ucdgen.bin: src/urubu/cmd/ucdgen.a +src/urubu/cmd/vartan.bin: src/urubu/cmd/vartan.a +src/urubu/cmd/vartan-go.bin: src/urubu/cmd/vartan-go.a + + + +src/urubu/compressor.a: src/urubu/compressor/compressor.go +src/urubu/error.a: src/urubu/error/error.go +src/urubu/grammar/symbol.a: src/urubu/grammar/symbol/symbol.go +src/urubu/spec/grammar.a: src/urubu/spec/grammar/description.go src/urubu/spec/grammar/grammar.go src/urubu/spec/grammar/util.go +src/urubu/spec/test.a: src/urubu/spec/test/parser.go src/urubu/spec/test/tree_lexer.go src/urubu/spec/test/tree_parser.go src/urubu/spec/test/tree_semantic_action.go +src/urubu/ucd.a: src/urubu/ucd/api.go src/urubu/ucd/codepoint.go src/urubu/ucd/parser.go src/urubu/ucd/property.go src/urubu/ucd/property_value_aliases.go src/urubu/ucd/prop_list.go src/urubu/ucd/scripts.go src/urubu/ucd/unicode_data.go +src/urubu/utf8.a: src/urubu/utf8/utf8.go +src/urubu/spec/grammar/parser.a: src/urubu/spec/grammar/parser/lexer.go src/urubu/spec/grammar/parser/parser.go src/urubu/spec/grammar/parser/syntax_error.go src/urubu/spec/grammar/parser/vartan_lexer.go +src/urubu/grammar.a: src/urubu/grammar/first.go src/urubu/grammar/grammar.go src/urubu/grammar/item.go src/urubu/grammar/lalr1.go src/urubu/grammar/lr0.go src/urubu/grammar/parsing_table.go src/urubu/grammar/production.go src/urubu/grammar/semantic_error.go +src/urubu/tester.a: src/urubu/tester/tester.go +src/urubu/grammar/lexical/dfa.a: src/urubu/grammar/lexical/dfa/dfa.go src/urubu/grammar/lexical/dfa/symbol_position.go src/urubu/grammar/lexical/dfa/tree.go +src/urubu/grammar/lexical/parser.a: src/urubu/grammar/lexical/parser/error.go src/urubu/grammar/lexical/parser/fragment.go src/urubu/grammar/lexical/parser/lexer.go src/urubu/grammar/lexical/parser/parser.go src/urubu/grammar/lexical/parser/tree.go +src/urubu/grammar/lexical.a: src/urubu/grammar/lexical/compiler.go src/urubu/grammar/lexical/entry.go +src/urubu/driver/lexer.a: src/urubu/driver/lexer/lexer.go src/urubu/driver/lexer/spec.go src/urubu/driver/lexer/spec.go +src/urubu/driver/parser.a: src/urubu/driver/parser/parser.go src/urubu/driver/parser/semantic_action.go src/urubu/driver/parser/spec.go src/urubu/driver/parser/template.go src/urubu/driver/parser/token_stream.go + +src/urubu/cmd/ucdgen.a: src/urubu/cmd/ucdgen/main.go +src/urubu/cmd/vartan.a: src/urubu/cmd/vartan/compile.go src/urubu/cmd/vartan/main.go src/urubu/cmd/vartan/parse.go src/urubu/cmd/vartan/root.go src/urubu/cmd/vartan/show.go src/urubu/cmd/vartan/test.go +src/urubu/cmd/vartan-go.a: src/urubu/cmd/vartan-go/generate.go src/urubu/cmd/vartan-go/main.go + + + +tests/unit/compressor.a: src/urubu/compressor/compressor.go tests/unit/compressor/compressor_test.go +tests/unit/grammar/symbol.a: src/urubu/grammar/symbol/symbol.go tests/unit/grammar/symbol/symbol_test.go +tests/unit/spec/test.a: src/urubu/spec/test/parser.go src/urubu/spec/test/tree_lexer.go src/urubu/spec/test/tree_parser.go src/urubu/spec/test/tree_semantic_action.go tests/unit/spec/test/parser_test.go +tests/unit/utf8.a: src/urubu/utf8/utf8.go tests/unit/utf8/utf8_test.go +tests/unit/spec/grammar/parser.a: src/urubu/spec/grammar/parser/lexer.go src/urubu/spec/grammar/parser/parser.go src/urubu/spec/grammar/parser/syntax_error.go src/urubu/spec/grammar/parser/vartan_lexer.go tests/unit/spec/grammar/parser/lexer_test.go tests/unit/spec/grammar/parser/parser_test.go +tests/unit/grammar.a: src/urubu/grammar/first.go src/urubu/grammar/grammar.go src/urubu/grammar/item.go src/urubu/grammar/lalr1.go src/urubu/grammar/lr0.go src/urubu/grammar/parsing_table.go src/urubu/grammar/production.go src/urubu/grammar/semantic_error.go tests/unit/grammar/first_test.go tests/unit/grammar/grammar_test.go tests/unit/grammar/lalr1_test.go tests/unit/grammar/lr0_test.go tests/unit/grammar/parsing_table_test.go tests/unit/grammar/test_helper_test.go +tests/unit/tester.a: src/urubu/tester/tester.go tests/unit/tester/tester_test.go +tests/unit/grammar/lexical/dfa.a: src/urubu/grammar/lexical/dfa/dfa.go src/urubu/grammar/lexical/dfa/symbol_position.go src/urubu/grammar/lexical/dfa/tree.go tests/unit/grammar/lexical/dfa/dfa_test.go tests/unit/grammar/lexical/dfa/symbol_position_test.go tests/unit/grammar/lexical/dfa/tree_test.go +tests/unit/grammar/lexical/parser.a: src/urubu/grammar/lexical/parser/error.go src/urubu/grammar/lexical/parser/fragment.go src/urubu/grammar/lexical/parser/lexer.go src/urubu/grammar/lexical/parser/parser.go src/urubu/grammar/lexical/parser/tree.go tests/unit/grammar/lexical/parser/lexer_test.go tests/unit/grammar/lexical/parser/parser_test.go +tests/unit/grammar/lexical.a: src/urubu/grammar/lexical/compiler.go src/urubu/grammar/lexical/entry.go tests/unit/grammar/lexical/compiler_test.go +tests/unit/driver/lexer.a: src/urubu/driver/lexer/lexer.go src/urubu/driver/lexer/spec.go src/urubu/driver/lexer/spec.go tests/unit/driver/lexer/lexer_test.go +tests/unit/driver/parser.a: src/urubu/driver/parser/parser.go src/urubu/driver/parser/semantic_action.go src/urubu/driver/parser/spec.go src/urubu/driver/parser/template.go src/urubu/driver/parser/token_stream.go tests/unit/driver/parser/conflict_test.go tests/unit/driver/parser/lac_test.go tests/unit/driver/parser/parser_test.go tests/unit/driver/parser/semantic_action_test.go tests/unit/driver/parser/syntax_error_test.go diff --git a/cmd/ucdgen/main.go b/src/urubu/cmd/ucdgen/main.go index aeb88e2..d5599a6 100644 --- a/cmd/ucdgen/main.go +++ b/src/urubu/cmd/ucdgen/main.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "ucd" + "urubu/ucd" ) func main() { diff --git a/cmd/vartan-go/generate.go b/src/urubu/cmd/vartan-go/generate.go index 0355558..8f2da84 100644 --- a/cmd/vartan-go/generate.go +++ b/src/urubu/cmd/vartan-go/generate.go @@ -6,9 +6,9 @@ import ( "io" "os" - "driver/lexer" - "driver/parser" - spec "spec/grammar" + "urubu/driver/lexer" + "urubu/driver/parser" + spec "urubu/spec/grammar" ) func runGenerate(args []string) error { diff --git a/cmd/vartan-go/main.go b/src/urubu/cmd/vartan-go/main.go index 315e7b3..315e7b3 100644 --- a/cmd/vartan-go/main.go +++ b/src/urubu/cmd/vartan-go/main.go diff --git a/cmd/vartan/compile.go b/src/urubu/cmd/vartan/compile.go index 95a4c58..79fa9ef 100644 --- a/cmd/vartan/compile.go +++ b/src/urubu/cmd/vartan/compile.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - verr "error" - "grammar" - spec "spec/grammar" - "spec/grammar/parser" + verr "urubu/error" + "urubu/grammar" + spec "urubu/spec/grammar" + "urubu/spec/grammar/parser" ) diff --git a/cmd/vartan/main.go b/src/urubu/cmd/vartan/main.go index 98f98e1..98f98e1 100644 --- a/cmd/vartan/main.go +++ b/src/urubu/cmd/vartan/main.go diff --git a/cmd/vartan/parse.go b/src/urubu/cmd/vartan/parse.go index c876c09..9c5fd9c 100644 --- a/cmd/vartan/parse.go +++ b/src/urubu/cmd/vartan/parse.go @@ -7,8 +7,8 @@ import ( "os" "strings" - driver "driver/parser" - spec "spec/grammar" + driver "urubu/driver/parser" + spec "urubu/spec/grammar" ) diff --git a/cmd/vartan/root.go b/src/urubu/cmd/vartan/root.go index 3dda70c..3dda70c 100644 --- a/cmd/vartan/root.go +++ b/src/urubu/cmd/vartan/root.go diff --git a/cmd/vartan/show.go b/src/urubu/cmd/vartan/show.go index 397ac7f..cab63a0 100644 --- a/cmd/vartan/show.go +++ b/src/urubu/cmd/vartan/show.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "grammar" - spec "spec/grammar" + "urubu/grammar" + spec "urubu/spec/grammar" ) diff --git a/cmd/vartan/test.go b/src/urubu/cmd/vartan/test.go index 25bd27f..eb24c0c 100644 --- a/cmd/vartan/test.go +++ b/src/urubu/cmd/vartan/test.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "tester" + "urubu/tester" ) diff --git a/compressor/compressor.go b/src/urubu/compressor/compressor.go index cdfeacb..cdfeacb 100644 --- a/compressor/compressor.go +++ b/src/urubu/compressor/compressor.go diff --git a/driver/lexer/lexer.go b/src/urubu/driver/lexer/lexer.go index 3f9712e..3f9712e 100644 --- a/driver/lexer/lexer.go +++ b/src/urubu/driver/lexer/lexer.go diff --git a/driver/lexer/spec.go b/src/urubu/driver/lexer/spec.go index 4b1a218..75c74af 100644 --- a/driver/lexer/spec.go +++ b/src/urubu/driver/lexer/spec.go @@ -1,6 +1,6 @@ package lexer -import spec "spec/grammar" +import spec "urubu/spec/grammar" type lexSpec struct { spec *spec.LexicalSpec diff --git a/driver/lexer/template.go b/src/urubu/driver/lexer/template.go index c5d0778..35dfd93 100644 --- a/driver/lexer/template.go +++ b/src/urubu/driver/lexer/template.go @@ -11,8 +11,8 @@ import ( "strings" "text/template" - "grammar/lexical" - spec "spec/grammar" + "urubu/grammar/lexical" + spec "urubu/spec/grammar" ) // go:embed lexer.go diff --git a/driver/parser/parser.go b/src/urubu/driver/parser/parser.go index 2eaa678..2eaa678 100644 --- a/driver/parser/parser.go +++ b/src/urubu/driver/parser/parser.go diff --git a/driver/parser/semantic_action.go b/src/urubu/driver/parser/semantic_action.go index 6bb78cf..6bb78cf 100644 --- a/driver/parser/semantic_action.go +++ b/src/urubu/driver/parser/semantic_action.go diff --git a/driver/parser/spec.go b/src/urubu/driver/parser/spec.go index b288f5f..6dc7c3f 100644 --- a/driver/parser/spec.go +++ b/src/urubu/driver/parser/spec.go @@ -1,6 +1,6 @@ package parser -import spec "spec/grammar" +import spec "urubu/spec/grammar" type grammarImpl struct { g *spec.CompiledGrammar diff --git a/driver/parser/template.go b/src/urubu/driver/parser/template.go index 3e25193..33d097c 100644 --- a/driver/parser/template.go +++ b/src/urubu/driver/parser/template.go @@ -13,7 +13,7 @@ import ( "strings" "text/template" - spec "spec/grammar" + spec "urubu/spec/grammar" ) // go:embed parser.go diff --git a/driver/parser/token_stream.go b/src/urubu/driver/parser/token_stream.go index b15e8bf..788e521 100644 --- a/driver/parser/token_stream.go +++ b/src/urubu/driver/parser/token_stream.go @@ -3,8 +3,8 @@ package parser import ( "io" - "driver/lexer" - spec "spec/grammar" + "urubu/driver/lexer" + spec "urubu/spec/grammar" ) type vToken struct { diff --git a/error/error.go b/src/urubu/error/error.go index 0e5d3af..0e5d3af 100644 --- a/error/error.go +++ b/src/urubu/error/error.go diff --git a/grammar/first.go b/src/urubu/grammar/first.go index 4f0bdcf..6443bcf 100644 --- a/grammar/first.go +++ b/src/urubu/grammar/first.go @@ -3,7 +3,7 @@ package grammar import ( "fmt" - "grammar/symbol" + "urubu/grammar/symbol" ) type firstEntry struct { diff --git a/grammar/grammar.go b/src/urubu/grammar/grammar.go index 9fb2968..bfa53c6 100644 --- a/grammar/grammar.go +++ b/src/urubu/grammar/grammar.go @@ -5,11 +5,11 @@ import ( "io" "strings" - verr "error" - "grammar/lexical" - "grammar/symbol" - spec "spec/grammar" - "spec/grammar/parser" + verr "urubu/error" + "urubu/grammar/lexical" + "urubu/grammar/symbol" + spec "urubu/spec/grammar" + "urubu/spec/grammar/parser" ) type astActionEntry struct { diff --git a/grammar/item.go b/src/urubu/grammar/item.go index aa1ecaf..6c5fe42 100644 --- a/grammar/item.go +++ b/src/urubu/grammar/item.go @@ -7,7 +7,7 @@ import ( "sort" "strconv" - "grammar/symbol" + "urubu/grammar/symbol" ) type lrItemID [32]byte diff --git a/grammar/lalr1.go b/src/urubu/grammar/lalr1.go index 4c7265d..8373568 100644 --- a/grammar/lalr1.go +++ b/src/urubu/grammar/lalr1.go @@ -3,7 +3,7 @@ package grammar import ( "fmt" - "grammar/symbol" + "urubu/grammar/symbol" ) type stateAndLRItem struct { diff --git a/grammar/lexical/compiler.go b/src/urubu/grammar/lexical/compiler.go index 06e4068..637018a 100644 --- a/grammar/lexical/compiler.go +++ b/src/urubu/grammar/lexical/compiler.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "compressor" - "grammar/lexical/dfa" - psr "grammar/lexical/parser" - spec "spec/grammar" + "urubu/compressor" + "urubu/grammar/lexical/dfa" + psr "urubu/grammar/lexical/parser" + spec "urubu/spec/grammar" ) type CompileError struct { diff --git a/grammar/lexical/dfa/dfa.go b/src/urubu/grammar/lexical/dfa/dfa.go index 884b168..48bd8b4 100644 --- a/grammar/lexical/dfa/dfa.go +++ b/src/urubu/grammar/lexical/dfa/dfa.go @@ -3,7 +3,7 @@ package dfa import ( "sort" - spec "spec/grammar" + spec "urubu/spec/grammar" ) type symbolTable struct { diff --git a/grammar/lexical/dfa/symbol_position.go b/src/urubu/grammar/lexical/dfa/symbol_position.go index f154251..f154251 100644 --- a/grammar/lexical/dfa/symbol_position.go +++ b/src/urubu/grammar/lexical/dfa/symbol_position.go diff --git a/grammar/lexical/dfa/tree.go b/src/urubu/grammar/lexical/dfa/tree.go index 85061f9..8a11aee 100644 --- a/grammar/lexical/dfa/tree.go +++ b/src/urubu/grammar/lexical/dfa/tree.go @@ -5,9 +5,9 @@ import ( "io" "sort" - "grammar/lexical/parser" - spec "spec/grammar" - "utf8" + "urubu/grammar/lexical/parser" + spec "urubu/spec/grammar" + "urubu/utf8" ) type byteTree interface { diff --git a/grammar/lexical/entry.go b/src/urubu/grammar/lexical/entry.go index 6d2fbe3..44af8ea 100644 --- a/grammar/lexical/entry.go +++ b/src/urubu/grammar/lexical/entry.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - spec "spec/grammar" + spec "urubu/spec/grammar" ) type LexEntry struct { diff --git a/grammar/lexical/parser/error.go b/src/urubu/grammar/lexical/parser/error.go index be81da4..be81da4 100644 --- a/grammar/lexical/parser/error.go +++ b/src/urubu/grammar/lexical/parser/error.go diff --git a/grammar/lexical/parser/fragment.go b/src/urubu/grammar/lexical/parser/fragment.go index e51759e..196c00b 100644 --- a/grammar/lexical/parser/fragment.go +++ b/src/urubu/grammar/lexical/parser/fragment.go @@ -3,7 +3,7 @@ package parser import ( "fmt" - spec "spec/grammar" + spec "urubu/spec/grammar" ) type incompleteFragment struct { diff --git a/grammar/lexical/parser/lexer.go b/src/urubu/grammar/lexical/parser/lexer.go index 3861825..3861825 100644 --- a/grammar/lexical/parser/lexer.go +++ b/src/urubu/grammar/lexical/parser/lexer.go diff --git a/grammar/lexical/parser/parser.go b/src/urubu/grammar/lexical/parser/parser.go index d1a08a2..425b553 100644 --- a/grammar/lexical/parser/parser.go +++ b/src/urubu/grammar/lexical/parser/parser.go @@ -6,8 +6,8 @@ import ( "io" "strconv" - spec "spec/grammar" - "ucd" + spec "urubu/spec/grammar" + "urubu/ucd" ) type PatternEntry struct { diff --git a/grammar/lexical/parser/tree.go b/src/urubu/grammar/lexical/parser/tree.go index 0d64e1d..df03d37 100644 --- a/grammar/lexical/parser/tree.go +++ b/src/urubu/grammar/lexical/parser/tree.go @@ -5,7 +5,7 @@ import ( "io" "sort" - spec "spec/grammar" + spec "urubu/spec/grammar" ) type CPRange struct { diff --git a/grammar/lr0.go b/src/urubu/grammar/lr0.go index 7e5929a..92a2137 100644 --- a/grammar/lr0.go +++ b/src/urubu/grammar/lr0.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "grammar/symbol" + "urubu/grammar/symbol" ) type lr0Automaton struct { diff --git a/grammar/parsing_table.go b/src/urubu/grammar/parsing_table.go index fc520cc..48ea9fe 100644 --- a/grammar/parsing_table.go +++ b/src/urubu/grammar/parsing_table.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "grammar/symbol" - spec "spec/grammar" + "urubu/grammar/symbol" + spec "urubu/spec/grammar" ) type ActionType string diff --git a/grammar/production.go b/src/urubu/grammar/production.go index 1742dc6..8f6c103 100644 --- a/grammar/production.go +++ b/src/urubu/grammar/production.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" - "grammar/symbol" + "urubu/grammar/symbol" ) type productionID [32]byte diff --git a/grammar/semantic_error.go b/src/urubu/grammar/semantic_error.go index 88a6b17..88a6b17 100644 --- a/grammar/semantic_error.go +++ b/src/urubu/grammar/semantic_error.go diff --git a/grammar/symbol/symbol.go b/src/urubu/grammar/symbol/symbol.go index f9e6a93..f9e6a93 100644 --- a/grammar/symbol/symbol.go +++ b/src/urubu/grammar/symbol/symbol.go diff --git a/spec/grammar/description.go b/src/urubu/spec/grammar/description.go index 0d2a0b7..0d2a0b7 100644 --- a/spec/grammar/description.go +++ b/src/urubu/spec/grammar/description.go diff --git a/spec/grammar/grammar.go b/src/urubu/spec/grammar/grammar.go index bf1ea89..bf1ea89 100644 --- a/spec/grammar/grammar.go +++ b/src/urubu/spec/grammar/grammar.go diff --git a/spec/grammar/parser/clexspec.json b/src/urubu/spec/grammar/parser/clexspec.json index d0ed3d3..d0ed3d3 100644 --- a/spec/grammar/parser/clexspec.json +++ b/src/urubu/spec/grammar/parser/clexspec.json diff --git a/spec/grammar/parser/lexer.go b/src/urubu/spec/grammar/parser/lexer.go index 31dcab2..bd8a24f 100644 --- a/spec/grammar/parser/lexer.go +++ b/src/urubu/spec/grammar/parser/lexer.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - verr "error" + verr "urubu/error" ) type tokenKind string diff --git a/spec/grammar/parser/lexspec.json b/src/urubu/spec/grammar/parser/lexspec.json index caf1f0e..caf1f0e 100644 --- a/spec/grammar/parser/lexspec.json +++ b/src/urubu/spec/grammar/parser/lexspec.json diff --git a/spec/grammar/parser/parser.go b/src/urubu/spec/grammar/parser/parser.go index 0ef29dd..b604074 100644 --- a/spec/grammar/parser/parser.go +++ b/src/urubu/spec/grammar/parser/parser.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - verr "error" - spec "spec/grammar" + verr "urubu/error" + spec "urubu/spec/grammar" ) type RootNode struct { diff --git a/spec/grammar/parser/syntax_error.go b/src/urubu/spec/grammar/parser/syntax_error.go index 719fb94..719fb94 100644 --- a/spec/grammar/parser/syntax_error.go +++ b/src/urubu/spec/grammar/parser/syntax_error.go diff --git a/spec/grammar/parser/vartan_lexer.go b/src/urubu/spec/grammar/parser/vartan_lexer.go index 76ddfde..76ddfde 100644 --- a/spec/grammar/parser/vartan_lexer.go +++ b/src/urubu/spec/grammar/parser/vartan_lexer.go diff --git a/spec/grammar/util.go b/src/urubu/spec/grammar/util.go index bf3f233..bf3f233 100644 --- a/spec/grammar/util.go +++ b/src/urubu/spec/grammar/util.go diff --git a/spec/test/parser.go b/src/urubu/spec/test/parser.go index b7265d7..b7265d7 100644 --- a/spec/test/parser.go +++ b/src/urubu/spec/test/parser.go diff --git a/spec/test/tree-report.json b/src/urubu/spec/test/tree-report.json index c2018e5..c2018e5 100644 --- a/spec/test/tree-report.json +++ b/src/urubu/spec/test/tree-report.json diff --git a/spec/test/tree.json b/src/urubu/spec/test/tree.json index f05c2f2..f05c2f2 100644 --- a/spec/test/tree.json +++ b/src/urubu/spec/test/tree.json diff --git a/spec/test/tree.vartan b/src/urubu/spec/test/tree.vartan index aa8f733..aa8f733 100644 --- a/spec/test/tree.vartan +++ b/src/urubu/spec/test/tree.vartan diff --git a/spec/test/tree_lexer.go b/src/urubu/spec/test/tree_lexer.go index 8bb1c87..8bb1c87 100644 --- a/spec/test/tree_lexer.go +++ b/src/urubu/spec/test/tree_lexer.go diff --git a/spec/test/tree_parser.go b/src/urubu/spec/test/tree_parser.go index 528d259..528d259 100644 --- a/spec/test/tree_parser.go +++ b/src/urubu/spec/test/tree_parser.go diff --git a/spec/test/tree_semantic_action.go b/src/urubu/spec/test/tree_semantic_action.go index c1d5a25..c1d5a25 100644 --- a/spec/test/tree_semantic_action.go +++ b/src/urubu/spec/test/tree_semantic_action.go diff --git a/tester/tester.go b/src/urubu/tester/tester.go index fa9b806..cae52b2 100644 --- a/tester/tester.go +++ b/src/urubu/tester/tester.go @@ -8,9 +8,9 @@ import ( "runtime/debug" "strings" - driver "driver/parser" - gspec "spec/grammar" - tspec "spec/test" + driver "urubu/driver/parser" + gspec "urubu/spec/grammar" + tspec "urubu/spec/test" ) type TestResult struct { diff --git a/ucd/api.go b/src/urubu/ucd/api.go index 8265d54..8265d54 100644 --- a/ucd/api.go +++ b/src/urubu/ucd/api.go diff --git a/ucd/codepoint.go b/src/urubu/ucd/codepoint.go index e9b411e..e9b411e 100644 --- a/ucd/codepoint.go +++ b/src/urubu/ucd/codepoint.go diff --git a/ucd/codepoint.go.tmpl b/src/urubu/ucd/codepoint.go.tmpl index cc0d48e..cc0d48e 100644 --- a/ucd/codepoint.go.tmpl +++ b/src/urubu/ucd/codepoint.go.tmpl diff --git a/ucd/parser.go b/src/urubu/ucd/parser.go index 88d7134..88d7134 100644 --- a/ucd/parser.go +++ b/src/urubu/ucd/parser.go diff --git a/ucd/prop_list.go b/src/urubu/ucd/prop_list.go index 31db70c..31db70c 100644 --- a/ucd/prop_list.go +++ b/src/urubu/ucd/prop_list.go diff --git a/ucd/property.go b/src/urubu/ucd/property.go index ba60e80..ba60e80 100644 --- a/ucd/property.go +++ b/src/urubu/ucd/property.go diff --git a/ucd/property_value_aliases.go b/src/urubu/ucd/property_value_aliases.go index 4bc69db..4bc69db 100644 --- a/ucd/property_value_aliases.go +++ b/src/urubu/ucd/property_value_aliases.go diff --git a/ucd/scripts.go b/src/urubu/ucd/scripts.go index 5040283..5040283 100644 --- a/ucd/scripts.go +++ b/src/urubu/ucd/scripts.go diff --git a/ucd/unicode_data.go b/src/urubu/ucd/unicode_data.go index e2a8e87..e2a8e87 100644 --- a/ucd/unicode_data.go +++ b/src/urubu/ucd/unicode_data.go diff --git a/utf8/utf8.go b/src/urubu/utf8/utf8.go index 4f52bd4..4f52bd4 100644 --- a/utf8/utf8.go +++ b/src/urubu/utf8/utf8.go diff --git a/compressor/compressor_test.go b/tests/unit/compressor/compressor_test.go index 621b731..621b731 100644 --- a/compressor/compressor_test.go +++ b/tests/unit/compressor/compressor_test.go diff --git a/driver/lexer/lexer_test.go b/tests/unit/driver/lexer/lexer_test.go index d32b087..a3d0231 100644 --- a/driver/lexer/lexer_test.go +++ b/tests/unit/driver/lexer/lexer_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "grammar/lexical" - spec "spec/grammar" + "urubu/grammar/lexical" + spec "urubu/spec/grammar" ) func newLexEntry(modes []string, kind string, pattern string, push string, pop bool) *lexical.LexEntry { diff --git a/driver/parser/conflict_test.go b/tests/unit/driver/parser/conflict_test.go index 1a75483..0bc14d4 100644 --- a/driver/parser/conflict_test.go +++ b/tests/unit/driver/parser/conflict_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "grammar" - "spec/grammar/parser" + "urubu/grammar" + "urubu/spec/grammar/parser" ) func TestParserWithConflicts(t *testing.T) { diff --git a/driver/parser/lac_test.go b/tests/unit/driver/parser/lac_test.go index ed9a0b8..c2368e8 100644 --- a/driver/parser/lac_test.go +++ b/tests/unit/driver/parser/lac_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "grammar" - "spec/grammar/parser" + "urubu/grammar" + "urubu/spec/grammar/parser" ) func TestParserWithLAC(t *testing.T) { diff --git a/driver/parser/parser_test.go b/tests/unit/driver/parser/parser_test.go index cdfd922..bca0391 100644 --- a/driver/parser/parser_test.go +++ b/tests/unit/driver/parser/parser_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "grammar" - "spec/grammar/parser" + "urubu/grammar" + "urubu/spec/grammar/parser" ) func termNode(kind string, text string, children ...*Node) *Node { diff --git a/driver/parser/semantic_action_test.go b/tests/unit/driver/parser/semantic_action_test.go index 8c224e2..cb3ee70 100644 --- a/driver/parser/semantic_action_test.go +++ b/tests/unit/driver/parser/semantic_action_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "grammar" - spec "spec/grammar" - "spec/grammar/parser" + "urubu/grammar" + spec "urubu/spec/grammar" + "urubu/spec/grammar/parser" ) type testSemAct struct { diff --git a/driver/parser/syntax_error_test.go b/tests/unit/driver/parser/syntax_error_test.go index c508be6..90e5bd2 100644 --- a/driver/parser/syntax_error_test.go +++ b/tests/unit/driver/parser/syntax_error_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "grammar" - "spec/grammar/parser" + "urubu/grammar" + "urubu/spec/grammar/parser" ) func TestParserWithSyntaxErrors(t *testing.T) { diff --git a/grammar/first_test.go b/tests/unit/grammar/first_test.go index ea1a61c..9625ef6 100644 --- a/grammar/first_test.go +++ b/tests/unit/grammar/first_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "grammar/symbol" - "spec/grammar/parser" + "urubu/grammar/symbol" + "urubu/spec/grammar/parser" ) type first struct { diff --git a/grammar/grammar_test.go b/tests/unit/grammar/grammar_test.go index 4a3c6a0..ddedb27 100644 --- a/grammar/grammar_test.go +++ b/tests/unit/grammar/grammar_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - verr "error" - "spec/grammar/parser" + verr "urubu/error" + "urubu/spec/grammar/parser" ) func TestGrammarBuilderOK(t *testing.T) { diff --git a/grammar/lalr1_test.go b/tests/unit/grammar/lalr1_test.go index d08468d..fd09333 100644 --- a/grammar/lalr1_test.go +++ b/tests/unit/grammar/lalr1_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "grammar/symbol" - "spec/grammar/parser" + "urubu/grammar/symbol" + "urubu/spec/grammar/parser" ) func TestGenLALR1Automaton(t *testing.T) { diff --git a/grammar/lexical/compiler_test.go b/tests/unit/grammar/lexical/compiler_test.go index 3336048..b621cd2 100644 --- a/grammar/lexical/compiler_test.go +++ b/tests/unit/grammar/lexical/compiler_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - spec "spec/grammar" + spec "urubu/spec/grammar" ) func TestLexSpec_Validate(t *testing.T) { diff --git a/grammar/lexical/dfa/dfa_test.go b/tests/unit/grammar/lexical/dfa/dfa_test.go index 9af9aeb..38577cf 100644 --- a/grammar/lexical/dfa/dfa_test.go +++ b/tests/unit/grammar/lexical/dfa/dfa_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "grammar/lexical/parser" - spec "spec/grammar" + "urubu/grammar/lexical/parser" + spec "urubu/spec/grammar" ) func TestGenDFA(t *testing.T) { diff --git a/grammar/lexical/dfa/symbol_position_test.go b/tests/unit/grammar/lexical/dfa/symbol_position_test.go index c867f64..c867f64 100644 --- a/grammar/lexical/dfa/symbol_position_test.go +++ b/tests/unit/grammar/lexical/dfa/symbol_position_test.go diff --git a/grammar/lexical/dfa/tree_test.go b/tests/unit/grammar/lexical/dfa/tree_test.go index 188fe95..de3ebbb 100644 --- a/grammar/lexical/dfa/tree_test.go +++ b/tests/unit/grammar/lexical/dfa/tree_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "grammar/lexical/parser" - spec "spec/grammar" + "urubu/grammar/lexical/parser" + spec "urubu/spec/grammar" ) func TestByteTree(t *testing.T) { diff --git a/grammar/lexical/parser/lexer_test.go b/tests/unit/grammar/lexical/parser/lexer_test.go index 055466e..055466e 100644 --- a/grammar/lexical/parser/lexer_test.go +++ b/tests/unit/grammar/lexical/parser/lexer_test.go diff --git a/grammar/lexical/parser/parser_test.go b/tests/unit/grammar/lexical/parser/parser_test.go index e876d3b..4c9557d 100644 --- a/grammar/lexical/parser/parser_test.go +++ b/tests/unit/grammar/lexical/parser/parser_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - spec "spec/grammar" - "ucd" + spec "urubu/spec/grammar" + "urubu/ucd" ) func TestParse(t *testing.T) { diff --git a/grammar/lr0_test.go b/tests/unit/grammar/lr0_test.go index 798c2fa..0a9ec24 100644 --- a/grammar/lr0_test.go +++ b/tests/unit/grammar/lr0_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "grammar/symbol" - "spec/grammar/parser" + "urubu/grammar/symbol" + "urubu/spec/grammar/parser" ) type expectedLRState struct { diff --git a/grammar/parsing_table_test.go b/tests/unit/grammar/parsing_table_test.go index 098adf9..342e187 100644 --- a/grammar/parsing_table_test.go +++ b/tests/unit/grammar/parsing_table_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "grammar/symbol" - "spec/grammar/parser" + "urubu/grammar/symbol" + "urubu/spec/grammar/parser" ) type expectedState struct { diff --git a/grammar/symbol/symbol_test.go b/tests/unit/grammar/symbol/symbol_test.go index 31c3edd..31c3edd 100644 --- a/grammar/symbol/symbol_test.go +++ b/tests/unit/grammar/symbol/symbol_test.go diff --git a/grammar/test_helper_test.go b/tests/unit/grammar/test_helper_test.go index 63fcafb..546d2c1 100644 --- a/grammar/test_helper_test.go +++ b/tests/unit/grammar/test_helper_test.go @@ -3,7 +3,7 @@ package grammar import ( "testing" - "grammar/symbol" + "urubu/grammar/symbol" ) type testSymbolGenerator func(text string) symbol.Symbol diff --git a/spec/grammar/parser/lexer_test.go b/tests/unit/spec/grammar/parser/lexer_test.go index c0beaf9..c402b42 100644 --- a/spec/grammar/parser/lexer_test.go +++ b/tests/unit/spec/grammar/parser/lexer_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - verr "error" + verr "urubu/error" ) func TestLexer_Run(t *testing.T) { diff --git a/spec/grammar/parser/parser_test.go b/tests/unit/spec/grammar/parser/parser_test.go index 77863e8..4161f6b 100644 --- a/spec/grammar/parser/parser_test.go +++ b/tests/unit/spec/grammar/parser/parser_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - verr "error" + verr "urubu/error" ) func TestParse(t *testing.T) { diff --git a/spec/test/parser_test.go b/tests/unit/spec/test/parser_test.go index eddba92..eddba92 100644 --- a/spec/test/parser_test.go +++ b/tests/unit/spec/test/parser_test.go diff --git a/tester/tester_test.go b/tests/unit/tester/tester_test.go index df5cb07..3c6b1db 100644 --- a/tester/tester_test.go +++ b/tests/unit/tester/tester_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "grammar" - "spec/grammar/parser" - tspec "spec/test" + "urubu/grammar" + "urubu/spec/grammar/parser" + tspec "urubu/spec/test" ) func TestTester_Run(t *testing.T) { diff --git a/utf8/utf8_test.go b/tests/unit/utf8/utf8_test.go index 2dc8093..2dc8093 100644 --- a/utf8/utf8_test.go +++ b/tests/unit/utf8/utf8_test.go |