From e923ba7f026deb25d59cf38db1809967248ff44b Mon Sep 17 00:00:00 2001
From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 2 Oct 2014 11:20:05 +0000
Subject: [PATCH] Improved error reporting refs #5224

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30356 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../src/fi/semantum/sysdyn/solver/Array.java  |  2 +-
 .../fi/semantum/sysdyn/solver/Assignment.java | 49 +++++++++++++++++--
 .../sysdyn/solver/ExecutionException.java     | 18 +++++++
 .../fi/semantum/sysdyn/solver/Function.java   |  5 +-
 .../src/fi/semantum/sysdyn/solver/Model.java  | 36 ++++++++++++--
 .../src/fi/semantum/sysdyn/solver/Parser.java | 26 +++++-----
 .../src/fi/semantum/sysdyn/solver/Solver.java | 25 +++++-----
 .../fi/semantum/sysdyn/solver/Variable.java   | 20 ++++++--
 .../sysdyn/solver/parser/ModelParser.java     | 48 +++++++++---------
 .../sysdyn/solver/parser/ModelicaParser.jj    | 16 +++---
 .../sysdyn/solver/parser/ModelicaParser.jjt   | 10 ++--
 .../sysdyn/solver/parser/SimpleNode.java      |  1 +
 12 files changed, 179 insertions(+), 77 deletions(-)
 create mode 100644 fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ExecutionException.java

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
index 6cdc5b83..cb16d4b9 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
@@ -515,7 +515,7 @@ public class Array implements IExpression {
 			Object element = element(index);
 			// Last position should not be array
 			if(position == subscripts.length-1) {
-				if(element instanceof Array) throw new IllegalStateException();
+				if(element instanceof Array) throw new ExecutionException("Array size does not match subscripts.");
 				if(element instanceof IExpression) {
 					IExpression exp = (IExpression)element;
 					return exp.evaluate(environment);
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
index 6607c198..67752379 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
@@ -10,16 +10,19 @@
  *******************************************************************************/
 package fi.semantum.sysdyn.solver;
 
-
 public class Assignment {
-	
+
+	private static final boolean VALIDATE = true;	
+
+	public IFrame model;
 	public Variable target;
 	public IExpression[] subscripts;
     public IExpression expression;
     public boolean assigned = false;
     public boolean isConstant = false;
     
-    public Assignment(Variable target, IExpression[] subscripts, IExpression expression) {
+    public Assignment(IFrame model, Variable target, IExpression[] subscripts, IExpression expression) {
+    	this.model = model;
     	this.target = target;
     	this.subscripts = subscripts;
     	this.expression = expression;
@@ -35,10 +38,46 @@ public class Assignment {
     		IExpression[] subscripts2 = new IExpression[subscripts.length];
     		for(int i=0;i<subscripts.length;i++)
     			subscripts2[i] = subscripts[i].withBase(frame, prefix);
-    		return new Assignment(target.withBase(frame, prefix), subscripts2, expression.withBase(frame, prefix));
+    		return new Assignment(frame, target.withBase(frame, prefix), subscripts2, expression.withBase(frame, prefix));
     	} else {
-    		return new Assignment(target.withBase(frame, prefix), null, expression.withBase(frame, prefix));
+    		return new Assignment(frame, target.withBase(frame, prefix), null, expression.withBase(frame, prefix));
+    	}
+    }
+    
+    public void assign(IEnvironment env) {
+    	try {
+			Object value = expression.evaluate(env);
+			if(value != null) {
+				validate(target, value);
+				target.assign(env, subscripts, value);
+				assigned = true;
+			}
+    	} catch (ExecutionException e) {
+    		if(model instanceof Model) {
+    			throw new ExecutionException("Line " + (target.line-((Model)model).line) + ": while evaluating " + target.base.name + ": " + e.getMessage());
+    		} else {
+    			throw new ExecutionException("While evaluating " + target.base.name + ": " + e.getMessage());
+    		}
     	}
     }
     
+    
+	private void validate(Variable var, Object value) {
+		if(VALIDATE) {
+			if(value instanceof Double) {
+				if(Double.isNaN((Double)value)) {
+					System.err.println("value is invalid (NaN): " + var.base.name);
+					throw new IllegalStateException("value is invalid (NaN)");
+				}
+				if(Double.isInfinite((Double)value)) {
+					System.err.println("value is invalid (Infinite): " + var.base.name);
+					throw new IllegalStateException("value is invalid (Infinite)");
+				}
+			}
+			if(value instanceof Array) {
+				for(Object o : ((Array)value).elements()) validate(var, o);
+			}
+		}
+	}
+    
 }
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ExecutionException.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ExecutionException.java
new file mode 100644
index 00000000..ebea363e
--- /dev/null
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ExecutionException.java
@@ -0,0 +1,18 @@
+package fi.semantum.sysdyn.solver;
+
+public class ExecutionException extends RuntimeException {
+
+	private static final long serialVersionUID = 8394963990462508948L;
+	
+	public int line = -1;
+	
+	public ExecutionException(String message) {
+		super(message);
+	}
+
+	public ExecutionException(String message, int line) {
+		super(message);
+		this.line = line;
+	}
+
+}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Function.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Function.java
index 9af1f4b3..f78c04a6 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Function.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Function.java
@@ -28,10 +28,13 @@ final public class Function implements Fn, IFrame {
 	public Variable[] parameters;
 	
 	public ArrayList<ForIndex> indices = new ArrayList<ForIndex>();
+	
+	public int line;
 
-	public Function(String name, IStatement statement) {
+	public Function(String name, IStatement statement, int line) {
 		this.name = name;
 		this.statement = statement;
+		this.line = line;
 	}
 	
 	public Object evaluate(IEnvironment environment, int argc) {
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
index 537d238f..ab861d89 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
@@ -40,6 +40,7 @@ class Model implements IFrame {
 	
 	public final Globals globals;
 	
+	public int line = -1;
 	public String name;
 	public boolean isEnumClass;
 	
@@ -82,6 +83,16 @@ class Model implements IFrame {
 		return base;
 	}
 	
+	private void reportException(Fn fn, ExecutionException e) throws ExecutionException {
+		
+		if(fn instanceof Function) {
+			throw new ExecutionException("function " + name + ": " + (e.line - ((Function)fn).line) + ": " + e.getMessage());
+		} else {
+			throw new ExecutionException("function " + name + ": " + (e.line - ((Function)fn).line) + ": " + e.getMessage());
+		}
+		
+	}
+	
 	public Object evaluateFunction(IEnvironment environment, String name, ArgumentList args) {
 		Fn fn = getFunction(name);
 		if(fn == null) {
@@ -109,7 +120,15 @@ class Model implements IFrame {
 
 			fn.setLocals(frame);
 			
-			return fn.evaluate(frame, args.args.length+1);
+			try {
+			
+				return fn.evaluate(frame, args.args.length+1);
+				
+			} catch (ExecutionException e) {
+				
+				reportException(fn, e);
+				
+			}
 			
 		} else {
 			
@@ -157,13 +176,24 @@ class Model implements IFrame {
 				}
 				
 				fn.setLocals(frame);
-				Object value = fn.evaluate(frame, args.args.length); 
-				return value;
+				
+				try {
+
+					return fn.evaluate(frame, args.args.length); 
+
+				} catch (ExecutionException e) {
+
+					reportException(fn, e);
+
+				}
 				
 			}
 			
 		}
 			
+		// This cannot happen - reportException always throws
+		throw new IllegalStateException();
+		
 	}
 	
 	private Array arrayEvaluate(Frame frame, Fn fn, Variable[] parameters, Object[] ps, boolean[] vector, List<Array> arrs) {
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
index 6560e2d1..14c73e87 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
@@ -74,12 +74,12 @@ public class Parser {
 			IExpression exp = (IExpression)walk((SimpleNode)n.jjtGetChild(1), indent+2, frame);
 			if(v instanceof Derivative) {
 				Derivative der = (Derivative)v;
-				Assignment eq = new Assignment(der.variable, der.variable.subscripts, new Derivate(der.variable, der.variable.subscripts, exp));
+				Assignment eq = new Assignment(model, der.variable, der.variable.subscripts, new Derivate(der.variable, der.variable.subscripts, exp));
 				model.derivatives.add(eq);
 				return eq;
 			} else {
 				Variable var = (Variable)v;
-				Assignment eq = new Assignment(var, var.subscripts, exp);
+				Assignment eq = new Assignment(model, var, var.subscripts, exp);
 				if(model.initial)
 					model.initials.add(eq);
 				else
@@ -338,18 +338,18 @@ public class Parser {
 			return subs;
 		case declaration:
 			if(n.jjtGetNumChildren() == 0) {
-				return new Declaration(new Variable(frame, n.op, null), null);
+				return new Declaration(new Variable(frame, n.op, null, n.line), null);
 			} else if(n.jjtGetNumChildren() == 1) {
 				Object o = walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 				if(o instanceof IExpression[]) {
-					return new Declaration(new Variable(frame, n.op, (IExpression[])o), null);
+					return new Declaration(new Variable(frame, n.op, (IExpression[])o, n.line), null);
 				} else {
-					return new Declaration(new Variable(frame, n.op, null), o);
+					return new Declaration(new Variable(frame, n.op, null, n.line), o);
 				}
 			} else if(n.jjtGetNumChildren() == 2) {
 				IExpression[] subscripts2 = (IExpression[])walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 				Object modification = walk((SimpleNode)n.jjtGetChild(1), indent+2, frame);
-				return new Declaration(new Variable(frame, n.op,subscripts2), modification);
+				return new Declaration(new Variable(frame, n.op,subscripts2, n.line), modification);
 			} else {
 				StringBuilder b = new StringBuilder();
 				b.append("declaration: ");
@@ -365,8 +365,9 @@ public class Parser {
 				SimpleNode child = (SimpleNode)n.jjtGetChild(0);
 				String packagePath = getPackagePath(child);
 				String functionName = packagePath + child.op;
+				System.err.println("function " + functionName + " at line " + child.line);
 				ArrayList<IStatement> stms2 = new ArrayList<IStatement>();
-				Function function = new Function(functionName, new StatementList(stms2));
+				Function function = new Function(functionName, new StatementList(stms2), child.line);
 				ArrayList<Object> composition = (ArrayList<Object>)walk(child, indent+2, function);
 				for(int i=1;i<composition.size();i++) {
 					Object comp = composition.get(i);
@@ -411,11 +412,14 @@ public class Parser {
 						}
 					}
 				}
+				
 				model.functions.put(functionName, function);
 				return function;
 				
 			} else if("model".equals(n.op)) {
 
+				model.line = n.line;
+				
 				if(n.jjtGetNumChildren() == 1) {
 					return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 				} else {
@@ -431,8 +435,8 @@ public class Parser {
 				walk(specifier, indent+2, clazz);
 				
 				if(clazz.isEnumClass) {
-					Variable sizeVariable = new Variable(clazz, "size", null);
-					Variable elementsVariable = new Variable(clazz, "elements", new IExpression[] { new Constant(""+clazz.variables.size()) });
+					Variable sizeVariable = new Variable(clazz, "size", null, n.line);
+					Variable elementsVariable = new Variable(clazz, "elements", new IExpression[] { new Constant(""+clazz.variables.size()) }, n.line);
 					clazz.parameters.add(new ParameterDeclaration(sizeVariable, sizeVariable.getPossibleConstant()));
 					clazz.parameters.add(new ParameterDeclaration(elementsVariable, elementsVariable.getPossibleConstant()));
 				}
@@ -469,12 +473,12 @@ public class Parser {
 			}
 		case component_reference:
 			if(n.jjtGetNumChildren() == 1) {
-				return Variable.make(frame, n.op, (IExpression[])walk((SimpleNode)n.jjtGetChild(0), indent+2, frame));
+				return Variable.make(frame, n.op, (IExpression[])walk((SimpleNode)n.jjtGetChild(0), indent+2, frame), n.line);
 			} else {
 				if ("time".equals(n.op)) {
 					return new TimeVariable();
 				}
-				return Variable.make(frame, n.op, null);
+				return Variable.make(frame, n.op, null, n.line);
 			}
 		case relation:
 			if(n.jjtGetNumChildren() == 3) {
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
index d66eb549..80484a56 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
@@ -255,14 +255,8 @@ public class Solver {
 			
 			for(Assignment ass : assignments) {
 				try {
-					if(!ass.assigned) {
-						Object value = ass.expression.evaluate(env);
-						if(value != null) {
-							validate(ass.target, value);
-							ass.target.assign(env, ass.subscripts, value);
-							ass.assigned = true;
-						}
-					}
+					if(!ass.assigned)
+						ass.assign(env);
 				} catch (Exception e) {
 					String error = "  -" + ass.target.toString() + ": " + e.getMessage();
 					if(errors != null) {
@@ -316,13 +310,15 @@ public class Solver {
 				Assignment[] assignments = model.assignmentArray;
 				for(int i=0;i<assignments.length;i++) {
 					if(assignments[i].isConstant) continue;
-					Object value = assignments[i].expression.evaluate(env);
-					assignments[i].target.assign(env, assignments[i].subscripts, value);
+					assignments[i].assign(env);
+//					Object value = assignments[i].expression.evaluate(env);
+//					assignments[i].target.assign(env, assignments[i].subscripts, value);
 				}
 				for(Assignment ass : model.initials) {
 					if(ass.isConstant) continue;
-					Object value = ass.expression.evaluate(env);
-					ass.target.assign(env, ass.subscripts, value);
+					ass.assign(env);
+//					Object value = ass.expression.evaluate(env);
+//					ass.target.assign(env, ass.subscripts, value);
 				}
 	
 				for(VariableDeclaration vd : model.variables) {
@@ -397,8 +393,9 @@ public class Solver {
 		// Next solve algebraic equations
 		for(int i=0;i<assignments.length;i++) {
 			if(assignments[i].isConstant) continue;
-			Object value = assignments[i].expression.evaluate(env);
-			assignments[i].target.assign(env, assignments[i].subscripts, value);
+			assignments[i].assign(env);
+//			Object value = assignments[i].expression.evaluate(env);
+//			assignments[i].target.assign(env, assignments[i].subscripts, value);
 		}
 
 	}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
index 2f28d4b8..fe222fc8 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
@@ -19,18 +19,20 @@ public class Variable implements IExpression {
 
 	public VariableBase base;
 	public IExpression[] subscripts = null;
+	public int line = -1;
 	
-	public Variable(IFrame frame, String name, IExpression[] subscripts) {
+	public Variable(IFrame frame, String name, IExpression[] subscripts, int line) {
 		base = frame.getBase(name);
 		this.subscripts = subscripts;
+		this.line = line;
 	}
 	
-	public static Object make(IFrame frame, String name, IExpression[] subscripts) {
+	public static Object make(IFrame frame, String name, IExpression[] subscripts, int line) {
 //		Array enumElements = enumerationElements(frame, name);
 //		if(enumElements != null) return enumElements;
 //		Constant enumSize = enumerationSize(frame, name);
 //		if(enumSize != null) return enumSize;
-		return new Variable(frame, name, subscripts);
+		return new Variable(frame, name, subscripts, line);
 	}
 	
 	public Variable(VariableBase base) {
@@ -203,9 +205,17 @@ public class Variable implements IExpression {
 	@Override
 	public Object evaluate(IEnvironment environment) {
 		
-		if(constantIndex == -2) constantIndex = base.getConstantIndex(environment, subscripts);
+		try {
 		
-		return base.evaluate(environment, subscripts, constantIndex);
+			if(constantIndex == -2) constantIndex = base.getConstantIndex(environment, subscripts);
+			
+			return base.evaluate(environment, subscripts, constantIndex);
+			
+		} catch (ExecutionException e) {
+			
+			throw new ExecutionException(base.name + ": " + e.getMessage(), line);
+			
+		}
 		
 	}
 
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
index bcd1d520..b1101a81 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
@@ -166,9 +166,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
 /*** Class Definition **********************************************/
   final public void class_definition() throws ParseException {
                            /*@bgen(jjtree) class_definition */
-  SimpleNode jjtn000 = new SimpleNode(JJTCLASS_DEFINITION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+                            SimpleNode jjtn000 = new SimpleNode(JJTCLASS_DEFINITION);
+                            boolean jjtc000 = true;
+                            jjtree.openNodeScope(jjtn000);Token t;
     try {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case 30:
@@ -192,8 +192,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
                 jjtn000.op = "class";
         break;
       case 7:
-        jj_consume_token(7);
-                                                    jjtn000.op = "model";
+        t = jj_consume_token(7);
+                                                        jjtn000.op = "model"; jjtn000.line = t.beginLine;
         break;
       case 61:
         jj_consume_token(61);
@@ -268,7 +268,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     try {
       if (jj_2_1(2)) {
         t = jj_consume_token(IDENT);
-                             jjtn000.op = t.image;
+                             jjtn000.op = t.image; jjtn000.line = t.beginLine;
         string_comment();
         composition();
         jj_consume_token(35);
@@ -1403,7 +1403,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     Parameter ret = new Parameter();
     try {
       jj_consume_token(IDENT);
-                  ret.name = new String(token.image); jjtn000.op = token.image;
+                  ret.name = new String(token.image); jjtn000.op = token.image; jjtn000.line = token.beginLine;
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case 66:
         array_subscripts();
@@ -4047,7 +4047,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         ;
       }
       t = jj_consume_token(IDENT);
-                             jjtn000.op = t.image;
+                             jjtn000.op = t.image; jjtn000.line = t.beginLine;
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case 66:
         array_subscripts();
@@ -5204,6 +5204,14 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
+  private boolean jj_3R_107() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(50)) jj_scanpos = xsp;
+    if (jj_scan_token(44)) return true;
+    return false;
+  }
+
   private boolean jj_3R_66() {
     if (jj_3R_80()) return true;
     return false;
@@ -5293,14 +5301,6 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_107() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(50)) jj_scanpos = xsp;
-    if (jj_scan_token(44)) return true;
-    return false;
-  }
-
   private boolean jj_3R_84() {
     Token xsp;
     xsp = jj_scanpos;
@@ -5524,6 +5524,12 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
+  private boolean jj_3R_165() {
+    if (jj_scan_token(68)) return true;
+    if (jj_scan_token(IDENT)) return true;
+    return false;
+  }
+
   private boolean jj_3R_58() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_3R_74()) return true;
@@ -5587,9 +5593,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_165() {
-    if (jj_scan_token(68)) return true;
-    if (jj_scan_token(IDENT)) return true;
+  private boolean jj_3R_164() {
+    if (jj_3R_170()) return true;
     return false;
   }
 
@@ -5663,11 +5668,6 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_164() {
-    if (jj_3R_170()) return true;
-    return false;
-  }
-
   private boolean jj_3R_48() {
     Token xsp;
     xsp = jj_scanpos;
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
index 3f908483..d5f57adb 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
@@ -177,10 +177,10 @@ Node stored_definition()         : {/*@bgen(jjtree) STORED */
 /*** Class Definition **********************************************/
   
 void class_definition() : {/*@bgen(jjtree) class_definition */
-  SimpleNode jjtn000 = new SimpleNode(JJTCLASS_DEFINITION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
-/*@egen*/
+                            SimpleNode jjtn000 = new SimpleNode(JJTCLASS_DEFINITION);
+                            boolean jjtc000 = true;
+                            jjtree.openNodeScope(jjtn000);
+/*@egen*/ Token t;
 } {/*@bgen(jjtree) class_definition */
     try {
 /*@egen*/
@@ -192,7 +192,7 @@ void class_definition() : {/*@bgen(jjtree) class_definition */
 //  class_specifier
     ( "encapsulated" )?
     ( "partial" )?
-    ( "class" { jjtn000.op = "class"; } | "model" { jjtn000.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
+    ( "class" { jjtn000.op = "class"; } | t = "model" { jjtn000.op = "model"; jjtn000.line = t.beginLine; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
     "package" { jjtn000.op = "package"; } | "function" { jjtn000.op = "function"; } | "operator" | "operator function" | "operator record" )
     class_specifier()/*@bgen(jjtree)*/
     } catch (Throwable jjte000) {
@@ -234,7 +234,7 @@ void class_specifier() : {/*@bgen(jjtree) class_specifier */
 //  | IDENT "=" der "(" name "," IDENT { "," IDENT } ")" comment
 //  | extends IDENT [ class_modification ] string_comment composition
 //  end IDENT  
-    LOOKAHEAD(2) t=<IDENT> { jjtn000.op = t.image; } string_comment() composition() "end" <IDENT>
+    LOOKAHEAD(2) t=<IDENT> { jjtn000.op = t.image; jjtn000.line = t.beginLine; } string_comment() composition() "end" <IDENT>
     | LOOKAHEAD(2) <IDENT> "=" base_prefix() name() ( array_subscripts() )? ( class_modification() )? comment()
     | LOOKAHEAD(3)  <IDENT> "=" "der" "(" name() "," <IDENT> ( "," <IDENT> )* ")" comment()
     | LOOKAHEAD(3) <IDENT> "=" "enumeration" "(" ( ( enum_list() )? | ":" ) ")" comment()/*@bgen(jjtree)*/
@@ -924,7 +924,7 @@ Parameter declaration() : {/*@bgen(jjtree) declaration */
         try {
 /*@egen*/
 //	IDENT [ array_subscripts ] [ modification ]
-	<IDENT>	{ ret.name = new String(token.image); jjtn000.op = token.image; }
+	<IDENT>	{ ret.name = new String(token.image); jjtn000.op = token.image; jjtn000.line = token.beginLine; }
 	( array_subscripts() )?
 	( ret.optional = modification() )?/*@bgen(jjtree)*/
         {
@@ -2643,7 +2643,7 @@ void component_reference() : {/*@bgen(jjtree) component_reference */
         try {
 /*@egen*/
 //	[ "." ] IDENT [ array_subscripts ] { "." IDENT [ array_subscripts ] }
-	( "." )? t=<IDENT> { jjtn000.op = t.image; } ( array_subscripts() )? ( "." <IDENT> ( array_subscripts() )? )*/*@bgen(jjtree)*/
+	( "." )? t=<IDENT> { jjtn000.op = t.image; jjtn000.line = t.beginLine; } ( array_subscripts() )? ( "." <IDENT> ( array_subscripts() )? )*/*@bgen(jjtree)*/
         } catch (Throwable jjte000) {
           if (jjtc000) {
             jjtree.clearNodeScope(jjtn000);
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
index b4231401..87103388 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
@@ -110,7 +110,7 @@ Node stored_definition() #STORED : {
 
 /*** Class Definition **********************************************/
   
-void class_definition() : {
+void class_definition() : { Token t;
 } {
 //  class_definition :
 //  [ encapsulated ]
@@ -120,7 +120,7 @@ void class_definition() : {
 //  class_specifier
     ( "encapsulated" )?
     ( "partial" )?
-    ( "class" { jjtThis.op = "class"; } | "model" { jjtThis.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
+    ( "class" { jjtThis.op = "class"; } | t = "model" { jjtThis.op = "model"; jjtThis.line = t.beginLine; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
     "package" { jjtThis.op = "package"; } | "function" { jjtThis.op = "function"; } | "operator" | "operator function" | "operator record" )
     class_specifier()
 }
@@ -136,7 +136,7 @@ void class_specifier() : { Token t;
 //  | IDENT "=" der "(" name "," IDENT { "," IDENT } ")" comment
 //  | extends IDENT [ class_modification ] string_comment composition
 //  end IDENT  
-    LOOKAHEAD(2) t=<IDENT> { jjtThis.op = t.image; } string_comment() composition() "end" <IDENT>
+    LOOKAHEAD(2) t=<IDENT> { jjtThis.op = t.image; jjtThis.line = t.beginLine; } string_comment() composition() "end" <IDENT>
     | LOOKAHEAD(2) <IDENT> "=" base_prefix() name() ( array_subscripts() )? ( class_modification() )? comment()
     | LOOKAHEAD(3)  <IDENT> "=" "der" "(" name() "," <IDENT> ( "," <IDENT> )* ")" comment()
     | LOOKAHEAD(3) <IDENT> "=" "enumeration" "(" ( ( enum_list() )? | ":" ) ")" comment()
@@ -320,7 +320,7 @@ Parameter declaration() : { Token t;
     Parameter ret = new Parameter();
 } {
 //	IDENT [ array_subscripts ] [ modification ]
-	<IDENT>	{ ret.name = new String(token.image); jjtThis.op = token.image; }
+	<IDENT>	{ ret.name = new String(token.image); jjtThis.op = token.image; jjtThis.line = token.beginLine; }
 	( array_subscripts() )?
 	( ret.optional = modification() )?
 	{
		return ret;
	}
@@ -710,7 +710,7 @@ void component_reference() : {
   Token t;
 } {
 //	[ "." ] IDENT [ array_subscripts ] { "." IDENT [ array_subscripts ] }
-	( "." )? t=<IDENT> { jjtThis.op = t.image; } ( array_subscripts() )? ( "." <IDENT> ( array_subscripts() )? )*
+	( "." )? t=<IDENT> { jjtThis.op = t.image; jjtThis.line = t.beginLine; } ( array_subscripts() )? ( "." <IDENT> ( array_subscripts() )? )*
 }
 
 void function_call_args() : {
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/SimpleNode.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/SimpleNode.java
index b399a88f..4a12bf77 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/SimpleNode.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/SimpleNode.java
@@ -11,6 +11,7 @@ class SimpleNode implements Node {
   protected Object value;
   protected ModelParser parser;
   
+  public int line = -1;
   public String op;
 
   public SimpleNode(int i) {
-- 
2.47.1