From 2f25d8293b887536bc1c07699f97e60f2705ff7e Mon Sep 17 00:00:00 2001
From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 18 Mar 2010 11:06:30 +0000
Subject: [PATCH] Moved /interoperability/branches/dev/* to
 /interoperability/trunk

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@15072 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.express/.classpath              |   7 +
 org.simantics.express/.project                |  11 +
 org.simantics.express/META-INF/MANIFEST.MF    |   6 +
 org.simantics.express/build.properties        |   4 +
 .../org/simantics/express/TestExpress.java    |  49 ++
 .../ast/expressions/ExpBinaryExpression.java  |  23 +
 .../ast/expressions/ExpBooleanLiteral.java    |  23 +
 .../ast/expressions/ExpExpression.java        |  15 +
 .../ast/expressions/ExpFloatLiteral.java      |  19 +
 .../ast/expressions/ExpIntegerLiteral.java    |  19 +
 .../ast/expressions/ExpQuestionMark.java      |  17 +
 .../express/ast/expressions/ExpSelf.java      |  17 +
 .../ast/expressions/ExpStringLiteral.java     |  19 +
 .../ast/expressions/ExpUnaryExpression.java   |  21 +
 .../express/ast/types/ExpAggregate.java       |  19 +
 .../simantics/express/ast/types/ExpArray.java |  19 +
 .../simantics/express/ast/types/ExpBag.java   |  19 +
 .../express/ast/types/ExpBinary.java          |  15 +
 .../express/ast/types/ExpBoolean.java         |  15 +
 .../express/ast/types/ExpEnumeration.java     |  15 +
 .../express/ast/types/ExpGeneric.java         |  15 +
 .../express/ast/types/ExpGenericEntity.java   |  15 +
 .../express/ast/types/ExpInteger.java         |  15 +
 .../simantics/express/ast/types/ExpList.java  |  19 +
 .../express/ast/types/ExpLogical.java         |  15 +
 .../express/ast/types/ExpNumber.java          |  15 +
 .../ast/types/ExpParametrizedType.java        |  19 +
 .../simantics/express/ast/types/ExpReal.java  |  15 +
 .../express/ast/types/ExpSelect.java          |  15 +
 .../simantics/express/ast/types/ExpSet.java   |  19 +
 .../express/ast/types/ExpString.java          |  15 +
 .../simantics/express/ast/types/ExpType.java  |  15 +
 .../express/ast/types/ExpTypeName.java        |  19 +
 .../simantics/express/parser/ExpressParser.jj | 438 ++++++++++++++++++
 34 files changed, 1001 insertions(+)
 create mode 100644 org.simantics.express/.classpath
 create mode 100644 org.simantics.express/.project
 create mode 100644 org.simantics.express/META-INF/MANIFEST.MF
 create mode 100644 org.simantics.express/build.properties
 create mode 100644 org.simantics.express/src/org/simantics/express/TestExpress.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpBinaryExpression.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpBooleanLiteral.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpExpression.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpFloatLiteral.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpIntegerLiteral.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpQuestionMark.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpSelf.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpStringLiteral.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/expressions/ExpUnaryExpression.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpAggregate.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpArray.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpBag.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpBinary.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpBoolean.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpEnumeration.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpGeneric.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpGenericEntity.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpInteger.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpList.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpLogical.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpNumber.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpParametrizedType.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpReal.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpSelect.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpSet.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpString.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpType.java
 create mode 100644 org.simantics.express/src/org/simantics/express/ast/types/ExpTypeName.java
 create mode 100644 org.simantics.express/src/org/simantics/express/parser/ExpressParser.jj

diff --git a/org.simantics.express/.classpath b/org.simantics.express/.classpath
new file mode 100644
index 0000000..8a8f166
--- /dev/null
+++ b/org.simantics.express/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.express/.project b/org.simantics.express/.project
new file mode 100644
index 0000000..4353145
--- /dev/null
+++ b/org.simantics.express/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.simantics.express</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/org.simantics.express/META-INF/MANIFEST.MF b/org.simantics.express/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7c315a4
--- /dev/null
+++ b/org.simantics.express/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Express Plug-in
+Bundle-SymbolicName: org.simantics.express
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.simantics.express/build.properties b/org.simantics.express/build.properties
new file mode 100644
index 0000000..41eb6ad
--- /dev/null
+++ b/org.simantics.express/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.simantics.express/src/org/simantics/express/TestExpress.java b/org.simantics.express/src/org/simantics/express/TestExpress.java
new file mode 100644
index 0000000..4345f92
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/TestExpress.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import org.simantics.express.parser.ExpressParser;
+
+public class TestExpress {
+	
+	public static void parse(File file) {
+		try {
+			System.out.println("Parse " + file);
+	
+			InputStream stream = new FileInputStream(file);
+			ExpressParser parser = new ExpressParser(stream);
+			parser.document();	
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public static void browse(File dir) {
+		for(File f : dir.listFiles())
+			if(f.isDirectory())
+				browse(f);
+			else if(f.getName().endsWith(".exp"))
+				parse(f);
+	}
+	
+	public static void main(String[] args) {
+		try {
+			browse(new File("c:\\Documents and Settings\\Hannu\\My Documents\\express"));
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}		
+	}
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBinaryExpression.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBinaryExpression.java
new file mode 100644
index 0000000..3a7c6cd
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBinaryExpression.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpBinaryExpression implements ExpExpression {
+	ExpExpression left;
+	ExpExpression right;
+	String operator;
+	
+	public ExpBinaryExpression(ExpExpression left, String operator, ExpExpression right) {
+		this.left = left;
+		this.operator = operator;
+		this.right = right;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBooleanLiteral.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBooleanLiteral.java
new file mode 100644
index 0000000..32cdefb
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpBooleanLiteral.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpBooleanLiteral implements ExpExpression {
+	
+	public static final ExpBooleanLiteral TRUE = new ExpBooleanLiteral(true);
+	public static final ExpBooleanLiteral FALSE = new ExpBooleanLiteral(false);
+	
+	boolean value;
+
+	private ExpBooleanLiteral(boolean value) {
+		this.value = value;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpExpression.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpExpression.java
new file mode 100644
index 0000000..894205b
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpExpression.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public interface ExpExpression {
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpFloatLiteral.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpFloatLiteral.java
new file mode 100644
index 0000000..b17c34e
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpFloatLiteral.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpFloatLiteral implements ExpExpression {
+	String value;
+
+	public ExpFloatLiteral(String value) {
+		this.value = value;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpIntegerLiteral.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpIntegerLiteral.java
new file mode 100644
index 0000000..8d22c94
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpIntegerLiteral.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpIntegerLiteral implements ExpExpression {
+	String value;
+
+	public ExpIntegerLiteral(String value) {
+		this.value = value;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpQuestionMark.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpQuestionMark.java
new file mode 100644
index 0000000..cb2219f
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpQuestionMark.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpQuestionMark implements ExpExpression {
+	
+	public static final ExpQuestionMark INSTANCE = new ExpQuestionMark(); 
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpSelf.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpSelf.java
new file mode 100644
index 0000000..15aeb84
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpSelf.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpSelf implements ExpExpression {
+	
+	public static final ExpSelf INSTANCE = new ExpSelf(); 
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpStringLiteral.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpStringLiteral.java
new file mode 100644
index 0000000..a149d81
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpStringLiteral.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpStringLiteral implements ExpExpression {
+	String value;
+
+	public ExpStringLiteral(String value) {
+		this.value = value;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/expressions/ExpUnaryExpression.java b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpUnaryExpression.java
new file mode 100644
index 0000000..af651de
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/expressions/ExpUnaryExpression.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.expressions;
+
+public class ExpUnaryExpression implements ExpExpression {
+	ExpExpression exp;
+	String operator;
+	
+	public ExpUnaryExpression(ExpExpression exp, String operator) {
+		this.exp = exp;
+		this.operator = operator;
+	}
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpAggregate.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpAggregate.java
new file mode 100644
index 0000000..9627266
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpAggregate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpAggregate extends ExpParametrizedType {
+
+	public ExpAggregate(ExpType parameter) {
+		super(parameter);
+	}
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpArray.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpArray.java
new file mode 100644
index 0000000..275ad00
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpArray.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpArray extends ExpParametrizedType {
+
+	public ExpArray(ExpType parameter) {
+		super(parameter);
+	}
+	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpBag.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpBag.java
new file mode 100644
index 0000000..c4e679f
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpBag.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpBag extends ExpParametrizedType {
+
+	public ExpBag(ExpType parameter) {
+		super(parameter);
+	}
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpBinary.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpBinary.java
new file mode 100644
index 0000000..f1bd098
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpBinary.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpBinary implements ExpType {
+	public static final ExpBinary INSTANCE = new ExpBinary();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpBoolean.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpBoolean.java
new file mode 100644
index 0000000..33053aa
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpBoolean.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpBoolean implements ExpType {
+	public static final ExpBoolean INSTANCE = new ExpBoolean();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpEnumeration.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpEnumeration.java
new file mode 100644
index 0000000..eb3f368
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpEnumeration.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpEnumeration implements ExpType {
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpGeneric.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpGeneric.java
new file mode 100644
index 0000000..292b2ad
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpGeneric.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpGeneric implements ExpType {
+	public static final ExpGeneric INSTANCE = new ExpGeneric();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpGenericEntity.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpGenericEntity.java
new file mode 100644
index 0000000..6135ecf
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpGenericEntity.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpGenericEntity implements ExpType {
+	public static final ExpGenericEntity INSTANCE = new ExpGenericEntity();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpInteger.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpInteger.java
new file mode 100644
index 0000000..00999c1
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpInteger.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpInteger implements ExpType {
+	public static final ExpInteger INSTANCE = new ExpInteger();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpList.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpList.java
new file mode 100644
index 0000000..0f70c40
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpList.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpList extends ExpParametrizedType {
+
+	public ExpList(ExpType parameter) {
+		super(parameter);
+	}
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpLogical.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpLogical.java
new file mode 100644
index 0000000..6ea8dc9
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpLogical.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpLogical implements ExpType {
+	public static final ExpLogical INSTANCE = new ExpLogical();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpNumber.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpNumber.java
new file mode 100644
index 0000000..7d844d8
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpNumber.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpNumber implements ExpType {
+	public static final ExpNumber INSTANCE = new ExpNumber();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpParametrizedType.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpParametrizedType.java
new file mode 100644
index 0000000..157f17d
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpParametrizedType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public abstract class ExpParametrizedType implements ExpType {
+	ExpType parameter;
+
+	public ExpParametrizedType(ExpType parameter) {
+		this.parameter = parameter;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpReal.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpReal.java
new file mode 100644
index 0000000..a9c8eb6
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpReal.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpReal implements ExpType {
+	public static final ExpReal INSTANCE = new ExpReal();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpSelect.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpSelect.java
new file mode 100644
index 0000000..6e2b884
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpSelect.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpSelect implements ExpType {
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpSet.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpSet.java
new file mode 100644
index 0000000..06d952c
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpSet.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpSet extends ExpParametrizedType {
+
+	public ExpSet(ExpType parameter) {
+		super(parameter);
+	}
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpString.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpString.java
new file mode 100644
index 0000000..694edc8
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpString.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpString implements ExpType {
+	public static final ExpString INSTANCE = new ExpString();
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpType.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpType.java
new file mode 100644
index 0000000..599de50
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpType.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public interface ExpType {
+
+}
diff --git a/org.simantics.express/src/org/simantics/express/ast/types/ExpTypeName.java b/org.simantics.express/src/org/simantics/express/ast/types/ExpTypeName.java
new file mode 100644
index 0000000..f2698b9
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/ast/types/ExpTypeName.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.express.ast.types;
+
+public class ExpTypeName implements ExpType {
+	String name;
+
+	public ExpTypeName(String name) {
+		this.name = name;
+	}	
+}
diff --git a/org.simantics.express/src/org/simantics/express/parser/ExpressParser.jj b/org.simantics.express/src/org/simantics/express/parser/ExpressParser.jj
new file mode 100644
index 0000000..628341b
--- /dev/null
+++ b/org.simantics.express/src/org/simantics/express/parser/ExpressParser.jj
@@ -0,0 +1,438 @@
+options {
+  JDK_VERSION = "1.6";
+  STATIC = false;
+  IGNORE_CASE = true;
+}
+
+PARSER_BEGIN(ExpressParser)
+package org.simantics.express.parser; 
+import org.simantics.express.ast.types.*;
+import org.simantics.express.ast.expressions.*;
+import java.util.List;
+import java.util.ArrayList;
+
+public class ExpressParser {
+}
+PARSER_END(ExpressParser)
+
+/* Lexer */
+
+SKIP:
+{ <WHITESPACE: " " | "\n" | "\r" | "\t" > 
+| <COMMENT1: "(*" (~["*"] | "*" ~[")"])* "*)" >  
+| <COMMENT2: "--" (~["\n"])* >
+}
+
+TOKEN:
+{ ";" | "(" | ")" | "\\" | "?" | "[" | "]"
+| "{" | "}" | "|" | "&" | ":" | ":=" | ":=:"
+| ":<>:" | "," | "." | "=" | "<" | ">"
+| "<=" | ">=" | "/" | "+" | "-" | "*" | "@"
+| "<*" | "<>" | "**" | "||" 
+| <ENTITY:"ENTITY"> 
+| <END_ENTITY:"END_ENTITY">
+| <SCHEMA:"SCHEMA"> 
+| <END_SCHEMA:"END_SCHEMA">
+| <CONSTANT:"CONSTANT"> 
+| <END_CONSTANT:"END_CONSTANT">
+| <FUNCTION:"FUNCTION"> 
+| <END_FUNCTION:"END_FUNCTION">
+| <PROCEDURE:"PROCEDURE"> 
+| <END_PROCEDURE:"END_PROCEDURE">
+| <RULE:"RULE"> 
+| <END_RULE:"END_RULE">
+| <TYPE:"TYPE"> 
+| <END_TYPE:"END_TYPE">
+| <SUBTYPE_CONSTRAINT:"SUBTYPE_CONSTRAINT"> 
+| <END_SUBTYPE_CONSTRAINT:"END_SUBTYPE_CONSTRAINT">
+| <LOCAL:"LOCAL"> 
+| <END_LOCAL:"END_LOCAL">
+
+| <ABSTRACT:"ABSTRACT"> 
+| <EXTENSIBLE:"EXTENSIBLE">
+| <GENERIC_ENTITY:"GENERIC_ENTITY">
+| <BASED_ON:"BASED_ON">
+| <WITH:"WITH">
+| <SUBTYPE:"SUBTYPE"> 
+| <SUPERTYPE:"SUPERTYPE"> 
+| <OF:"OF">
+| <ONEOF:"ONEOF">
+| <ANDOR:"ANDOR"> 
+| <AND:"AND"> 
+| <SELF:"SELF">
+| <USE:"USE">
+| <REFERENCE:"REFERENCE">
+| <FROM:"FROM">
+| <FOR:"FOR">
+| <DERIVE:"DERIVE">
+| <INVERSE:"INVERSE">
+| <OPTIONAL:"OPTIONAL">
+| <FIXED:"FIXED">
+| <UNIQUE:"UNIQUE">
+| <WHERE:"WHERE">
+| <LIKE:"LIKE">
+| <IN:"IN">
+| <OR:"OR">
+| <XOR:"XOR">
+| <MOD:"MOD">
+| <DIV:"DIV">
+| <QUERY:"QUERY">
+| <NOT:"NOT">
+| <AS:"AS">
+| <TRUE:"TRUE">
+| <FALSE:"FALSE">
+| <RENAMED:"RENAMED">
+
+| <STRING_:"STRING">
+| <INTEGER:"INTEGER">
+| <REAL:"REAL">
+| <NUMBER:"NUMBER">
+| <BOOLEAN:"BOOLEAN">
+| <LOGICAL:"LOGICAL">
+| <BINARY:"BINARY">
+| <BAG:"BAG">
+| <ARRAY:"ARRAY">
+| <LIST:"LIST">
+| <SET:"SET">
+| <SELECT:"SELECT">
+| <ENUMERATION:"ENUMERATION">
+| <GENERIC:"GENERIC">
+| <AGGREGATE:"AGGREGATE">
+
+| <ALIAS: "ALIAS">
+| <RETURN: "RETURN">
+| <IF: "IF">
+| <END_IF: "END_IF">
+| <THEN: "THEN">
+| <ELSE: "ELSE">
+| <REPEAT: "REPEAT">
+| <END_REPEAT: "END_REPEAT">
+| <TO: "TO">
+| <BY: "BY">
+| <WHILE: "WHILE">
+| <UNTIL: "UNTIL">
+| <CASE: "CASE">
+| <END_CASE: "END_CASE">
+| <BEGIN: "BEGIN">
+| <END: "END">
+| <ESCAPE: "ESCAPE">
+| <SKIP_: "SKIP">
+| <VAR: "VAR">
+
+| <STRING: "'" (~["'"])* "'">
+| <IDENT: ["a"-"z","A"-"Z"] (["a"-"z","A"-"Z","_","0"-"9"])* >
+| <INT: (["0"-"9"])+ >
+| <FLOAT: <INT> "." (<INT>)? (("e"|"E") ("+"|"-")?  <INT>)? >
+}
+
+/* Parser */
+
+void document() : {}
+{ (schema())* <EOF>
+}
+
+void schema() : {}
+{ <SCHEMA> <IDENT> ";" 
+	(interface_())*
+	(constDecl())?
+	(decl())*
+  <END_SCHEMA> ";"
+}
+
+void interface_() : {}
+{ <USE> <FROM> <IDENT> ( "(" references() ")" )? ";"
+| <REFERENCE> <FROM> <IDENT> ( "(" references() ")" )? ";"
+}
+
+void references() : {}
+{ reference() ("," reference())* 
+}
+
+void reference() : {}
+{ <IDENT> (<AS> <IDENT>)? 
+}
+
+void constDecl() : {}
+{ <CONSTANT> (<IDENT> ":" typeB() ":=" exp() ";")+ <END_CONSTANT> ";"
+}
+
+void decl() : {}
+{ ruleDecl()
+| decl0()
+}
+
+void ruleDecl() : {}
+{ <RULE> <IDENT> <FOR> "(" idents() ")" ";" 
+	localDecls()
+	(statement())*
+	where()
+  <END_RULE> ";"
+}
+
+void decl0() : {}
+{ entityDecl()
+| functionDecl()
+| procedureDecl()
+| typeDecl()
+| subtypeConstraintDecl()
+}
+
+void entityDecl() : {}
+{ <ENTITY> <IDENT> (supertype())? (subtype())? ";"
+	 (attributes() ":" (<OPTIONAL>)? typeB() ";")*
+	 (<DERIVE> (attribute() ":" typeB() ":=" exp() ";")+ )?
+	 (<INVERSE> (attribute() ":" typeI() <FOR> attribute() ";")+ )?
+	 (<UNIQUE> ( ( LOOKAHEAD(2) <IDENT> ":")? attributes() ";")+ )?
+	 (where())?
+  <END_ENTITY> ";"
+}
+
+void localDecls() : {}
+{ (decl0())*
+  (constDecl())?
+  (<LOCAL> ( idents() ":" typeP() (":=" exp())* ";")+ <END_LOCAL> ";")?
+}
+
+void functionDecl() : {}
+{ <FUNCTION> <IDENT> ("(" parameter() (";" parameter())* ")")? ":" typeP() ";" 
+	localDecls()
+	(statement())+
+  <END_FUNCTION> ";"
+}
+
+void procedureDecl() : {}
+{ <PROCEDURE> <IDENT> ("(" parameterP() (";" parameterP())* ")")? ";" 
+    localDecls()
+    (statement())+
+  <END_PROCEDURE> ";"
+}
+
+void typeDecl() : {}
+{ <TYPE> <IDENT> "=" typeU() ";" (where())? <END_TYPE> ";"
+}
+
+void subtypeConstraintDecl() : {}
+{ <SUBTYPE_CONSTRAINT> <IDENT> <FOR> <IDENT> ";"
+	(<ABSTRACT> <SUPERTYPE> ";")?
+	(supertypeExpression() ";")?
+  <END_SUBTYPE_CONSTRAINT> ";"
+}
+
+void where() : {}
+{ <WHERE> ( ( LOOKAHEAD(2) <IDENT> ":")? exp() ";")+
+}
+
+void parameter() : {}
+{ idents() ":" typeP()
+}
+
+void parameterP() : {}
+{ parameter()
+| <VAR> parameterP()
+}
+
+void supertype() : {}
+{ <SUPERTYPE> <OF> "(" supertypeExpression() ")"
+| <ABSTRACT> <SUPERTYPE> (<OF> "(" supertypeExpression() ")")?
+}
+
+void supertypeExpression() : {}
+{ supertypeExpression2() (<ANDOR> supertypeExpression2())*
+}
+
+void supertypeExpression2() : {}
+{ supertypeExpression3() (<AND> supertypeExpression3())*
+}
+
+void subtype() : {}
+{ <SUBTYPE> <OF> "(" idents() ")"
+}
+
+void supertypeExpression3() : {}
+{ <IDENT>
+| <ONEOF> "(" supertypeExpression() ("," supertypeExpression())* ")"
+| "(" supertypeExpression() ")"
+}
+
+void attribute() : {}
+{ <IDENT>
+| <SELF> "\\" <IDENT> "." <IDENT> (<RENAMED> <IDENT>)?
+}
+
+void attributes() : {}
+{ attribute() ("," attribute())*
+}
+
+ExpType typeBI() : {}
+{ <BOOLEAN> { return ExpBoolean.INSTANCE; }
+| <REAL> /* */ { return ExpReal.INSTANCE; }
+| <NUMBER> { return ExpNumber.INSTANCE; }
+| <BINARY> ( "(" exp1() ")")? ( <FIXED> )? { return ExpBinary.INSTANCE; }
+| <LOGICAL> { return ExpLogical.INSTANCE; }
+| <STRING_> ( "(" exp1() ")")? ( <FIXED> )? { return ExpString.INSTANCE; }
+| <INTEGER> { return ExpInteger.INSTANCE; }
+}
+
+ExpType typeB() : { ExpType type; }
+{ type=typeN() { return type; }
+| type=typeBI() { return type; }
+| type=typeA() { return type; }
+}
+
+ExpType typeA() : { ExpType type; }
+{ <BAG> bound() <OF> type=typeB() { return new ExpBag(type); }
+| <ARRAY> bound() <OF> (<OPTIONAL>)? (<UNIQUE>)? type=typeB() { return new ExpArray(type); }
+| <LIST> bound() <OF> (<UNIQUE>)? type=typeB() { return new ExpList(type); }
+| <SET> bound() <OF> type=typeB() { return new ExpSet(type); }
+}
+
+ExpType typeI() : { ExpType type; }
+{ type=typeN() { return type; }
+| <BAG> bound() <OF> type=typeN() { return new ExpBag(type); }
+| <SET> bound() <OF> type=typeN() { return new ExpSet(type); }
+}
+
+ExpType typeN() : { Token tt; }
+{ tt=<IDENT> { return new ExpTypeName(tt.image); }
+}
+
+ExpType typeP() : { ExpType type; }
+{ type=typeBI() { return type; } 
+| type=typeN(){ return type; }
+| <BAG> bound() <OF> type=typeP() { return new ExpBag(type); }
+| <ARRAY> bound() <OF> (<OPTIONAL>)? (<UNIQUE>)? type=typeP() { return new ExpArray(type); }
+| <LIST> bound() <OF> (<UNIQUE>)? type=typeP() { return new ExpList(type); }
+| <SET> bound() <OF> type=typeP() { return new ExpSet(type); }
+| <GENERIC> (":" <IDENT>)?  { return ExpGeneric.INSTANCE; }
+| <GENERIC_ENTITY> { return ExpGenericEntity.INSTANCE; }
+| <AGGREGATE> (":" <IDENT>)? <OF> type=typeP() { return new ExpAggregate(type); }
+}
+
+ExpType typeU() : {}
+{ { ExpType type; } type=typeB() { return type; }
+| LOOKAHEAD(3) (<EXTENSIBLE>)? (<GENERIC_ENTITY>)? <SELECT> 
+    (<BASED_ON> <IDENT> (<WITH> "(" idents() ")")?
+    | "(" idents() ")"
+    )? { return new ExpSelect(); }
+| LOOKAHEAD(3) (<EXTENSIBLE>)? (<GENERIC_ENTITY>)? <ENUMERATION> 
+    (<BASED_ON> <IDENT> (<WITH> "(" idents() ")")?
+    | <OF> "(" idents() ")"
+    )? { return new ExpEnumeration(); }
+}
+
+void bound() : {}
+{ ("[" exp1() ":" exp1() "]")?
+}
+
+ExpExpression exp() : { ExpExpression exp; }
+{ exp=exp1() 
+	( {ExpExpression exp2; String op;} op=op0() exp2=exp1() 
+	    { exp = new ExpBinaryExpression(exp, op, exp2); } )? 
+	{ return exp; }
+}
+
+String op0() : {}
+{ ">" { return ">"; }
+| "<" { return "<"; } 
+| ">=" { return ">="; }
+| "<=" { return "<="; }
+| ":=:" { return ":=:"; } 
+| ":<>:" { return ":<>:"; }
+| "=" { return "="; }
+| "<>" { return "<>"; }
+| <LIKE> { return "like"; } 
+| <IN> { return "in"; }
+}
+
+ExpExpression exp1() : { ExpExpression exp; }
+{ exp=exp2() 
+	( {ExpExpression exp2; String op;} op=op1() exp2=exp2()
+	   { exp = new ExpBinaryExpression(exp, op, exp2); }
+	)* 
+	{ return exp; }
+}
+
+String op1() : {}
+{ <OR> { return "or"; }
+| <XOR> { return "xor"; }
+| "+" { return "+"; }
+| "-" { return "-"; }
+}
+
+ExpExpression exp2() : { ExpExpression exp; }
+{ exp=exp3() 
+    ( {ExpExpression exp2; String op;} op=op2() exp2=exp3()
+       { exp = new ExpBinaryExpression(exp, op, exp2); }
+    )* 
+    { return exp; }
+}
+
+String op2() : {}
+{ <AND> { return "and"; }
+| <MOD> { return "mod"; }
+| <DIV> { return "div"; }
+| "*" { return "*"; }
+| "/" { return "/"; }
+| "||" { return "||"; }
+}
+
+ExpExpression exp3() : { ExpExpression exp; }
+{ exp=exp4() 
+    ( {ExpExpression exp2;} "**" exp2=exp4()
+       { exp = new ExpBinaryExpression(exp, "**", exp2); }
+    )* 
+    { return exp; }
+}
+
+ExpExpression exp4() : { ExpExpression exp; }
+{ "[" (exp() (":" exp())? ("," exp() (":" exp())?)* )? "]"   { return null; }
+| <QUERY> "(" <IDENT> "<*" exp1() "|" exp() ")" { return null; }
+| "{" exp1() ("<" | "<=") exp1() ("<" | "<=") exp1() "}" { return null; }
+| "+" exp=exp5() { return new ExpUnaryExpression(exp, "+"); }
+| "-" exp=exp5() { return new ExpUnaryExpression(exp, "-"); }
+| <NOT> exp=exp5() { return new ExpUnaryExpression(exp, "not"); }
+| exp=exp5() { return exp; }
+}
+
+ExpExpression exp5() : { Token tt; ExpExpression exp; }
+{ tt=<INT> { return new ExpIntegerLiteral(tt.image); }  
+| "(" exp=exp() ")" { return exp; }
+| "?" { return ExpQuestionMark.INSTANCE; }
+| <SELF> exp=quals(ExpQuestionMark.INSTANCE) { return exp; }
+| <IDENT> ("(" (exp() ("," exp())*)? ")")? quals(null) { return null; }
+| tt=<STRING> { return new ExpStringLiteral(tt.image.substring(1, tt.image.length()-1)); }  
+| tt=<FLOAT> { return new ExpFloatLiteral(tt.image); }  
+| <TRUE> { return ExpBooleanLiteral.TRUE; }  
+| <FALSE> { return ExpBooleanLiteral.FALSE; } 
+/* ... */
+}
+
+ExpExpression quals(ExpExpression base) : {}
+{ ( "." <IDENT>
+  | "\\" <IDENT>
+  | "[" exp() (":" exp1())? "]" 
+  )* { return base; }
+}
+
+void statement() : {}
+{ <RETURN> (exp1())? ";"
+| <IF> exp() <THEN> (statement())+ (<ELSE> (statement())+)? <END_IF> ";"
+| LOOKAHEAD(2) <IDENT> quals(null) ":=" exp() ";"
+| <REPEAT> 
+   (<IDENT> ":=" exp1() <TO> exp1() (<BY> exp2())?)?
+   (<WHILE> exp())?
+   (<UNTIL> exp())? ";" 
+   (statement())+ <END_REPEAT> ";"
+| <CASE> exp() <OF> ( exp() ("," exp())* ":" statement() )* <END_CASE> ";"
+| <BEGIN> (statement())+ <END> ";"
+| <ESCAPE> ";"
+| <SKIP_> ";"
+| LOOKAHEAD(2) <IDENT> "(" (exp() ("," exp())*)? ")" ";"
+| ";"
+/* | ... */
+}
+
+String[] idents() : { List<String> idents = new ArrayList<String>(2); Token tt; } 
+{ tt=<IDENT> { idents.add(tt.image); } ("," tt=<IDENT> { idents.add(tt.image); })* 
+	{ return idents.toArray(new String[idents.size()]); }
+}
\ No newline at end of file
-- 
2.45.2