Improve error reporting for NewExpression

xtclang · Jun 3, 2022 · c886757 · c886757
1 parent 34dfcc7
commit c886757
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java b/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java
@@ -619,10 +619,11 @@ else if (type instanceof ArrayTypeExpression exprArray)
             }
 
         // unless it's a virtual new, the target type must be new-able
-        if (!fVirt && !infoTarget.isNewable(errs))
+        if (!fVirt && !infoTarget.isNewable(errsTemp))
             {
             String sTarget = infoTarget.getType().removeAccess().getValueString();
-            reportNotNewable(sTarget, infoTarget, null, errs);
+            reportNotNewable(sTarget, infoTarget, null, errsTemp);
+            errsTemp.merge();
             return null;
             }
 
@@ -1826,4 +1827,4 @@ private enum AnonPurpose {None, RoughDraft, CaptureAnalysis, Actual}
     private transient boolean               m_fDynamicAnno;
 
     private static final Field[] CHILD_FIELDS = fieldsForNames(NewExpression.class, "left", "type", "args", "anon");
-    }
+    }
diff --git a/javatools/src/main/java/org/xvm/tool/Compiler.java b/javatools/src/main/java/org/xvm/tool/Compiler.java
@@ -477,7 +477,7 @@ protected void log(ErrorList errs)
 
         if (cErrs > 0)
             {
-            // if there are any COMPILER errors, suppress all VERIFY errors
+            // if there are any COMPILER errors, suppress all VERIFY errors except the first three
             boolean fSuppressVerify = false;
 
             for (ErrorInfo err : listErrs)
@@ -489,9 +489,10 @@ protected void log(ErrorList errs)
                     }
                 }
 
+            int cVerify = 0;
             for (ErrorInfo err : listErrs)
                 {
-                if (fSuppressVerify && err.getCode().startsWith("VERIFY"))
+                if (fSuppressVerify && err.getCode().startsWith("VERIFY") && ++cVerify > 3)
                     {
                     continue;
                     }