feat(analyzer): improve err handling a bit

nevalang · Jan 10, 2024 · 7d165d0 · 7d165d0
1 parent 0b68145
commit 7d165d0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/...s/struct_builder/with_sugar/main.neva.tmp → examples/struct_builder/with_sugar/main.neva b/...s/struct_builder/with_sugar/main.neva.tmp → examples/struct_builder/with_sugar/main.neva
@@ -6,8 +6,8 @@ types {
 }
 
 const {
-    age 32
-    name 'John'
+    age int 32
+    name str 'John'
 }
 
 components {

diff --git a/internal/compiler/analyzer/component.go b/internal/compiler/analyzer/component.go
@@ -22,7 +22,7 @@ var (
 	ErrWriteSelfIn                    = errors.New("Component cannot write to self inport")
 	ErrInportNotFound                 = errors.New("Referenced inport not found in component's interface")
 	ErrNodeNotFound                   = errors.New("Referenced node not found")
-	ErrNodePortNotFound               = errors.New("Node's port not found")
+	ErrPortNotFound                   = errors.New("Port not found")
 	ErrNormCompWithRuntimeFunc        = errors.New("Component with nodes or network cannot use #runtime_func directive")
 	ErrNormComponentWithoutNet        = errors.New("Component must have network except it uses #runtime_func directive")
 	ErrNormNodeRuntimeMsg             = errors.New("Node can't use #runtime_func_msg if it isn't instantiated with the component that use #runtime_func")

diff --git a/internal/compiler/analyzer/component_net.go b/internal/compiler/analyzer/component_net.go
@@ -128,10 +128,10 @@ func (a Analyzer) analyzeNetConn( //nolint:funlen
 	}
 
 	for _, receiver := range conn.ReceiverSide.Receivers {
-		inportTypeExpr, err := a.getReceiverType(receiver, compInterface.IO.Out, nodes, nodesIfaces, scope)
+		inportTypeExpr, err := a.resolveReceiverType(receiver, compInterface.IO.Out, nodes, nodesIfaces, scope)
 		if err != nil {
 			return compiler.Error{
-				Err:      errors.New("Unable to get receiver type"),
+				Err:      errors.New("Unable to resolve receiver"),
 				Location: &scope.Location,
 				Meta:     &receiver.Meta,
 			}.Merge(err)
@@ -216,7 +216,7 @@ func (Analyzer) checkNodesPortsUsage(
 	return nil
 }
 
-func (a Analyzer) getReceiverType(
+func (a Analyzer) resolveReceiverType(
 	receiverSide src.ConnectionReceiver,
 	outports map[string]src.Port,
 	nodes map[string]src.Node,
@@ -293,7 +293,6 @@ func (a Analyzer) getNodeInportType(
 	)
 	if aerr != nil {
 		return ts.Expr{}, compiler.Error{
-			Err:      fmt.Errorf("Unable to resolve '%v' port type", portAddr),
 			Location: &location,
 			Meta:     &portAddr.Meta,
 		}.Merge(aerr)
@@ -312,7 +311,7 @@ func (a Analyzer) getResolvedPortType(
 	port, ok := ports[portAddr.Port]
 	if !ok {
 		return ts.Expr{}, &compiler.Error{
-			Err:      fmt.Errorf("%w '%v'", ErrNodePortNotFound, portAddr),
+			Err:      fmt.Errorf("%w '%v'", ErrPortNotFound, portAddr),
 			Location: &scope.Location,
 			Meta:     &portAddr.Meta,
 		}

diff --git a/internal/compiler/parser/listener_helpers.go b/internal/compiler/parser/listener_helpers.go
@@ -59,7 +59,20 @@ func parseTypeExpr(expr generated.ITypeExprContext) *ts.Expr {
 	} else if litExpr := expr.TypeLitExpr(); litExpr != nil {
 		result = parseLitExpr(litExpr)
 	} else {
-		panic("expr empty")
+		panic(&compiler.Error{
+			Err: errors.New("Missing type expression"),
+			Meta: &src.Meta{
+				Text: expr.GetText(),
+				Start: src.Position{
+					Line:   expr.GetStart().GetLine(),
+					Column: expr.GetStart().GetLine(),
+				},
+				Stop: src.Position{
+					Line:   expr.GetStop().GetLine(),
+					Column: expr.GetStop().GetLine(),
+				},
+			},
+		})
 	}
 
 	result.Meta = getTypeExprMeta(expr)

diff --git a/internal/pkgmanager/manager.go b/internal/pkgmanager/manager.go
@@ -31,8 +31,8 @@ func (p Manager) Build(ctx context.Context, workdir string) (compiler.RawBuild,
 	}
 
 	mods := map[src.ModuleRef]compiler.RawModule{
-		{Path: "", Version: ""}:         entryMod,
-		{Path: "std", Version: "0.0.1"}: stdMod,
+		{Path: "@"}:                     entryMod,
+		{Path: "std", Version: "0.0.1"}: stdMod, // TODO maybe remove version?
 	}
 
 	q := newQueue(entryMod.Manifest.Deps)
@@ -61,7 +61,7 @@ func (p Manager) Build(ctx context.Context, workdir string) (compiler.RawBuild,
 	}
 
 	return compiler.RawBuild{
-		EntryModRef: src.ModuleRef{Path: "", Version: ""},
+		EntryModRef: src.ModuleRef{Path: "@"},
 		Modules:     mods,
 	}, nil
 }

diff --git a/pkg/sourcecode/scope.go b/pkg/sourcecode/scope.go
@@ -34,7 +34,7 @@ type Location struct {
 }
 
 func (l Location) String() string {
-	if l.ModRef.Path == "" { // cur mod
+	if l.ModRef.Path == "@" {
 		return fmt.Sprintf("%v/%v.neva", l.PkgName, l.FileName)
 	}
 	return fmt.Sprintf("%v/%v/%v.neva", l.ModRef, l.PkgName, l.FileName)
@@ -127,7 +127,7 @@ func (s Scope) entity(entityRef EntityRef) (Entity, Location, error) {
 		modRef ModuleRef
 	)
 	if pkgImport.ModuleName == "@" {
-		modRef = s.Location.ModRef
+		modRef = s.Location.ModRef // FIXME s.Location.ModRef is where we are now (e.g. std)
 		mod = curMod
 	} else {
 		modRef = curMod.Manifest.Deps[pkgImport.ModuleName]