From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Sun, 3 Sep 2017 08:12:15 +0000 (+0300)
Subject: (refs #7460) Prevent NPE if variable type is null.
X-Git-Tag: v1.31.0~209
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=4658265095b85e44d386dd14124519f46bd3779a

(refs #7460) Prevent NPE if variable type is null.

This may happen, if the variable is defined in a pattern and
the pattern type checking is not finished because of a type error.

Change-Id: I91aa4c7938769f84388fbc18f089b662e3ddcb9d
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
index 7fe0e0a92..155aa7578 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
@@ -132,8 +132,13 @@ public class EVariable extends Expression {
             variable.setType(Types.metaVar(Kinds.STAR));
             return this;
         }
-        else
+        else {
+            if(variable.getType() == null) {
+                context.getErrorLog().log(location, "Type of the variable is not defined.");
+                variable.setType(Types.metaVar(Kinds.STAR));
+            }
             return applyPUnit(context);
+        }
     }
     
     @Override
@@ -142,8 +147,13 @@ public class EVariable extends Expression {
             variable.setType(requiredType);
             return this;
         }
-        else
+        else {
+            if(variable.getType() == null) {
+                context.getErrorLog().log(location, "Type of the variable is not defined.");
+                variable.setType(Types.metaVar(Kinds.STAR));
+            }
             return context.subsume(this, requiredType);
+        }
     }
     
     @Override