Merge pull request #519 from nevalang/human_readable_err_for_incompat…

…_conn_type

fix(typesys): expr stringer + e2e

.vscode/launch.json

@@ -224,6 +224,15 @@
       "cwd": "${workspaceFolder}/e2e/tests/struct_selector_on_port_addr",
       "args": ["run", "main"]
     },
+    {
+      "name": "E2E incompat_comp_type_arg",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/cmd/neva",
+      "cwd": "${workspaceFolder}/e2e/tests/incompat_comp_type_arg",
+      "args": ["run", "main"]
+    },
     // === LSP ===
     {
       "name": "LSP",

e2e/run_tests_test.go

@@ -117,3 +117,22 @@ func TestListWithNegInt(t *testing.T) {
 		require.Equal(t, 0, cmd.ProcessState.ExitCode())
 	}
 }
+
+func TestIncompatCompTypeArg(t *testing.T) {
+	err := os.Chdir("./tests/incompat_comp_type_arg")
+	require.NoError(t, err)
+
+	defer os.Chdir(wd)
+
+	cmd := exec.Command("neva", "run", "main")
+
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err)
+	require.Equal(
+		t,
+		"main/main.neva:2:9 Incompatible types: want int | float | string, got any\n",
+		string(out),
+	)
+
+	require.Equal(t, 0, cmd.ProcessState.ExitCode())
+}

e2e/tests/incompat_comp_type_arg/main/main.neva

@@ -0,0 +1,10 @@
+component Main(start) (stop) {
+	nodes { Eq<any> }
+	net {
+		:start -> (
+            0 -> eq:a,
+            1 -> eq:b
+        )
+        eq:else -> :stop
+	}
+}

e2e/tests/incompat_comp_type_arg/neva.yml

@@ -0,0 +1 @@
+neva: 0.10.0

internal/compiler/analyzer/component_nodes.go

@@ -129,7 +129,7 @@ func (a Analyzer) analyzeComponentNode(
 	); err != nil {
 		return src.Node{}, src.Interface{}, &compiler.Error{
 			Err:      err,
-			Location: &location,
+			Location: &scope.Location,
 			Meta:     &node.Meta,
 		}
 	}

pkg/typesystem/subtype_checker.go

@@ -17,7 +17,7 @@ var (
 	ErrStructLen     = errors.New("Subtype struct must contain >= fields than supertype")
 	ErrStructField   = errors.New("Subtype struct field must be subtype of corresponding supertype field")
 	ErrStructNoField = errors.New("Subtype struct is missing field of supertype")
-	ErrUnion         = errors.New("Subtype must be subtype of supertype union")
+	ErrUnion         = errors.New("Incompatible types")
 	ErrUnionsLen     = errors.New("Subtype union must be <= supertype union")
 	ErrUnions        = errors.New("Subtype union el must be subtype of supertype union")
 	ErrDiffLitTypes  = errors.New("Subtype and supertype lits must be of the same type")
@@ -163,7 +163,7 @@ func (s SubtypeChecker) Check( //nolint:funlen,gocognit,gocyclo
 					return nil
 				}
 			}
-			return fmt.Errorf("%w: want %v, got %v", ErrUnion, constr.Lit.Union, expr)
+			return fmt.Errorf("%w: want %v, got %v", ErrUnion, constr, expr)
 		}
 		// If we here, then expr is union
 		if len(expr.Lit.Union) > len(constr.Lit.Union) {

pkg/typesystem/typesystem.go

@@ -48,8 +48,8 @@ type Expr struct {
 type ExprMeta any
 
 // String formats expression in a TS manner
-func (expr *Expr) String() string {
-	if expr == nil || expr.Inst == nil && expr.Lit == nil {
+func (expr Expr) String() string {
+	if expr.Inst == nil && expr.Lit == nil {
 		return "empty"
 	}