diff --git a/analyzer/assignment.go b/analyzer/assignment.go index d18dfa2..482c955 100644 --- a/analyzer/assignment.go +++ b/analyzer/assignment.go @@ -2,9 +2,9 @@ package analyzer import "fmt" import "math" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/integer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/integer" type strictness int; const ( // Structural equivalence, but named types are treated as opaque and are diff --git a/analyzer/builtin.go b/analyzer/builtin.go index 9efb106..437cc85 100644 --- a/analyzer/builtin.go +++ b/analyzer/builtin.go @@ -1,6 +1,6 @@ package analyzer -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/entity" var primitiveTypes = map[string] entity.Type { "Int": &entity.TypeWord { Acc: entity.AccessPublic, Signed: true }, diff --git a/analyzer/expression-multiplex.go b/analyzer/expression-multiplex.go index af37799..5a501c1 100644 --- a/analyzer/expression-multiplex.go +++ b/analyzer/expression-multiplex.go @@ -1,7 +1,7 @@ package analyzer import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/entity" func (this *Tree) analyzeExpression ( into entity.Type, diff --git a/analyzer/expression.go b/analyzer/expression.go index 31531a4..6fdf16b 100644 --- a/analyzer/expression.go +++ b/analyzer/expression.go @@ -1,8 +1,8 @@ package analyzer import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" // All expression analysis routines must take in the type they are being // assigned to and return an error if they can't be assigned to it. if the type diff --git a/analyzer/function.go b/analyzer/function.go index 9eec33a..3148a4a 100644 --- a/analyzer/function.go +++ b/analyzer/function.go @@ -1,7 +1,7 @@ package analyzer -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" func (this *Tree) analyzeFunction ( pos errors.Position, diff --git a/analyzer/literal.go b/analyzer/literal.go index 2bb86ad..ae5799e 100644 --- a/analyzer/literal.go +++ b/analyzer/literal.go @@ -1,8 +1,8 @@ package analyzer import "unicode/utf16" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" func (this *Tree) analyzeLiteralInt ( into entity.Type, diff --git a/analyzer/method.go b/analyzer/method.go index a19d4fe..1f8c96b 100644 --- a/analyzer/method.go +++ b/analyzer/method.go @@ -1,8 +1,8 @@ package analyzer import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" // analyzeMethod analyzes a method that is directly owned by the specified type. diff --git a/analyzer/misc.go b/analyzer/misc.go index fc78200..ad9b66d 100644 --- a/analyzer/misc.go +++ b/analyzer/misc.go @@ -1,7 +1,7 @@ package analyzer -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" func (this *Tree) assembleSignatureMap (signature *entity.Signature) (*entity.Signature, error) { signature.ArgumentMap = make(map[string] *entity.Declaration) diff --git a/analyzer/scope.go b/analyzer/scope.go index 9ee5b1c..149360c 100644 --- a/analyzer/scope.go +++ b/analyzer/scope.go @@ -1,6 +1,6 @@ package analyzer -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/entity" // scopeContextManager is a stack of scopeContexts allowing multiple stacks of // scopes to be managed at the same time in case the analysis of one scoped diff --git a/analyzer/test-common.go b/analyzer/test-common.go index bf153a2..4394a10 100644 --- a/analyzer/test-common.go +++ b/analyzer/test-common.go @@ -3,10 +3,10 @@ package analyzer import "testing" import "strings" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/parser/fspl" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/parser/fspl" func testStringErr ( test *testing.T, diff --git a/analyzer/tree.go b/analyzer/tree.go index 159fda5..0aeb57e 100644 --- a/analyzer/tree.go +++ b/analyzer/tree.go @@ -1,9 +1,9 @@ package analyzer import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/parser/fspl" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/parser/fspl" // Tree is a semantic tree. It contains the same constructs as the syntax tree, // but with their semantic information filled in. diff --git a/analyzer/type.go b/analyzer/type.go index b1507d9..ab78479 100644 --- a/analyzer/type.go +++ b/analyzer/type.go @@ -1,8 +1,8 @@ package analyzer import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" func (this *Tree) analyzeTypedef ( pos errors.Position, diff --git a/cmd/fsplc/main.go b/cmd/fsplc/main.go index 63b7a9b..0ce8741 100644 --- a/cmd/fsplc/main.go +++ b/cmd/fsplc/main.go @@ -2,10 +2,10 @@ package main import "os" import "path/filepath" -import "git.tebibyte.media/sashakoshka/fspl/cli" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/compiler" -import ferrors "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/cli" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/compiler" +import ferrors "git.tebibyte.media/fspl/fspl/errors" func main () { // instantiate the compiler diff --git a/compiler/compiler.go b/compiler/compiler.go index 2707719..4634e2b 100644 --- a/compiler/compiler.go +++ b/compiler/compiler.go @@ -8,14 +8,14 @@ import "errors" import "os/exec" import "path/filepath" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" -import "git.tebibyte.media/sashakoshka/fspl/parser/fspl" -import "git.tebibyte.media/sashakoshka/fspl/parser/meta" -import ferrors "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/generator/native" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/parser/fspl" +import "git.tebibyte.media/fspl/fspl/parser/meta" +import ferrors "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/generator/native" type Compiler struct { Resolver diff --git a/compiler/resolver.go b/compiler/resolver.go index 75b1899..613e5a9 100644 --- a/compiler/resolver.go +++ b/compiler/resolver.go @@ -6,7 +6,7 @@ import "io/fs" import "errors" import "strings" import "path/filepath" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/entity" // Resolver turns addresses into absolute filepaths. type Resolver struct { diff --git a/entity/expression.go b/entity/expression.go index 19d3c4e..c53179e 100644 --- a/entity/expression.go +++ b/entity/expression.go @@ -2,7 +2,7 @@ package entity import "fmt" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // Expression is any construct that can be evaluated. type Expression interface { diff --git a/entity/literal.go b/entity/literal.go index 84a15ea..8b9c8ff 100644 --- a/entity/literal.go +++ b/entity/literal.go @@ -1,7 +1,7 @@ package entity import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // LiteralInt specifies an integer value. It can be assigned to any type that is // derived from an integer or a float, as long as the value fo the literal can diff --git a/entity/meta.go b/entity/meta.go index 660092c..600eaa2 100644 --- a/entity/meta.go +++ b/entity/meta.go @@ -6,7 +6,7 @@ import "unicode" import "unicode/utf8" import "path/filepath" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // Metadata represents a module metadata file. type Metadata struct { diff --git a/entity/misc.go b/entity/misc.go index 23b4faa..ed51356 100644 --- a/entity/misc.go +++ b/entity/misc.go @@ -3,7 +3,7 @@ package entity import "fmt" import "unicode" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // Signature is a function or method signature that is used in functions, // methods, and specifying interface behaviors. It defines the type of a diff --git a/entity/toplevel.go b/entity/toplevel.go index e1845db..080a229 100644 --- a/entity/toplevel.go +++ b/entity/toplevel.go @@ -3,7 +3,7 @@ package entity import "fmt" import "encoding/base64" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // Key globally indexes top level entities in contexts where modules matter. type Key struct { diff --git a/entity/type.go b/entity/type.go index 150b03e..4682427 100644 --- a/entity/type.go +++ b/entity/type.go @@ -2,7 +2,7 @@ package entity import "fmt" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // Type is any type notation. type Type interface { diff --git a/errors/test-common.go b/errors/test-common.go index cf19c04..06c9c85 100644 --- a/errors/test-common.go +++ b/errors/test-common.go @@ -1,7 +1,7 @@ package errors import "testing" -import "git.tebibyte.media/sashakoshka/fspl/testcommon" +import "git.tebibyte.media/fspl/fspl/testcommon" func testString (test *testing.T, correct string, got string) { if got != correct { diff --git a/generator/assignment.go b/generator/assignment.go index b4cdf90..d6c35ea 100644 --- a/generator/assignment.go +++ b/generator/assignment.go @@ -2,9 +2,9 @@ package generator import "fmt" import "errors" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" func (this *generator) generateAssignment (assignment *entity.Assignment) (llvm.Value, error) { destination, err := this.generateExpressionLoc(assignment.Location) diff --git a/generator/blockmanager.go b/generator/blockmanager.go index c8b4951..109d7ab 100644 --- a/generator/blockmanager.go +++ b/generator/blockmanager.go @@ -2,8 +2,8 @@ package generator import "fmt" import "errors" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" type loopEntry struct { value llvm.Value diff --git a/generator/data.go b/generator/data.go index 068a82d..078abc4 100644 --- a/generator/data.go +++ b/generator/data.go @@ -1,7 +1,7 @@ package generator -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" func (this *generator) generateSlice (ty entity.Type, data llvm.Value, length llvm.Value) (llvm.Value, error) { irType, err := this.generateType(ty) diff --git a/generator/expression-loc.go b/generator/expression-loc.go index 4c6ad9f..a6eb394 100644 --- a/generator/expression-loc.go +++ b/generator/expression-loc.go @@ -1,9 +1,9 @@ package generator import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" func (this *generator) generateVariableLoc (variable *entity.Variable) (llvm.Value, error) { return this.blockManager.variable(variable.Declaration) diff --git a/generator/expression-multiplex.go b/generator/expression-multiplex.go index dbadb79..69620dd 100644 --- a/generator/expression-multiplex.go +++ b/generator/expression-multiplex.go @@ -1,8 +1,8 @@ package generator import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" type resultMode int; const ( resultModeAny resultMode = iota diff --git a/generator/expression-val.go b/generator/expression-val.go index 500e6c4..cce1cdf 100644 --- a/generator/expression-val.go +++ b/generator/expression-val.go @@ -2,9 +2,9 @@ package generator import "fmt" import "errors" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" func (this *generator) generateCallVal (call *entity.Call) (llvm.Value, error) { function, err := this.function(entity.Key { diff --git a/generator/expression.go b/generator/expression.go index b6ab147..1b3056b 100644 --- a/generator/expression.go +++ b/generator/expression.go @@ -1,9 +1,9 @@ package generator // import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -// import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +// import "git.tebibyte.media/fspl/fspl/analyzer" func (this *generator) generateBlock (block *entity.Block, mode resultMode) (llvm.Value, bool, error) { if len(block.Steps) == 0 { return nil, false, nil } diff --git a/generator/function.go b/generator/function.go index f3d80a9..324bcb3 100644 --- a/generator/function.go +++ b/generator/function.go @@ -1,7 +1,7 @@ package generator -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" func (this *generator) generateFunction ( function *entity.Function, diff --git a/generator/generator.go b/generator/generator.go index 80d7bb9..c5d7e68 100644 --- a/generator/generator.go +++ b/generator/generator.go @@ -2,9 +2,9 @@ package generator import "sort" import "errors" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" var errNotFound = errors.New("entity not found") diff --git a/generator/literal.go b/generator/literal.go index 3428a1f..c6aeda6 100644 --- a/generator/literal.go +++ b/generator/literal.go @@ -2,9 +2,9 @@ package generator import "fmt" import "errors" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" func (this *generator) generateLiteralInt (literal *entity.LiteralInt) (llvm.Value, error) { irType, err := this.generateType(analyzer.ReduceToBase(literal.Type())) diff --git a/generator/native/native.go b/generator/native/native.go index e7269f5..4250ddc 100644 --- a/generator/native/native.go +++ b/generator/native/native.go @@ -2,7 +2,7 @@ // This is accomplished using several conditionally compiled source files. package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" // NativeTarget returns a target describing the current system. func NativeTarget () generator.Target { diff --git a/generator/native/native_386.go b/generator/native/native_386.go index 0268338..41c14a1 100644 --- a/generator/native/native_386.go +++ b/generator/native/native_386.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_amd64.go b/generator/native/native_amd64.go index 6eb0df4..9fc80ff 100644 --- a/generator/native/native_amd64.go +++ b/generator/native/native_amd64.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_amd64p32.go b/generator/native/native_amd64p32.go index 4e59907..7a80955 100644 --- a/generator/native/native_amd64p32.go +++ b/generator/native/native_amd64p32.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { // this may not be accurate, can't find info online about amd64p32 diff --git a/generator/native/native_arm.go b/generator/native/native_arm.go index 8b01ffb..e1c4c50 100644 --- a/generator/native/native_arm.go +++ b/generator/native/native_arm.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_arm64.go b/generator/native/native_arm64.go index e0d6593..c42d90f 100644 --- a/generator/native/native_arm64.go +++ b/generator/native/native_arm64.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_arm64be.go b/generator/native/native_arm64be.go index 5c5544f..5e00b09 100644 --- a/generator/native/native_arm64be.go +++ b/generator/native/native_arm64be.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_armbe.go b/generator/native/native_armbe.go index 3d2b82a..d12d225 100644 --- a/generator/native/native_armbe.go +++ b/generator/native/native_armbe.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_mips.go b/generator/native/native_mips.go index 0aa1463..eb1b7cd 100644 --- a/generator/native/native_mips.go +++ b/generator/native/native_mips.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_mips64.go b/generator/native/native_mips64.go index 7b965d1..a31931d 100644 --- a/generator/native/native_mips64.go +++ b/generator/native/native_mips64.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_mips64le.go b/generator/native/native_mips64le.go index d3018af..55c57ef 100644 --- a/generator/native/native_mips64le.go +++ b/generator/native/native_mips64le.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_mipsle.go b/generator/native/native_mipsle.go index 9413bbc..eba2835 100644 --- a/generator/native/native_mipsle.go +++ b/generator/native/native_mipsle.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_ppc.go b/generator/native/native_ppc.go index 18fdef6..f338477 100644 --- a/generator/native/native_ppc.go +++ b/generator/native/native_ppc.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_ppc64.go b/generator/native/native_ppc64.go index aefc5b1..06334bc 100644 --- a/generator/native/native_ppc64.go +++ b/generator/native/native_ppc64.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_ppc64le.go b/generator/native/native_ppc64le.go index 36d353d..63d4453 100644 --- a/generator/native/native_ppc64le.go +++ b/generator/native/native_ppc64le.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_riscv.go b/generator/native/native_riscv.go index d8f0d8e..3ebcaa9 100644 --- a/generator/native/native_riscv.go +++ b/generator/native/native_riscv.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_sparc.go b/generator/native/native_sparc.go index f61493a..6e1474a 100644 --- a/generator/native/native_sparc.go +++ b/generator/native/native_sparc.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_sparc64.go b/generator/native/native_sparc64.go index b79a4a9..5994637 100644 --- a/generator/native/native_sparc64.go +++ b/generator/native/native_sparc64.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { return generator.Target { diff --git a/generator/native/native_wasm.go b/generator/native/native_wasm.go index c5c1cec..93e89fe 100644 --- a/generator/native/native_wasm.go +++ b/generator/native/native_wasm.go @@ -1,6 +1,6 @@ package native -import "git.tebibyte.media/sashakoshka/fspl/generator" +import "git.tebibyte.media/fspl/fspl/generator" func nativeTarget () generator.Target { // FIXME: golang doesn't discern between 32/64 bit wasm so we assume 64 diff --git a/generator/test-common.go b/generator/test-common.go index 38dcb27..0a5ae78 100644 --- a/generator/test-common.go +++ b/generator/test-common.go @@ -3,12 +3,12 @@ package generator import "testing" import "strings" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" -import "git.tebibyte.media/sashakoshka/fspl/analyzer" -import "git.tebibyte.media/sashakoshka/fspl/testcommon" -import "git.tebibyte.media/sashakoshka/fspl/parser/fspl" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" +import "git.tebibyte.media/fspl/fspl/analyzer" +import "git.tebibyte.media/fspl/fspl/testcommon" +import "git.tebibyte.media/fspl/fspl/parser/fspl" func testString (test *testing.T, correct string, input string) { address := entity.Address("main.fspl") diff --git a/generator/type-multiplex.go b/generator/type-multiplex.go index 5a373da..ab470c0 100644 --- a/generator/type-multiplex.go +++ b/generator/type-multiplex.go @@ -1,8 +1,8 @@ package generator import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" func (this *generator) generateTypedef ( def *entity.Typedef, diff --git a/generator/type.go b/generator/type.go index 8dcf3ee..4643da5 100644 --- a/generator/type.go +++ b/generator/type.go @@ -3,8 +3,8 @@ package generator import "fmt" import "errors" import "strings" -import "git.tebibyte.media/sashakoshka/fspl/llvm" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/llvm" +import "git.tebibyte.media/fspl/fspl/entity" func (this *generator) generateTypeIndex () (*llvm.TypeInt, error) { ty, err := this.typedef(entity.Key { diff --git a/go.mod b/go.mod index 09df9ee..fd06132 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.tebibyte.media/sashakoshka/fspl +module git.tebibyte.media/fspl/fspl go 1.19 diff --git a/lexer/lexer.go b/lexer/lexer.go index 41ca78f..df8f6b9 100644 --- a/lexer/lexer.go +++ b/lexer/lexer.go @@ -5,7 +5,7 @@ import "io" import "fmt" import "bufio" import "unicode" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" // TokenKind is an enumeration of all tokens the FSPL compiler recognizes. type TokenKind int; const ( diff --git a/lexer/test-common.go b/lexer/test-common.go index e5a90a4..5419e73 100644 --- a/lexer/test-common.go +++ b/lexer/test-common.go @@ -3,7 +3,7 @@ package lexer import "fmt" import "testing" import "strings" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/errors" func tok (kind TokenKind, value string) Token { return Token { diff --git a/parser/fspl/expression.go b/parser/fspl/expression.go index c1fbd75..5585bc2 100644 --- a/parser/fspl/expression.go +++ b/parser/fspl/expression.go @@ -1,8 +1,8 @@ package fsplParser -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" var descriptionExpression = "expression" var startTokensExpression = []lexer.TokenKind { diff --git a/parser/fspl/literal.go b/parser/fspl/literal.go index 4246e22..10ddd07 100644 --- a/parser/fspl/literal.go +++ b/parser/fspl/literal.go @@ -1,8 +1,8 @@ package fsplParser -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" func (this *treeParser) parseLiteralInt () (*entity.LiteralInt, error) { err := this.Expect(lexer.Int) diff --git a/parser/fspl/misc.go b/parser/fspl/misc.go index 81140df..5216a90 100644 --- a/parser/fspl/misc.go +++ b/parser/fspl/misc.go @@ -1,8 +1,8 @@ package fsplParser import "strconv" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/entity" var descriptionSignature = "signature" var startTokensSignature = []lexer.TokenKind { lexer.LBracket } diff --git a/parser/fspl/parser.go b/parser/fspl/parser.go index dfb6531..86a28f7 100644 --- a/parser/fspl/parser.go +++ b/parser/fspl/parser.go @@ -2,8 +2,8 @@ package fsplParser import "io" import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/parser" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/parser" // parser parses tokens from a lexer into syntax entities, which it places into // a tree. diff --git a/parser/fspl/test-common.go b/parser/fspl/test-common.go index ae1a250..f9fca24 100644 --- a/parser/fspl/test-common.go +++ b/parser/fspl/test-common.go @@ -3,9 +3,9 @@ package fsplParser import "io" import "testing" import "strings" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/testcommon" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/testcommon" func testString (test *testing.T, correct string, input string) { testStringInternal(test, correct, input, false) diff --git a/parser/fspl/toplevel.go b/parser/fspl/toplevel.go index 530d308..814504d 100644 --- a/parser/fspl/toplevel.go +++ b/parser/fspl/toplevel.go @@ -1,8 +1,8 @@ package fsplParser -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" var descriptionTopLevel = "typedef, function, or method" var startTokensTopLevel = []lexer.TokenKind { diff --git a/parser/fspl/tree.go b/parser/fspl/tree.go index ebb2030..9115142 100644 --- a/parser/fspl/tree.go +++ b/parser/fspl/tree.go @@ -1,8 +1,8 @@ package fsplParser import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/entity" // Tree represents a parsed abstract syntax tree. It has no constructor and its // zero value can be used safely. diff --git a/parser/fspl/type.go b/parser/fspl/type.go index 1c38ccf..0443d62 100644 --- a/parser/fspl/type.go +++ b/parser/fspl/type.go @@ -1,9 +1,9 @@ package fsplParser import "strconv" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/entity" var descriptionType = "type" var startTokensType = []lexer.TokenKind { diff --git a/parser/meta/meta.go b/parser/meta/meta.go index 2c1774e..b18e3a7 100644 --- a/parser/meta/meta.go +++ b/parser/meta/meta.go @@ -3,10 +3,10 @@ package metaParser import "io" import "fmt" import "github.com/google/uuid" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/parser" -import "git.tebibyte.media/sashakoshka/fspl/entity" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/parser" +import "git.tebibyte.media/fspl/fspl/entity" // Tree represents a parsed metadata file. It has no constructor and its zero // value can be used safely. diff --git a/parser/meta/test-common.go b/parser/meta/test-common.go index 5b0ffb8..09cd609 100644 --- a/parser/meta/test-common.go +++ b/parser/meta/test-common.go @@ -3,9 +3,9 @@ package metaParser import "io" import "testing" import "strings" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" -import "git.tebibyte.media/sashakoshka/fspl/testcommon" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" +import "git.tebibyte.media/fspl/fspl/testcommon" func testString (test *testing.T, correct string, input string) { ast := Tree { } diff --git a/parser/parser.go b/parser/parser.go index b226626..fa6647d 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -1,8 +1,8 @@ package parser import "fmt" -import "git.tebibyte.media/sashakoshka/fspl/lexer" -import "git.tebibyte.media/sashakoshka/fspl/errors" +import "git.tebibyte.media/fspl/fspl/lexer" +import "git.tebibyte.media/fspl/fspl/errors" // Parser is an embeddable type that contains parsing utilities. It is used to // build more specialized parsers.