refactor(typesystem): use typesystem as a dependency

nevalang · Feb 1, 2024 · 3d21e2e · 3d21e2e
1 parent 23224f3
commit 3d21e2e
Show file tree

Hide file tree

Showing 34 changed files with 25 additions and 2,980 deletions.
diff --git a/cmd/interpreter/main.go b/cmd/interpreter/main.go
@@ -7,6 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/nevalang/typesystem"
+
 	"github.com/nevalang/neva/internal/compiler"
 	"github.com/nevalang/neva/internal/compiler/analyzer"
 	"github.com/nevalang/neva/internal/compiler/desugarer"
@@ -15,7 +17,6 @@ import (
 	"github.com/nevalang/neva/internal/pkgmanager"
 	"github.com/nevalang/neva/internal/runtime"
 	"github.com/nevalang/neva/internal/runtime/funcs"
-	"github.com/nevalang/neva/pkg/typesystem"
 )
 
 func main() {

diff --git a/cmd/language-server/main.go b/cmd/language-server/main.go
@@ -13,7 +13,7 @@ import (
 	"github.com/nevalang/neva/internal/compiler/desugarer"
 	"github.com/nevalang/neva/internal/compiler/parser"
 	builder "github.com/nevalang/neva/internal/pkgmanager"
-	"github.com/nevalang/neva/pkg/typesystem"
+	"github.com/nevalang/typesystem"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
 module github.com/nevalang/neva
 
-go 1.21
+go 1.21.0
 
 require (
 	github.com/golang/mock v1.6.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
@@ -54,6 +54,7 @@ require (
 require (
 	github.com/antlr4-go/antlr/v4 v4.13.0
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/nevalang/typesystem v0.0.0-20240131202005-06cf54d0b884
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/tliron/glsp v0.2.0
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc

diff --git a/go.sum b/go.sum
@@ -70,6 +70,8 @@ github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWV
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/nevalang/typesystem v0.0.0-20240131202005-06cf54d0b884 h1:4N7oWnL6XFRbkTVUK+FQpv/4/wBEzpSQ9+1UfAtF7Qw=
+github.com/nevalang/typesystem v0.0.0-20240131202005-06cf54d0b884/go.mod h1:QY7QUGZrr631Ivujly5LRn60c3XGKysuHHYi/wK3rJg=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
@@ -102,6 +104,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tliron/commonlog v0.2.10 h1:fcrlLemZro9rHHjKsq8VrNLNKqiLNM+Wtl9no6hmik4=
 github.com/tliron/commonlog v0.2.10/go.mod h1:XELlm6nokOVcFkRrleWEaC8cZ84UDqAIePaJdehoCII=
 github.com/tliron/glsp v0.2.0 h1:zhBD0wDVVqlpuPYtjmhIXI/8W5KQewPjaS4SYRevKYQ=

diff --git a/internal/compiler/analyzer/analyzer.go b/internal/compiler/analyzer/analyzer.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var (

diff --git a/internal/compiler/analyzer/component_net.go b/internal/compiler/analyzer/component_net.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var (

diff --git a/internal/compiler/analyzer/interface.go b/internal/compiler/analyzer/interface.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var (

diff --git a/internal/compiler/analyzer/type.go b/internal/compiler/analyzer/type.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 type analyzeTypeDefParams struct {

diff --git a/internal/compiler/desugarer/const_sender.go b/internal/compiler/desugarer/const_sender.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var constComponentRef = src.EntityRef{

diff --git a/internal/compiler/desugarer/desugarer_test.go b/internal/compiler/desugarer/desugarer_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	"github.com/nevalang/neva/pkg/typesystem"
+	"github.com/nevalang/typesystem"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/internal/compiler/desugarer/struct_selectors.go b/internal/compiler/desugarer/struct_selectors.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var (

diff --git a/internal/compiler/desugarer/then_connections.go b/internal/compiler/desugarer/then_connections.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/nevalang/neva/internal/compiler"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	"github.com/nevalang/neva/pkg/typesystem"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	"github.com/nevalang/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var lockNode = src.Node{

diff --git a/internal/compiler/irgen/runtime_func.go b/internal/compiler/irgen/runtime_func.go
@@ -7,7 +7,7 @@ import (
 	"github.com/nevalang/neva/internal/compiler"
 	"github.com/nevalang/neva/pkg/ir"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 func getRuntimeFunc(component src.Component, nodeTypeArgs []ts.Expr) (string, error) {

diff --git a/internal/compiler/parser/listener.go b/internal/compiler/parser/listener.go
@@ -5,7 +5,7 @@ import (
 
 	generated "github.com/nevalang/neva/internal/compiler/parser/generated"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 func (s *treeShapeListener) EnterProg(actx *generated.ProgContext) {

diff --git a/internal/compiler/parser/listener_helpers.go b/internal/compiler/parser/listener_helpers.go
@@ -8,7 +8,7 @@ import (
 	"github.com/nevalang/neva/internal/compiler"
 	generated "github.com/nevalang/neva/internal/compiler/parser/generated"
 	src "github.com/nevalang/neva/pkg/sourcecode"
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 func parseTypeParams(params generated.ITypeParamsContext) src.TypeParams {

diff --git a/pkg/sourcecode/scope.go b/pkg/sourcecode/scope.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 var (

diff --git a/pkg/sourcecode/sourcecode.go b/pkg/sourcecode/sourcecode.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	ts "github.com/nevalang/neva/pkg/typesystem"
+	ts "github.com/nevalang/typesystem"
 )
 
 type Build struct {

diff --git a/pkg/typesystem/helper.go b/pkg/typesystem/helper.go
diff --git a/pkg/typesystem/integration_test.go b/pkg/typesystem/integration_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"errors"
     	"fmt"
-    	ts "github.com/nevalang/neva/pkg/typesystem"
+    	ts "github.com/nevalang/typesystem"
     )
     var (
@@ Expand Down @@