X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ferrors%2FErrorLog.java;h=f2e648b0089ea022021c815f98cf5e52d5d4228c;hb=b2c6aed4003ef264fb48eed9ac9f2d0f6c2d5b13;hp=13e80fc6d62755e6d162d14536b74cff6e32e160;hpb=b35573372259ace60d8827766fe41443f4c57629;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/errors/ErrorLog.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/errors/ErrorLog.java
index 13e80fc6d..f2e648b00 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/errors/ErrorLog.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/errors/ErrorLog.java
@@ -7,7 +7,7 @@ import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
 
 public class ErrorLog {
     ArrayList<CompilationError> errors = new ArrayList<CompilationError>(); 
-    long exceptionPosition;
+    long exceptionPosition = Locations.NO_LOCATION;
     
     public void log(String message) {
         errors.add(new CompilationError(message));
@@ -22,10 +22,12 @@ public class ErrorLog {
     }
 
     public void log(Exception e) {
+        long location = Locations.NO_LOCATION;
         if(e instanceof InternalCompilerError)
-            log(((InternalCompilerError)e).location, e);
-        else
-            log(new CompilationError(e));
+            location = ((InternalCompilerError)e).location;
+        if(location == Locations.NO_LOCATION)
+            location = exceptionPosition;
+        log(new CompilationError(location, e));
     }
     
     public void log(long location, Exception e) {
@@ -45,10 +47,6 @@ public class ErrorLog {
         if(this.exceptionPosition == Locations.NO_LOCATION)
             this.exceptionPosition = exceptionPosition;
     }
-    
-    public long getExceptionPosition() {
-        return exceptionPosition;
-    }
 
     public String getErrorsAsString() {
         StringBuilder b = new StringBuilder();
@@ -61,4 +59,8 @@ public class ErrorLog {
     public String toString() {
         return getErrorsAsString();
     }
+
+    public int getErrorCount() {
+        return errors.size();
+    }
 }