diff --git a/arfc/main.go b/arfc/main.go index 42627a4..c1ad409 100644 --- a/arfc/main.go +++ b/arfc/main.go @@ -2,7 +2,7 @@ package arfc import "os" import "fmt" -import "git.tebibyte.media/sashakoshka/arf" +import "git.tebibyte.media/arf/arf" func main () { if len(os.Args) != 2 { diff --git a/go.mod b/go.mod index 743d639..c4af5b2 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module git.tebibyte.media/sashakoshka/arf +module git.tebibyte.media/arf/arf go 1.18 diff --git a/infoerr/error.go b/infoerr/error.go index 0d34a04..d0d4f96 100644 --- a/infoerr/error.go +++ b/infoerr/error.go @@ -2,7 +2,7 @@ package infoerr import "os" import "fmt" -import "git.tebibyte.media/sashakoshka/arf/file" +import "git.tebibyte.media/arf/arf/file" type ErrorKind int diff --git a/lexer/lexer.go b/lexer/lexer.go index 91e3fc4..08db5d1 100644 --- a/lexer/lexer.go +++ b/lexer/lexer.go @@ -1,9 +1,9 @@ package lexer import "io" -import "git.tebibyte.media/sashakoshka/arf/file" -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/file" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/infoerr" // LexingOperation holds information about an ongoing lexing operataion. type LexingOperation struct { diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go index 371269e..3a04a8b 100644 --- a/lexer/lexer_test.go +++ b/lexer/lexer_test.go @@ -1,9 +1,9 @@ package lexer import "testing" -import "git.tebibyte.media/sashakoshka/arf/file" -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/file" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/infoerr" func quickToken (width int, kind TokenKind, value any) (token Token) { token.location.SetWidth(width) diff --git a/lexer/numbers.go b/lexer/numbers.go index af1d2ab..72830a4 100644 --- a/lexer/numbers.go +++ b/lexer/numbers.go @@ -1,7 +1,7 @@ package lexer import "strconv" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/infoerr" // tokenizeSymbolBeginning lexes a token that starts with a number. func (lexer *LexingOperation) tokenizeNumberBeginning (negative bool) (err error) { diff --git a/lexer/text.go b/lexer/text.go index fc073ab..8c0234e 100644 --- a/lexer/text.go +++ b/lexer/text.go @@ -1,7 +1,7 @@ package lexer import "strconv" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/infoerr" // tokenizeString tokenizes a string or rune literal. func (lexer *LexingOperation) tokenizeString (isRuneLiteral bool) (err error) { diff --git a/lexer/token.go b/lexer/token.go index e345f96..466785f 100644 --- a/lexer/token.go +++ b/lexer/token.go @@ -1,8 +1,8 @@ package lexer import "fmt" -import "git.tebibyte.media/sashakoshka/arf/file" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/file" +import "git.tebibyte.media/arf/arf/infoerr" // TokenKind is an enum represzenting what role a token has. type TokenKind int diff --git a/main.go b/main.go index 3f4c7e1..4c44c7e 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package arf import "io" -import "git.tebibyte.media/sashakoshka/arf/parser" +import "git.tebibyte.media/arf/arf/parser" func CompileModule (modulePath string, output io.Writer) (err error) { _, err = parser.Parse(modulePath) diff --git a/parser/argument.go b/parser/argument.go index b4d665b..ae8606c 100644 --- a/parser/argument.go +++ b/parser/argument.go @@ -1,7 +1,7 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" var validArgumentStartTokens = []lexer.TokenKind { lexer.TokenKindName, diff --git a/parser/body.go b/parser/body.go index e6ff997..82001fc 100644 --- a/parser/body.go +++ b/parser/body.go @@ -1,7 +1,7 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // parse body parses the body of an arf file, after the metadata header. func (parser *ParsingOperation) parseBody () (err error) { diff --git a/parser/data.go b/parser/data.go index f98c8d5..1254422 100644 --- a/parser/data.go +++ b/parser/data.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // parseData parses a data section. func (parser *ParsingOperation) parseDataSection () ( diff --git a/parser/enum.go b/parser/enum.go index f302242..23d318e 100644 --- a/parser/enum.go +++ b/parser/enum.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" func (parser *ParsingOperation) parseEnumSection () ( section *EnumSection, diff --git a/parser/face.go b/parser/face.go index ca4a3d2..b77f48b 100644 --- a/parser/face.go +++ b/parser/face.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // parseFaceSection parses an interface section. func (parser *ParsingOperation) parseFaceSection () ( diff --git a/parser/func.go b/parser/func.go index 723e1b4..de878dd 100644 --- a/parser/func.go +++ b/parser/func.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -// import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +// import "git.tebibyte.media/arf/arf/infoerr" // parseFunc parses a function section. func (parser *ParsingOperation) parseFuncSection () ( diff --git a/parser/meta.go b/parser/meta.go index 1900712..dbf2278 100644 --- a/parser/meta.go +++ b/parser/meta.go @@ -1,7 +1,7 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // parseMeta parsese the metadata header at the top of an arf file. func (parser *ParsingOperation) parseMeta () (err error) { diff --git a/parser/objt.go b/parser/objt.go index 255881b..3b9d869 100644 --- a/parser/objt.go +++ b/parser/objt.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // parseObjtSection parses an object type definition. This allows for structured // types to be defined, and for member variables to be added and overridden. diff --git a/parser/parser.go b/parser/parser.go index 60481a1..226665f 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -3,9 +3,9 @@ package parser import "io" import "os" import "path/filepath" -import "git.tebibyte.media/sashakoshka/arf/file" -import "git.tebibyte.media/sashakoshka/arf/lexer" -import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/file" +import "git.tebibyte.media/arf/arf/lexer" +import "git.tebibyte.media/arf/arf/infoerr" // ParsingOperation holds information about an ongoing parsing operation. type ParsingOperation struct { diff --git a/parser/test-common.go b/parser/test-common.go index 8bea0c2..44f7241 100644 --- a/parser/test-common.go +++ b/parser/test-common.go @@ -3,7 +3,7 @@ package parser import "io" import "strings" import "testing" -// import "git.tebibyte.media/sashakoshka/arf/types" +// import "git.tebibyte.media/arf/arf/types" func checkTree (modulePath string, correct string, test *testing.T) { tree, err := Parse(modulePath) diff --git a/parser/tree.go b/parser/tree.go index d5c3bc9..24ad9aa 100644 --- a/parser/tree.go +++ b/parser/tree.go @@ -1,7 +1,7 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/file" -import "git.tebibyte.media/sashakoshka/arf/types" +import "git.tebibyte.media/arf/arf/file" +import "git.tebibyte.media/arf/arf/types" // SyntaxTree represents an abstract syntax tree. It covers an entire module. It // can be expected to be syntactically correct, but it might not be semantically diff --git a/parser/type.go b/parser/type.go index 9691dcf..04bc9fd 100644 --- a/parser/type.go +++ b/parser/type.go @@ -1,8 +1,8 @@ package parser -import "git.tebibyte.media/sashakoshka/arf/types" -import "git.tebibyte.media/sashakoshka/arf/lexer" -// import "git.tebibyte.media/sashakoshka/arf/infoerr" +import "git.tebibyte.media/arf/arf/types" +import "git.tebibyte.media/arf/arf/lexer" +// import "git.tebibyte.media/arf/arf/infoerr" // parseTypeSection parses a blind type definition, meaning it can inherit from // anything including primitives, but cannot define structure.