Improve compiler error reporting

thegridman · May 25, 2023 · 598c8f8 · 598c8f8
1 parent 82ea566
commit 598c8f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/javatools/src/main/java/org/xvm/compiler/ast/AssignmentStatement.java b/javatools/src/main/java/org/xvm/compiler/ast/AssignmentStatement.java
@@ -656,15 +656,19 @@ else if (fConditional)
 
                     exprRightNew = exprRight.validateMulti(ctxRValue, atypeReq, errs);
 
-                    if (fValid)
+                    if (exprRightNew == null)
                         {
-                        merge(ctxRValue, ctxLValue);
+                        fValid = false;
                         }
-
-                    // conditional expressions can update the LVal type from the RVal type, but the
-                    // initial boolean is discarded
-                    if (exprRightNew != null)
+                    else
                         {
+                        // conditional expressions can update the LVal type from the RVal type,
+                        // but the initial boolean is discarded
+                        if (fValid)
+                            {
+                            merge(ctxRValue, ctxLValue);
+                            }
+
                         exprLeft.markAssignment(ctxRValue,
                             fConditional && exprRight != null && exprRight.isConditionalResult(), errs);
 

diff --git a/javatools/src/main/java/org/xvm/compiler/ast/AstNode.java b/javatools/src/main/java/org/xvm/compiler/ast/AstNode.java
@@ -1359,9 +1359,11 @@ else if (typeParam != null && !errsTemp.hasSeriousErrors())
 
                     log(errsTemp, Severity.ERROR, Compiler.INCOMPATIBLE_PARAMETER_TYPE,
                             String.valueOf(i+1), method.getParam(i).getName(),
-                            method.getIdentityConstant().getValueString(),
-                            typeParam.getValueString(),
-                            typeExpr == null ? exprArg.toString() : typeExpr.getValueString());
+                            method.getIdentityConstant().getSignature().removeAutoNarrowing().getValueString(),
+                            typeParam.removeAutoNarrowing().getValueString(),
+                            typeExpr == null
+                                ? exprArg.toString()
+                                : typeExpr.removeAutoNarrowing().getValueString());
                     }
 
                 if (typeParam != null)

diff --git a/lib_ecstasy/src/main/x/ecstasy/lang/src/Parser.x b/lib_ecstasy/src/main/x/ecstasy/lang/src/Parser.x
@@ -1091,9 +1091,6 @@ class Parser
             return True, token;
             }
 
-        // TODO GG - small error (pass parser instead of lexer) results in hard to read errors ...
-        //           maybe report one error, then make a guess at which method was trying to be called?
-        // if ((Token left, Token right) := token.peel(id, this))
         if ((Token left, Token right) := token.peel(id, lexer))
             {
             matchedToken = left;