From f5b8a3d0b68ab33a78235c5dfa84fc1d45f6271e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hannu=20Niemist=C3=B6?= <hannu.niemisto@semantum.fi>
Date: Mon, 24 Apr 2017 18:24:17 +0300
Subject: [PATCH] (refs #6924) Support for record field access syntax.

Because the record field access syntax is harder to implement when the
old Variable access syntax is also supported, this feature is only
enabled (and Variable disabled), when the following module header is
used:

module {
    fields
}

This change contains also refactoring and cleaning up of code
related to variable resolving and field handling.

Change-Id: I8e877573131d501e1a6e63bdde39e064df9ded39
---
 .../compilation/CompilationContext.java       |   2 +
 .../scl/compiler/compilation/Elaboration.java |  31 ++
 .../compilation/EnvironmentOfModule.java      |  17 +
 .../compilation/NamespaceOfModule.java        |   3 +-
 .../scl/compiler/compilation/SCLCompiler.java |   4 +-
 .../constants/singletons/SafeCoerce.java      |  25 ++
 .../contexts/TranslationContext.java          | 310 ++++++++----------
 .../elaboration/expressions/EBinary.java      |   2 +-
 .../expressions/EEntityTypeAnnotation.java    | 120 -------
 .../elaboration/expressions/EFieldAccess.java | 155 +++++----
 .../elaboration/expressions/EVar.java         |   2 +-
 .../expressions/ExpressionTransformer.java    |   1 -
 .../StandardExpressionTransformer.java        |  18 +-
 .../StandardExpressionVisitor.java            |   4 +-
 .../accessor/ExpressionAccessor.java          |   3 +-
 .../expressions/accessor/FieldAccessor.java   |   4 +
 .../expressions/accessor/IdAccessor.java      |   3 +-
 .../expressions/accessor/StringAccessor.java  |   3 +-
 .../elaboration/query/pre/QPreGuard.java      |   8 -
 .../environment/ConcreteEnvironment.java      |  24 ++
 .../scl/compiler/environment/Environment.java |   3 +
 .../scl/compiler/environment/Namespace.java   |   2 +
 .../compiler/environment/NamespaceImpl.java   |   4 +-
 .../profiling/BranchPointInjector.java        |   7 -
 .../internal/header/ModuleHeader.java         |   4 +
 .../internal/parsing/parser/SCL.grammar       |   1 -
 .../internal/parsing/parser/SCLParser.dat     | Bin 23580 -> 23546 bytes
 .../internal/parsing/parser/SCLParser.java    | 276 ++++++++--------
 .../parsing/parser/SCLParserImpl.java         |  27 +-
 .../internal/parsing/parser/SCLTerminals.java |  62 ++--
 .../scl/compiler/module/ConcreteModule.java   |  15 +
 .../scl/compiler/module/LazyModule.java       |   7 +
 .../simantics/scl/compiler/module/Module.java |   2 +
 .../scl/compiler/runtime/RuntimeModule.java   |   6 +
 .../compiler/tests/ModuleRegressionTests.java |   2 +-
 .../compiler/tests/scl/InvalidPattern3.scl    |   2 +-
 .../scl/compiler/tests/scl/Record2.scl        |  15 +
 .../compiler/tests/scl/RecursiveValues2.scl   |   2 +-
 .../scl/compiler/tests/scl/Select3.scl        |  18 -
 .../compiler/tests/scl/UnresolvedVariable.scl |   2 +-
 .../tests/scl/UnresolvedVariable2.scl         |   2 +-
 41 files changed, 575 insertions(+), 623 deletions(-)
 create mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/singletons/SafeCoerce.java
 delete mode 100644 bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEntityTypeAnnotation.java
 create mode 100644 tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Record2.scl
 delete mode 100644 tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Select3.scl

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationContext.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationContext.java
index 397e1ce4f..411b93fe2 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationContext.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/CompilationContext.java
@@ -11,6 +11,7 @@ import org.simantics.scl.compiler.errors.ErrorLog;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.codegen.types.JavaTypeTranslator;
 import org.simantics.scl.compiler.internal.codegen.utils.JavaNamingPolicy;
+import org.simantics.scl.compiler.internal.header.ModuleHeader;
 import org.simantics.scl.compiler.module.ConcreteModule;
 import org.simantics.scl.compiler.types.Type;
 
@@ -22,6 +23,7 @@ public class CompilationContext implements EnvironmentalContext {
     public JavaTypeTranslator javaTypeTranslator;
     public JavaNamingPolicy namingPolicy;
     public ConcreteModule module;
+    public ModuleHeader header;
     
     private THashMap<Name, SCLValue> valueCache = new THashMap<Name, SCLValue>();
 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
index c36564eda..9dbd94691 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
@@ -7,6 +7,7 @@ import java.util.List;
 import org.cojen.classfile.TypeDesc;
 import org.simantics.scl.compiler.common.datatypes.Constructor;
 import org.simantics.scl.compiler.common.names.Name;
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.constants.JavaTypeInstanceConstructor;
 import org.simantics.scl.compiler.constants.SCLConstructor;
 import org.simantics.scl.compiler.constants.StringConstant;
@@ -14,12 +15,14 @@ import org.simantics.scl.compiler.constants.generic.CallJava;
 import org.simantics.scl.compiler.constants.generic.ClassRef;
 import org.simantics.scl.compiler.constants.generic.ConvertToListFilter;
 import org.simantics.scl.compiler.constants.generic.MethodRef;
+import org.simantics.scl.compiler.constants.generic.MethodRef.FieldRef;
 import org.simantics.scl.compiler.constants.generic.OutputFilter;
 import org.simantics.scl.compiler.constants.generic.ParameterStackItem;
 import org.simantics.scl.compiler.constants.generic.Pop2OutputFilter;
 import org.simantics.scl.compiler.constants.generic.PopOutputFilter;
 import org.simantics.scl.compiler.constants.generic.StackItem;
 import org.simantics.scl.compiler.constants.generic.ThreadLocalStackItem;
+import org.simantics.scl.compiler.constants.singletons.SafeCoerce;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TypeTranslationContext;
 import org.simantics.scl.compiler.elaboration.errors.NotPatternException;
@@ -316,6 +319,7 @@ public class Elaboration {
     }
     
     public void processDataTypes(ArrayList<DDataAst> dataTypesAst) {
+        ArrayList<Runnable> fieldAccessorGenerators = new ArrayList<Runnable>(); 
         for(DDataAst dataTypeAst : dataTypesAst) {
             TypeTranslationContext context = createTypeTranslationContext();
             TVar[] typeParameters = new TVar[dataTypeAst.parameters.length];
@@ -395,7 +399,34 @@ public class Elaboration {
                 constructors[j].fieldNames = fieldNames;
                 constructors[j].recordFieldNames = constructor.fieldNames;
             }
+            if(constructors.length == 1) {
+                Constructor constructor = constructors[0];
+                if(constructor.recordFieldNames != null) {
+                    fieldAccessorGenerators.add(new Runnable() {
+                        @Override
+                        public void run() {
+                            Type in = Types.apply(dataType.name, dataType.parameters);
+                            for(int i=0;i<constructor.recordFieldNames.length;++i) {
+                                Type out = constructor.parameterTypes[i];
+                                Constant accessor;
+                                if(trivialDataType)
+                                    accessor = new SafeCoerce(dataType.parameters, in, out);
+                                else
+                                    accessor = new CallJava(dataType.parameters, Types.NO_EFFECTS, out,
+                                            new Type[] {in}, new StackItem[] {new ParameterStackItem(0, in)},
+                                            new FieldRef(constructor.javaName, constructor.fieldNames != null ? constructor.fieldNames[i] : "c" + i,
+                                                    javaTypeTranslator.toTypeDesc(out)),
+                                            null);
+                                module.addFieldAccessor(constructor.recordFieldNames[i], accessor);
+                            }
+                        }
+                    });
+                }
+            }
         }
+        
+        for(Runnable fieldAccessorGenerator : fieldAccessorGenerators)
+            fieldAccessorGenerator.run();
     }
     
     public void processTypeClasses(ArrayList<ProcessedDClassAst> typeClassesAst) {
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/EnvironmentOfModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/EnvironmentOfModule.java
index 0b4d03a04..fd70d368d 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/EnvironmentOfModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/EnvironmentOfModule.java
@@ -2,8 +2,10 @@ package org.simantics.scl.compiler.compilation;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.simantics.scl.compiler.common.names.Name;
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeClassInstance;
@@ -40,6 +42,21 @@ public class EnvironmentOfModule implements Environment {
         else
             return base.getValue(name);
     }
+    
+    @Override
+    public List<Constant> getFieldAccessors(String name) {
+        List<Constant> r1 = base.getFieldAccessors(name);
+        List<Constant> r2 = module.getFieldAccessors(name);
+        if(r1 == null)
+            return r2;
+        if(r2 == null)
+            return r1;
+        ArrayList<Constant> result = new ArrayList<Constant>(r1.size() + r2.size());
+        result.addAll(r1);
+        result.addAll(r2);
+        return result;
+    }
+    
     @Override
     public SCLRelation getRelation(Name name) {
         if(name.module.equals(module.getName()))
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java
index c010835e9..77e6e96df 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/NamespaceOfModule.java
@@ -5,7 +5,6 @@ import java.util.function.Consumer;
 
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
-import org.simantics.scl.compiler.elaboration.modules.TypeConstructor;
 import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;
 import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;
 import org.simantics.scl.compiler.elaboration.relations.SCLRelation;
@@ -64,7 +63,7 @@ public class NamespaceOfModule implements Namespace {
             return base.getValue(name);
         }
     }
-
+    
     @Override
     public SCLRelation getRelation(String name) throws AmbiguousNameException {
         SCLRelation relation = module.getRelation(name);
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/SCLCompiler.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/SCLCompiler.java
index 65e89edf1..643513d67 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/SCLCompiler.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/SCLCompiler.java
@@ -7,7 +7,6 @@ import java.util.Map;
 
 import org.simantics.scl.compiler.environment.EnvironmentFactory;
 import org.simantics.scl.compiler.errors.ErrorLog;
-import org.simantics.scl.compiler.internal.codegen.types.JavaReferenceValidator;
 import org.simantics.scl.compiler.internal.codegen.types.JavaReferenceValidatorFactory;
 import org.simantics.scl.compiler.internal.header.ModuleHeader;
 import org.simantics.scl.compiler.internal.parsing.declarations.DeclarationAst;
@@ -71,11 +70,12 @@ public class SCLCompiler {
             String moduleName) {
         try {
             if(hasErrors()) return;
+            compilationContext.header = ModuleHeader.process(compilationContext.errorLog, declarations.moduleHeader);
             Elaboration elaboration = new Elaboration(compilationContext,
                     timer,
                     localEnvironmentFactory,
                     moduleName,
-                    ModuleHeader.process(compilationContext.errorLog, declarations.moduleHeader),
+                    compilationContext.header,
                     declarations.importsAst,
                     jrvFactory,
                     declarations.valueDefinitionsAst,
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/singletons/SafeCoerce.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/singletons/SafeCoerce.java
new file mode 100644
index 000000000..8d5b00dde
--- /dev/null
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/singletons/SafeCoerce.java
@@ -0,0 +1,25 @@
+package org.simantics.scl.compiler.constants.singletons;
+
+import org.simantics.scl.compiler.constants.FunctionValue;
+import org.simantics.scl.compiler.internal.codegen.references.Val;
+import org.simantics.scl.compiler.internal.codegen.utils.MethodBuilder;
+import org.simantics.scl.compiler.types.TVar;
+import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.Types;
+
+public class SafeCoerce extends FunctionValue {    
+    public SafeCoerce(TVar[] vars, Type in, Type out) {
+        super(vars, Types.NO_EFFECTS, out, in);
+    }
+    
+    @Override
+    public Type applyExact(MethodBuilder mb, Val[] parameters) {
+        parameters[0].push(mb);
+        return getReturnType();
+    }
+
+    @Override
+    public String toString() {
+        return "safeCoerce";
+    }
+}
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
index e5b5720ef..203bd81d2 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/contexts/TranslationContext.java
@@ -12,7 +12,6 @@ import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint;
 import org.simantics.scl.compiler.elaboration.expressions.Case;
 import org.simantics.scl.compiler.elaboration.expressions.EAmbiguous;
 import org.simantics.scl.compiler.elaboration.expressions.EConstant;
-import org.simantics.scl.compiler.elaboration.expressions.EEntityTypeAnnotation;
 import org.simantics.scl.compiler.elaboration.expressions.EError;
 import org.simantics.scl.compiler.elaboration.expressions.EFieldAccess;
 import org.simantics.scl.compiler.elaboration.expressions.ELambda;
@@ -52,7 +51,6 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
     ArrayList<ArrayList<Variable>> blanksInExistentialFrame = new ArrayList<ArrayList<Variable>>();
     SCLValue bindFunction;
     
-    public EEntityTypeAnnotation currentEntityTypeAnnotation;
     public PreQuery currentPreQuery;
     
     THashMap<String, SCLRelation> relations = new THashMap<String, SCLRelation>();
@@ -131,130 +129,91 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
                 return new EVariable(variable);
             }
             break;
-        case '#':
-            if(name.length() > 1 && Character.isLetter(name.charAt(1))) {
-                if(currentEntityTypeAnnotation == null) {
-                    errorLog.log(location, "Attribute references cannot be made in this context.");
-                    return new EError(location);
-                }
-                return currentEntityTypeAnnotation.resolveAttribute(this, location, name.substring(1));
-            }
-            break;
         }
         return null;
     }
     
-    private FieldAccessor createFieldAccessor(char accessSeparator, String name) {
-        IdAccessor accessor = new IdAccessor(name);
-        accessor.accessSeparator = accessSeparator;
-        return accessor;
-    }
-    
     private Expression resolveFieldAccess(Expression base, int pos, String name) {
-        ArrayList<FieldAccessor> accessors = new ArrayList<FieldAccessor>(2);
         while(pos != -1) {
             int p = findSeparator(name, pos+1);
-            accessors.add(createFieldAccessor(
+            FieldAccessor accessor = new IdAccessor(
                     name.charAt(pos),
-                    name.substring(pos+1, p==-1 ? name.length() : p-1)));
+                    name.substring(pos+1, p==-1 ? name.length() : p-1));
+            base = new EFieldAccess(base, accessor);
             pos = p;
         }
-        return new EFieldAccess(base,
-                accessors.toArray(new FieldAccessor[accessors.size()]));
+        return base;
     }
     
-    private Expression resolveIn(long location, Namespace namespace, String name) {
-        SCLValue value;
-        try {
-            value = resolveValueIn(location, namespace, name);
-        } catch (AmbiguousNameException e) {
-            if(SCLCompilerConfiguration.ALLOW_OVERLOADING) {
-                EAmbiguous.Alternative[] alternatives = new EAmbiguous.Alternative[e.conflictingModules.length];
-                //System.out.println("Overloading:");
-                for(int i=0;i<e.conflictingModules.length;++i) {
-                    Name altName = Name.create(e.conflictingModules[i], e.name);
-                    //System.out.println("    " + altName);
-                    SCLValue altValue = environment.getValue(altName);
-                    alternatives[i] = new EAmbiguous.Alternative() {
-                        @Override
-                        public Type getType() {
-                            return altValue.getType();
-                        }
-    
-                        @Override
-                        public Expression realize() {
-                            EConstant expression = new EConstant(altValue);
-                            expression.location = location;
-                            return expression;
-                        }
-                        
-                        @Override
-                        public String toString() {
-                            return altValue.getName().toString().replace('/', '.');
-                        }
-                    };
-                }
-                EAmbiguous expression = new EAmbiguous(alternatives);
-                expression.location = location;
-                return expression;
-            }
-            else {
-                errorLog.log(location, e.getMessage());
-                value = null;
-            }
+    private static int findSeparator(String name, int fromIndex) {
+        ++fromIndex; // the first character (that can be #) is never a separator
+        while(fromIndex < name.length()) {
+            char c = name.charAt(fromIndex);
+            if(c == '.' || c == '#')
+                return fromIndex;
+            ++fromIndex;
         }
-        if(value == null)
-            return new EError(location);
-        String deprecatedDescription = value.isDeprecated();
-        if(deprecatedDescription != null)
-            errorLog.logWarning(location, "Deprecated value " + value.getName().name + "." + (deprecatedDescription.isEmpty() ? "" : " " + deprecatedDescription));
-        return new EConstant(location, value);
+        return -1;
     }
     
-    private Expression resolveComplexNameIn(long location, Namespace namespace, int startPos, String name) {
-        int pos = name.length();
-        {
-            int hashPos = name.lastIndexOf('#');
-            if(hashPos >= 0)
-                pos = hashPos;
-        }
-        while(pos > startPos) {
-            SCLValue value;
-            try {
-                value = namespace.getValue(name.substring(startPos, pos));
-            } catch (AmbiguousNameException e) {
+    public Expression resolveValue(long location, Namespace namespace, String name) {
+        try {
+            SCLValue value = namespace.getValue(name);
+            if(value == null)
+                return null;
+            String deprecatedDescription = value.isDeprecated();
+            if(deprecatedDescription != null)
+                errorLog.logWarning(location, "Deprecated value " + value.getName().name + "." + (deprecatedDescription.isEmpty() ? "" : " " + deprecatedDescription));
+            return new EConstant(location, value);
+        } catch (AmbiguousNameException e) {
+            if(SCLCompilerConfiguration.ALLOW_OVERLOADING)
+            	return resolveAmbigious(location, e.conflictingModules, name);
+            else {
                 errorLog.log(location, e.getMessage());
                 return new EError(location);
             }
-            if(value != null) {
-                Expression result = new EConstant(location, value);
-                if(pos < name.length())
-                    result = resolveFieldAccess(result, pos, name);
-                return result;
-            }
-            pos = name.lastIndexOf('.', pos-1);
         }
-        errorLog.log(location, "Couldn't resolve variable " + name + ".");
-        return new EError(location);
     }
     
-    private static int findSeparator(String name, int fromIndex) {
-        while(fromIndex < name.length()) {
-            char c = name.charAt(fromIndex);
-            if(c == '.' || c == '#')
-                return fromIndex;
-            ++fromIndex;
+    private Expression resolveAmbigious(long location, String[] conflictingModules, String name) {
+        EAmbiguous.Alternative[] alternatives = new EAmbiguous.Alternative[conflictingModules.length];
+        for(int i=0;i<conflictingModules.length;++i) {
+            Name altName = Name.create(conflictingModules[i], name);
+            SCLValue altValue = environment.getValue(altName);
+            alternatives[i] = new EAmbiguous.Alternative() {
+                @Override
+                public Type getType() {
+                    return altValue.getType();
+                }
+
+                @Override
+                public Expression realize() {
+                    EConstant expression = new EConstant(altValue);
+                    expression.location = location;
+                    return expression;
+                }
+
+                @Override
+                public String toString() {
+                    return altValue.getName().toString().replace('/', '.');
+                }
+            };
         }
-        return -1;
+        EAmbiguous expression = new EAmbiguous(alternatives);
+        expression.location = location;
+        return expression;
     }
     
-    public Expression resolveExpression(long location, String name) {
-        int p = findSeparator(name, 1 /* Initial # is not a separator */);
-        if(p == -1) {
-            Expression result = resolveLocalVariable(location, name);
+    public Expression resolveVariable(long location, Namespace namespace, String name, int begin) {
+        int end = findSeparator(name, begin);
+        String part = end == -1 ? (begin == 0 ? name : name.substring(begin)) : name.substring(begin, end);
+
+        if(begin == 0) {
+            Expression result = resolveLocalVariable(location, part);
             if(result != null)
-                return result;
+                return end == -1 ? result : resolveFieldAccess(result, end, name);
             
+            // FIXME.. support for records
             if(localEnvironment != null) {
                 result = localEnvironment.resolve(environment, name);
                 if(result != null) {
@@ -262,39 +221,82 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
                     return result;
                 }
             }
-            
-            return resolveIn(location, environment.getLocalNamespace(), name);
         }
-        else {
-            if(localEnvironment != null) {
-                Expression result = localEnvironment.resolve(environment, name);
-                if(result != null) {
-                    result.setLocationDeep(location);
-                    return result;
+        if(end != -1 && name.charAt(end) == '.') {
+            Namespace childNamespace = namespace.getNamespace(part);
+            if(childNamespace != null)
+                return resolveVariable(location, childNamespace, name, end+1);
+        }
+        {
+            Expression result = null;
+            if(end != -1) {
+                for(int end2 = name.length();end2 > end;end2 = name.lastIndexOf('.', end2-1)) {
+                    part = name.substring(begin, end2);
+                    result = resolveValue(location, namespace, part);
+                    if(result != null) {
+                        end = end2 == name.length() ? -1 : end2;
+                        break;
+                    }
                 }
             }
-            
-            String prefix = name.substring(0, p);
-            Expression result = resolveLocalVariable(location, prefix);
+            if(result == null)
+                result = resolveValue(location, namespace, part);
             if(result != null)
-                return resolveFieldAccess(result, p, name);
-            
-            Namespace namespace = environment.getLocalNamespace();
-            int pos = 0;
-            while(name.charAt(p)=='.') {
-                Namespace temp = namespace.getNamespace(prefix);
-                if(temp == null)
-                    break;
-                namespace = temp;
-                pos = p+1;
-                p = findSeparator(name, pos);
-                if(p < 0)
-                    return resolveIn(location, namespace, name.substring(pos));
-                prefix = name.substring(pos, p);
+                return end == -1 ? result : resolveFieldAccess(result, end, name);
+        }
+        reportResolveFailure(location, namespace, part);
+        return new EError(location);
+    }
+    
+    private void reportResolveFailure(long location, Namespace namespace, String name) {
+        StringBuilder message = new StringBuilder();
+        message.append("Couldn't resolve ").append(name).append(".");
+
+        final THashSet<String> candidateNames = new THashSet<String>(4);
+        namespace.findValuesForPrefix("", AcceptAllNamespaceFilter.INSTANCE,
+                new TObjectProcedure<SCLValue>() {
+            @Override
+            public boolean execute(SCLValue value) {
+                if(value == null) {
+                    new Exception().printStackTrace();
+                    return true;
+                }
+                String valueName = value.getName().name;
+                if(name.equalsIgnoreCase(valueName))
+                    candidateNames.add(valueName);
+                return true;
             }
-            
-            return resolveComplexNameIn(location, namespace, pos, name);
+        });
+        if(localEnvironment != null)
+            localEnvironment.forNames(new TObjectProcedure<String>() {
+                @Override
+                public boolean execute(String valueName) {
+                    if(name.equalsIgnoreCase(valueName))
+                        candidateNames.add(valueName);
+                    return true;
+                }
+            });
+
+        if(candidateNames.size() > 0) {
+            message.append(" Did you mean ");
+            String[] ns = candidateNames.toArray(new String[candidateNames.size()]);
+            Arrays.sort(ns);
+            for(int i=0;i<ns.length;++i) {
+                if(i > 0) {
+                    message.append(", ");
+                    if(i == ns.length-1)
+                        message.append("or ");
+                }
+                message.append(ns[i]);
+            }
+            message.append('?');
         }
+
+        errorLog.log(location, message.toString());
+    }
+    
+    public Expression resolveVariable(long location, String name) {
+        return resolveVariable(location, environment.getLocalNamespace(), name, 0);
     }
     
     public Expression resolvePattern(EVar name) {
@@ -308,7 +310,7 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
             return new EVariable(name.location, newVariable(name.name));
         }
         else 
-            return resolveExpression(name.location, name.name);
+            return resolveVariable(name.location, name.name);
     }
 
     /**
@@ -422,58 +424,6 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
         else
             return prec;
     }
-
-    private SCLValue resolveValueIn(long location, Namespace namespace, final String name) throws AmbiguousNameException {
-        SCLValue value = namespace.getValue(name);
-        if(value == null) {
-            StringBuilder message = new StringBuilder();
-            message.append("Couldn't resolve variable ").append(name).append(".");
-
-            final THashSet<String> candidateNames = new THashSet<String>(4);
-            namespace.findValuesForPrefix("", AcceptAllNamespaceFilter.INSTANCE,
-                    new TObjectProcedure<SCLValue>() {
-                @Override
-                public boolean execute(SCLValue value) {
-                    if(value == null) {
-                        new Exception().printStackTrace();
-                        return true;
-                    }
-                    String valueName = value.getName().name;
-                    if(name.equalsIgnoreCase(valueName))
-                        candidateNames.add(valueName);
-                    return true;
-                }
-            });
-            if(localEnvironment != null)
-                localEnvironment.forNames(new TObjectProcedure<String>() {
-                    @Override
-                    public boolean execute(String valueName) {
-                        if(name.equalsIgnoreCase(valueName))
-                            candidateNames.add(valueName);
-                        return true;
-                    }
-                });
-
-            if(candidateNames.size() > 0) {
-                message.append(" Did you mean ");
-                String[] ns = candidateNames.toArray(new String[candidateNames.size()]);
-                Arrays.sort(ns);
-                for(int i=0;i<ns.length;++i) {
-                    if(i > 0) {
-                        message.append(", ");
-                        if(i == ns.length-1)
-                            message.append("or ");
-                    }
-                    message.append(ns[i]);
-                }
-                message.append('?');
-            }
-
-            errorLog.log(location, message.toString());
-            return null;
-        }
-        return value;
-    }
     
     public Case translateCase(Expression lhs, Expression rhs) {        
         ArrayList<Expression> parameters = new ArrayList<Expression>(4);  
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java
index 465c5c8ff..8e836d002 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java
@@ -57,7 +57,7 @@ public class EBinary extends ASTExpression {
         output.add(left);
         for(EBinaryRightSide right : rights) {
             // Read op
-            Expression op = context.resolveExpression(right.operator.location, right.operator.name);
+            Expression op = context.resolveVariable(right.operator.location, right.operator.name);
             if(op == null)
                 return new EError(location);
             Precedence opPrec = op.getPrecedence();
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEntityTypeAnnotation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEntityTypeAnnotation.java
deleted file mode 100644
index f0363dcdf..000000000
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EEntityTypeAnnotation.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import static org.simantics.scl.compiler.elaboration.expressions.Expressions.loc;
-
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.java.EqRelation;
-import org.simantics.scl.compiler.elaboration.query.QAtom;
-import org.simantics.scl.compiler.elaboration.query.Query;
-import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;
-import org.simantics.scl.compiler.elaboration.relations.SCLEntityType.Attribute;
-import org.simantics.scl.compiler.elaboration.relations.SCLEntityType.AttributeBinding;
-import org.simantics.scl.compiler.environment.AmbiguousNameException;
-import org.simantics.scl.compiler.environment.Environments;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.parsing.Token;
-
-import gnu.trove.map.hash.THashMap;
-
-public class EEntityTypeAnnotation extends ASTExpression {
-    
-    Expression expression;
-    Token entityTypeName;
-    SCLEntityType entityType;
-    Query query; // optional
-    THashMap<String, AttributeBinding> attributeBindingMap;
-
-    public EEntityTypeAnnotation(Expression expression, Token entityTypeName,
-            Query query) {
-        this.expression = expression;
-        this.entityTypeName = entityTypeName;
-        this.query = query;
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        // Resolve a subexpression
-        expression = expression.resolve(context);
-        
-        // Check that we are inside a query
-        if(context.currentPreQuery == null) {
-            context.getErrorLog().log(location, "Entity type annotations can be used only in queries.");
-            return new EError(location);
-        }
-        
-        // Resolve entity type
-        try {
-            entityType = Environments.getEntityType(context.getEnvironment(), entityTypeName.text);
-        } catch (AmbiguousNameException e) {
-            context.getErrorLog().log(location, e.getMessage());
-            return new EError(location);
-        }
-        if(entityType == null) {
-            context.getErrorLog().log(location, "Couldn't resolve entity type " + entityTypeName.text + ".");
-            return new EError(location);
-        }
-
-        // Rewrite the subexpression as a separate query if it is not a variable
-        Variable base;
-        if(expression instanceof EVariable)
-            base = ((EVariable)expression).variable;
-        else {
-            base = new Variable("?" + entityTypeName.text);
-            context.currentPreQuery.extraVariables.add(base);
-            context.currentPreQuery.sideQueries.add(loc(expression.location,
-                    new QAtom(EqRelation.INSTANCE, new EVariable(base), expression)));
-            expression = loc(expression.location, new EVariable(base));
-        }
-        
-        // Resolve a related query if it exists
-        if(query != null) {
-            EEntityTypeAnnotation oldEntityTypeAnnotation = context.currentEntityTypeAnnotation;
-            attributeBindingMap = new THashMap<String, AttributeBinding>();
-            context.currentEntityTypeAnnotation = this;
-            query = query.resolve(context);
-            context.currentPreQuery.sideQueries.add(query);
-            context.currentEntityTypeAnnotation = oldEntityTypeAnnotation;
-            AttributeBinding[] attributeBindings;
-            if(attributeBindingMap.isEmpty())
-                attributeBindings = AttributeBinding.EMPTY_ARRAY;
-            else {
-                attributeBindings = attributeBindingMap.values().toArray(new AttributeBinding[attributeBindingMap.size()]);
-                for(AttributeBinding binding : attributeBindings)
-                    context.currentPreQuery.extraVariables.add(binding.variable);
-            }
-            context.currentPreQuery.sideQueries.add(entityType.generateQuery(context, base, attributeBindings));
-        }
-        else
-            context.currentPreQuery.sideQueries.add(entityType.generateQuery(context, base, AttributeBinding.EMPTY_ARRAY));
-        return expression;
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            expression.setLocationDeep(loc);
-            query.setLocationDeep(loc);
-        }
-    }
-
-    public Expression resolveAttribute(TranslationContext context, long location, String name) {
-        AttributeBinding binding = attributeBindingMap.get(name);
-        if(binding == null) {
-            Attribute attribute = entityType.getAttribute(name);
-            if(attribute == null) {
-                context.getErrorLog().log(location, "Attribute " + name + " is not defined in entity type " + entityTypeName.text + ".");
-                return new EError(location);
-            }
-            binding = new AttributeBinding(attribute, new Variable("#"+name));
-            attributeBindingMap.put(name, binding);
-        }
-        return new EVariable(binding.variable);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
index 4ebd0248d..c05b15409 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EFieldAccess.java
@@ -1,12 +1,18 @@
 package org.simantics.scl.compiler.elaboration.expressions;
 
+import java.util.List;
+
 import org.simantics.scl.compiler.common.names.Names;
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.elaboration.expressions.EAmbiguous.Alternative;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor;
+import org.simantics.scl.compiler.elaboration.expressions.accessor.IdAccessor;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
+import org.simantics.scl.compiler.internal.header.ModuleHeader;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
@@ -20,37 +26,32 @@ public class EFieldAccess extends SimplifiableExpression {
     private static final Type VARIABLE = Types.con("Simantics/Variables", "Variable");
     
     Expression parent;
-    FieldAccessor[] accessors;
+    FieldAccessor accessor;
+    boolean lastAccessor = true;
 
-    public EFieldAccess(Expression parent, FieldAccessor[] accessors) {
-        if(parent instanceof EFieldAccess) {
-            EFieldAccess parentAccess = (EFieldAccess)parent;
-            parent = parentAccess.parent;
-            accessors = concat(parentAccess.accessors, accessors);
-        }
+    public EFieldAccess(Expression parent, FieldAccessor accessor) {
         this.parent = parent;
-        this.accessors = accessors;
+        this.accessor = accessor;
+        if(parent instanceof EFieldAccess)
+        	((EFieldAccess)parent).lastAccessor = false;
     }
 
     @Override
     public void collectRefs(TObjectIntHashMap<Object> allRefs,
             TIntHashSet refs) {
         parent.collectRefs(allRefs, refs);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectRefs(allRefs, refs);
+        accessor.collectRefs(allRefs, refs);
     }
 
     @Override
     public void collectVars(TObjectIntHashMap<Variable> allVars,
             TIntHashSet vars) {
         parent.collectVars(allVars, vars);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectVars(allVars, vars);
+        accessor.collectVars(allVars, vars);
     }
 
     private boolean returnsValue() {
-        FieldAccessor lastAccessor = accessors[accessors.length-1];
-        return lastAccessor.accessSeparator=='#' && !lastAccessor.isVariableId();
+    	return accessor.accessSeparator == '#' && !accessor.isVariableId();
     }
 
     @Override
@@ -58,8 +59,50 @@ public class EFieldAccess extends SimplifiableExpression {
         // Type is already updated in checkBasicType
     }
     
+    private Expression resolveAccessor(TypingContext context, Type requiredType) {
+        if(!(accessor instanceof IdAccessor))
+            return null;
+        IdAccessor idAccessor = (IdAccessor)accessor;
+        if(idAccessor.accessSeparator != '.')
+            return null;
+        List<Constant> accessors = context.getEnvironment().getFieldAccessors(idAccessor.fieldName);
+        if(accessors == null) {
+            context.getErrorLog().log("Couldn't resolve accessor ." + idAccessor.fieldName + ".");
+            return new EError(location);
+        }
+        Expression accessorExpression;
+        if(accessors.size() == 1)
+            accessorExpression = new ELiteral(accessors.get(0));
+        else {
+            Alternative[] alternatives = new Alternative[accessors.size()];
+            for(int i=0;i<alternatives.length;++i) {
+                final int index = i;
+                alternatives[i] = new Alternative() {
+                    @Override
+                    public Expression realize() {
+                        return new ELiteral(accessors.get(index));
+                    }
+                    @Override
+                    public Type getType() {
+                        return accessors.get(index).getType();
+                    }
+                };
+            }
+            accessorExpression = new EAmbiguous(alternatives);
+        }
+        return new EApply(location, accessorExpression, parent).checkType(context, requiredType);
+    }
+    
     @Override
     public Expression checkBasicType(TypingContext context, Type requiredType) {
+        ModuleHeader header = context.getCompilationContext().header;
+        if(header != null && header.fields) {
+            Expression expression = resolveAccessor(context, requiredType);
+            if(expression != null)
+                return expression;
+        }
+        
+        // Default case
         if(returnsValue())
             setType(requiredType);
         else {
@@ -67,8 +110,7 @@ public class EFieldAccess extends SimplifiableExpression {
             context.subsume(this, requiredType);
         }
         parent = parent.checkType(context, VARIABLE);
-        for(FieldAccessor accessor : accessors)
-            accessor.checkType(context);
+        accessor.checkType(context);
         context.declareEffect(getLocation(), Types.READ_GRAPH);
         return this;
     }
@@ -76,64 +118,47 @@ public class EFieldAccess extends SimplifiableExpression {
     @Override
     public void collectFreeVariables(THashSet<Variable> vars) {
         parent.collectFreeVariables(vars);
-        for(FieldAccessor accessor : accessors)
-            accessor.collectFreeVariables(vars);
+        accessor.collectFreeVariables(vars);
     }
 
     @Override
     public Expression simplify(SimplificationContext context) {
         // Simplify subexpressions
         parent = parent.simplify(context);
-        for(FieldAccessor accessor : accessors)
-            accessor.simplify(context);
+        accessor.simplify(context);
         
-        // ...
-        Expression result = parent;
-        for(int i=0;i<accessors.length;++i) {
-            FieldAccessor accessor = accessors[i];
-            if(accessor.accessSeparator == '.')
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_child_),
-                        result,
-                        accessor.asExpression()
-                        );
-            else if(i < accessors.length-1)
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_property),
-                        result,
-                        accessor.asExpression()
-                        );
-            else if(accessor.isVariableId())
-                ;
-            else
-                result = new EApply(
-                        getLocation(),
-                        Types.READ_GRAPH,
-                        context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),
-                        result,
-                        accessor.asExpression()
-                        );
-        }
-        return result;
-    }
-
-    private static FieldAccessor[] concat(FieldAccessor[] accessors1,
-            FieldAccessor[] accessors2) {
-        FieldAccessor[] result = new FieldAccessor[accessors1.length + accessors2.length];
-        System.arraycopy(accessors1, 0, result, 0, accessors1.length);
-        System.arraycopy(accessors2, 0, result, accessors1.length, accessors2.length);
-        return result;
+        if(accessor.accessSeparator == '.')
+        	return new EApply(
+        			getLocation(),
+        			Types.READ_GRAPH,
+        			context.getConstant(Names.Simantics_Variables_child_),
+        			parent,
+        			accessor.asExpression()
+        			);
+        else if(!lastAccessor)
+        	return new EApply(
+        			getLocation(),
+        			Types.READ_GRAPH,
+        			context.getConstant(Names.Simantics_Variables_property),
+        			parent,
+        			accessor.asExpression()
+        			);
+        else if(accessor.isVariableId())
+        	return parent;
+        else
+        	return new EApply(
+        			getLocation(),
+        			Types.READ_GRAPH,
+        			context.getConstant(Names.Simantics_Variables_untypedPropertyValue, getType()),
+        			parent,
+        			accessor.asExpression()
+        			);
     }
 
     @Override
     public Expression resolve(TranslationContext context) {
         parent = parent.resolve(context);
-        for(FieldAccessor accessor : accessors)
-            accessor.resolve(context);
+        accessor.resolve(context);
         return this;
     }
 
@@ -153,8 +178,7 @@ public class EFieldAccess extends SimplifiableExpression {
         if(location == Locations.NO_LOCATION) {
             location = loc;
             parent.setLocationDeep(loc);
-            for(FieldAccessor accessor : accessors)
-                accessor.setLocationDeep(loc);
+            accessor.setLocationDeep(loc);
         }
     }
     
@@ -166,8 +190,7 @@ public class EFieldAccess extends SimplifiableExpression {
     @Override
     public void forVariables(VariableProcedure procedure) {
         parent.forVariables(procedure);
-        for(FieldAccessor accessor : accessors)
-            accessor.forVariables(procedure);
+        accessor.forVariables(procedure);
     }
     
     @Override
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
index a47d3e0dd..fda9d37ac 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVar.java
@@ -44,7 +44,7 @@ public class EVar extends ASTExpression {
 
     @Override
     public Expression resolve(TranslationContext context) {
-        return context.resolveExpression(location, name);
+        return context.resolveVariable(location, name);
     }
     
     @Override
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ExpressionTransformer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ExpressionTransformer.java
index 50f081499..8d54d5063 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ExpressionTransformer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ExpressionTransformer.java
@@ -13,7 +13,6 @@ public interface ExpressionTransformer {
     Expression transform(EConstant expression);
     Expression transform(ECoveringBranchPoint expression);
     Expression transform(EEnforce expression);
-    Expression transform(EEntityTypeAnnotation expression);
     Expression transform(EEquations expression);
     Expression transform(EError expression);
     Expression transform(EExternalConstant expression);
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java
index 2fc6d1e7e..5d1d2eb95 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionTransformer.java
@@ -7,7 +7,6 @@ import org.simantics.scl.compiler.elaboration.equation.EqGuard;
 import org.simantics.scl.compiler.elaboration.equation.Equation;
 import org.simantics.scl.compiler.elaboration.equation.EquationVisitor;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.ExpressionAccessor;
-import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.block.BindStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.GuardStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.LetStatement;
@@ -143,14 +142,6 @@ EquationVisitor {
         return expression;
     }
 
-    @Override
-    public Expression transform(EEntityTypeAnnotation expression) {
-        expression.expression = expression.expression.accept(this);
-        if(expression.query != null)
-            expression.query = expression.query.accept(this);
-        return expression;
-    }
-
     @Override
     public Expression transform(EError expression) {
         return expression;
@@ -164,11 +155,10 @@ EquationVisitor {
     @Override
     public Expression transform(EFieldAccess expression) {
         expression.parent = expression.parent.accept(this);
-        for(FieldAccessor accessor : expression.accessors)
-            if(accessor instanceof ExpressionAccessor) {
-                ExpressionAccessor expAcc = (ExpressionAccessor)accessor;
-                expAcc.fieldName = expAcc.fieldName.accept(this);
-            }
+        if(expression.accessor instanceof ExpressionAccessor) {
+        	ExpressionAccessor expAcc = (ExpressionAccessor)expression.accessor;
+        	expAcc.fieldName = expAcc.fieldName.accept(this);
+        }
         return expression;
     }
 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java
index 401150db5..ef247bf13 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/StandardExpressionVisitor.java
@@ -8,7 +8,6 @@ import org.simantics.scl.compiler.elaboration.equation.Equation;
 import org.simantics.scl.compiler.elaboration.equation.EquationVisitor;
 import org.simantics.scl.compiler.elaboration.expressions.ERuleset.DatalogRule;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.ExpressionAccessor;
-import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessorVisitor;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.IdAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.StringAccessor;
@@ -85,8 +84,7 @@ EquationVisitor, StatementVisitor {
     @Override
     public void visit(EFieldAccess expression) {
         expression.parent.accept(this);
-        for(FieldAccessor accessor : expression.accessors)
-            accessor.accept(this);
+        expression.accessor.accept(this);
     }
 
     @Override
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
index 100d3124b..e3a1333c0 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/ExpressionAccessor.java
@@ -17,7 +17,8 @@ import gnu.trove.set.hash.TIntHashSet;
 public class ExpressionAccessor extends FieldAccessor {
     public Expression fieldName;
 
-    public ExpressionAccessor(Expression fieldName) {
+    public ExpressionAccessor(char accessSeparator, Expression fieldName) {
+        super(accessSeparator);
         this.fieldName = fieldName;
     }
     
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/FieldAccessor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/FieldAccessor.java
index ec9a80b25..ce56da39f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/FieldAccessor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/FieldAccessor.java
@@ -15,6 +15,10 @@ import gnu.trove.set.hash.TIntHashSet;
 
 public abstract class FieldAccessor extends Symbol {
     public char accessSeparator;
+    
+    public FieldAccessor(char accessSeparator) {
+        this.accessSeparator = accessSeparator;
+    }
 
     public void collectRefs(TObjectIntHashMap<Object> allRefs,
             TIntHashSet refs) {
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/IdAccessor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/IdAccessor.java
index 0220a9ab8..9cb37e58f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/IdAccessor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/IdAccessor.java
@@ -9,7 +9,8 @@ import org.simantics.scl.compiler.errors.Locations;
 public class IdAccessor extends FieldAccessor {
     public final String fieldName;
 
-    public IdAccessor(String fieldName) {
+    public IdAccessor(char accessSeparator, String fieldName) {
+        super(accessSeparator);
         this.fieldName = fieldName;
     }
 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/StringAccessor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/StringAccessor.java
index 548cc9f43..d08a4383f 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/StringAccessor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/accessor/StringAccessor.java
@@ -9,7 +9,8 @@ import org.simantics.scl.compiler.errors.Locations;
 public class StringAccessor extends FieldAccessor {
     public final String fieldName;
 
-    public StringAccessor(String fieldName) {
+    public StringAccessor(char accessSeparator, String fieldName) {
+        super(accessSeparator);
         this.fieldName = fieldName;
     }
     
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/query/pre/QPreGuard.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/query/pre/QPreGuard.java
index 287f89919..f0caf7f37 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/query/pre/QPreGuard.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/query/pre/QPreGuard.java
@@ -2,16 +2,11 @@ package org.simantics.scl.compiler.elaboration.query.pre;
 
 import java.util.Arrays;
 
-import org.simantics.scl.compiler.constants.BooleanConstant;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.expressions.EApply;
-import org.simantics.scl.compiler.elaboration.expressions.EEntityTypeAnnotation;
-import org.simantics.scl.compiler.elaboration.expressions.ELiteral;
-import org.simantics.scl.compiler.elaboration.expressions.ESimpleLet;
 import org.simantics.scl.compiler.elaboration.expressions.EVar;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.expressions.QueryTransformer;
-import org.simantics.scl.compiler.elaboration.expressions.Variable;
 import org.simantics.scl.compiler.elaboration.java.CheckRelation;
 import org.simantics.scl.compiler.elaboration.query.QAtom;
 import org.simantics.scl.compiler.elaboration.query.QMapping;
@@ -83,9 +78,6 @@ public class QPreGuard extends PreQuery {
             if(query != null)
                 return query;
         }
-        else if(expression instanceof EEntityTypeAnnotation) {
-            expression = new ESimpleLet(new Variable("_"), expression, new ELiteral(new BooleanConstant(true)));
-        }
         return new QAtom(CheckRelation.INSTANCE,
                 new Expression[] { expression.resolve(context) });
     }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/ConcreteEnvironment.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/ConcreteEnvironment.java
index e3280daf6..c2a16f681 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/ConcreteEnvironment.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/ConcreteEnvironment.java
@@ -1,7 +1,10 @@
 package org.simantics.scl.compiler.environment;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.rules.TransformationRule;
 import org.simantics.scl.compiler.module.Module;
 
@@ -18,6 +21,27 @@ public class ConcreteEnvironment extends AbstractEnvironment {
         this.localNamespace = localNamespace;
     }
 
+    @Override
+    public List<Constant> getFieldAccessors(String name) {
+        List<Constant> result = null;
+        boolean resultIsImmutable = true;
+        for(Module module : moduleMap.values()) {
+            List<Constant> accessors = module.getFieldAccessors(name);
+            if(accessors != null) {
+                if(result == null)
+                    result = accessors;
+                else if(resultIsImmutable) {
+                    result = new ArrayList<Constant>(result.size() + accessors.size());
+                    result.addAll(accessors);
+                    resultIsImmutable = false;
+                }   
+                else
+                    result.addAll(accessors);
+            }
+        }
+        return result;
+    }
+
     @Override
     public Namespace getLocalNamespace() {
         return localNamespace;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
index b25fc7209..545c6b82c 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Environment.java
@@ -1,8 +1,10 @@
 package org.simantics.scl.compiler.environment;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.simantics.scl.compiler.common.names.Name;
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.contexts.EnvironmentalContext;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
@@ -18,6 +20,7 @@ public interface Environment extends EnvironmentalContext {
     Namespace getLocalNamespace();
     
     SCLValue getValue(Name name);
+    List<Constant> getFieldAccessors(String name);
     SCLRelation getRelation(Name name);
     SCLEntityType getEntityType(Name name);
     TypeDescriptor getTypeDescriptor(TCon type);
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Namespace.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Namespace.java
index 3253931fe..9b4712c84 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Namespace.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/Namespace.java
@@ -1,7 +1,9 @@
 package org.simantics.scl.compiler.environment;
 
+import java.util.List;
 import java.util.function.Consumer;
 
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/NamespaceImpl.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/NamespaceImpl.java
index 6dac77acf..0c97d308a 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/NamespaceImpl.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/NamespaceImpl.java
@@ -1,8 +1,10 @@
 package org.simantics.scl.compiler.environment;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
 
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;
@@ -73,7 +75,7 @@ public class NamespaceImpl implements Namespace {
             throw new AmbiguousNameException(conflictingModules, name);
         return result;
     }
-
+    
     @Override
     public SCLRelation getRelation(String name) throws AmbiguousNameException {
         SCLRelation result = null, temp;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/profiling/BranchPointInjector.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/profiling/BranchPointInjector.java
index 3d7350f9f..6f3ff3be9 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/profiling/BranchPointInjector.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/profiling/BranchPointInjector.java
@@ -14,7 +14,6 @@ import org.simantics.scl.compiler.elaboration.expressions.ECHRRuleset;
 import org.simantics.scl.compiler.elaboration.expressions.EConstant;
 import org.simantics.scl.compiler.elaboration.expressions.ECoveringBranchPoint;
 import org.simantics.scl.compiler.elaboration.expressions.EEnforce;
-import org.simantics.scl.compiler.elaboration.expressions.EEntityTypeAnnotation;
 import org.simantics.scl.compiler.elaboration.expressions.EError;
 import org.simantics.scl.compiler.elaboration.expressions.EExternalConstant;
 import org.simantics.scl.compiler.elaboration.expressions.EFieldAccess;
@@ -222,12 +221,6 @@ public class BranchPointInjector extends StandardExpressionTransformer {
         return super.transform(expression);
     }
     
-    @Override
-    public Expression transform(EEntityTypeAnnotation expression) {
-        ++codeCounter;
-        return super.transform(expression);
-    }
-    
     @Override
     public Expression transform(EError expression) {
         ++codeCounter;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
index 7fec8f83c..c408b4bb6 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/header/ModuleHeader.java
@@ -9,6 +9,7 @@ public class ModuleHeader {
     public String classLoader;
     public long classLoaderLocation;
     public String defaultLocalName;
+    public boolean fields;
     
     private void read(ErrorLog errorLog, DModuleHeader header) {
         for(FieldAssignment assignment : header.fields)
@@ -33,6 +34,9 @@ public class ModuleHeader {
             			errorLog.log(assignment.value.location, "Expected string here.");
             	}
             	break;
+            case "fields":
+                this.fields = true;
+                break;
             default:
                 errorLog.logWarning(assignment.location, "Unknown module header field was skipped.");
             }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
index 8ff94fd4b..7551271af 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
@@ -120,7 +120,6 @@ ruleDeclaration
  */
  
 exp = bexp (HASTYPE type)?                                   # LocalTypeAnnotation, shift HASTYPE, shift COLON
-    | bexp COLON ID WITH? queryBlock?                        # EntityTypeAnnotation, shift LBRACE, shift WITH
     ;
 
 bexp 
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat
index da6ec2969c2b796a91d045b6977a1de2f7b867bd..51eafba3c75c8de5febcc4628b457aa146cc94d5 100644
GIT binary patch
literal 23546
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
Bpnm`W

literal 23580
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
KF5nEnng0*sj@5Pm

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
index 362bc5142..735974868 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
@@ -13,18 +13,18 @@ public abstract class SCLParser {
     public static final boolean TRACE = false;
 
     private static final int INITIAL_CAPACITY = 16;
-    private static final int STATE_COUNT = 349;
+    private static final int STATE_COUNT = 345;
     private static final int TERMINAL_COUNT = 83;
     private static final int NONTERMINAL_COUNT = 51;
-    private static final int PRODUCT_COUNT = 133;
+    private static final int PRODUCT_COUNT = 132;
     
     private static final int[] ACTION_ROW_ID = new int[STATE_COUNT];
     private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT];
-    private static final short[] ACTION_TABLE = new short[6396];
-    private static final int[] ERROR_TABLE = new int[906];
+    private static final short[] ACTION_TABLE = new short[6360];
+    private static final int[] ERROR_TABLE = new int[895];
     private static final int[] GOTO_ROW_ID = new int[STATE_COUNT];
     private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT];
-    private static final short[] GOTO_TABLE = new short[1652];
+    private static final short[] GOTO_TABLE = new short[1711];
     private static final int[] PRODUCT_LHS = new int[PRODUCT_COUNT];
 
     private static final short STATE_MASK = (short)0x0fff;
@@ -72,7 +72,6 @@ public abstract class SCLParser {
         "HIDING",
         "ARROW",
         "COLON",
-        "WITH",
         "MINUS",
         "SYMBOL",
         "LESS",
@@ -103,6 +102,7 @@ public abstract class SCLParser {
         "IN",
         "THEN",
         "ELSE",
+        "WITH",
         "RBRACKET",
         "DOTDOT",
         "AT",
@@ -149,12 +149,12 @@ public abstract class SCLParser {
         "fundep",
         "ruleDeclaration",
         "query",
-        "queryBlock",
         "lexp",
         "symbol",
         "faexp",
         "accessor",
         "case",
+        "queryBlock",
         "stringLiteral",
         "symbolWithoutMinus",
         "listQualifier",
@@ -393,19 +393,19 @@ public abstract class SCLParser {
         return parse(0);
     }
     public Object parseCommands() {
-        return parse(334);
+        return parse(330);
     }
     public Object parseImport() {
-        return parse(341);
+        return parse(337);
     }
     public Object parseType() {
-        return parse(343);
+        return parse(339);
     }
     public Object parseExp() {
-        return parse(345);
+        return parse(341);
     }
     public Object parseEquationBlock() {
-        return parse(347);
+        return parse(343);
     }
 
 
@@ -425,246 +425,244 @@ public abstract class SCLParser {
         case 5:
             return reduceLocalTypeAnnotation();
         case 6:
-            return reduceEntityTypeAnnotation();
-        case 7:
             return reduceEquationBlock();
-        case 8:
+        case 7:
             return reduceModuleHeader();
-        case 9:
+        case 8:
             return reduceTypeAnnotation();
-        case 10:
+        case 9:
             return reduceValueDefinition();
-        case 11:
+        case 10:
             return reduceDataDefinition();
-        case 12:
+        case 11:
             return reduceTypeDefinition();
-        case 13:
+        case 12:
             return reduceClassDefinition();
-        case 14:
+        case 13:
             return reduceInstanceDefinition();
-        case 15:
+        case 14:
             return reduceDerivingInstanceDefinition();
-        case 16:
+        case 15:
             return reduceDocumentationString();
-        case 17:
+        case 16:
             return reduceAnnotation();
-        case 18:
+        case 17:
             return reducePrecedenceDefinition();
-        case 19:
+        case 18:
             return reduceJustImport();
-        case 20:
+        case 19:
             return reduceImportJava();
-        case 21:
+        case 20:
             return reduceEffectDefinition();
-        case 22:
+        case 21:
             return reduceRuleDefinition();
-        case 23:
+        case 22:
             return reduceMappingRelationDefinition();
-        case 24:
+        case 23:
             return reduceRelationDefinition();
-        case 25:
+        case 24:
             return reduceStatementCommand();
-        case 26:
+        case 25:
             return reduceImportCommand();
-        case 27:
+        case 26:
             return reduceGuardStatement();
-        case 28:
+        case 27:
             return reduceLetStatement();
-        case 29:
+        case 28:
             return reduceBindStatement();
-        case 30:
+        case 29:
             return reduceRuleStatement();
-        case 31:
+        case 30:
             return reduceCHRStatement();
-        case 32:
+        case 31:
             return reduceVerboseCHRStatement();
-        case 33:
+        case 32:
             return reduceConstraintStatement();
-        case 34:
+        case 33:
             return reduceDeclarations();
-        case 35:
+        case 34:
             return reduceField();
-        case 36:
+        case 35:
             return reduceFieldShorthand();
-        case 37:
+        case 36:
             return reduceVarId();
-        case 38:
+        case 37:
             return reduceEscapedSymbol();
-        case 39:
+        case 38:
             return reduceTupleConstructor();
-        case 40:
+        case 39:
             return reduceBinary();
-        case 41:
+        case 40:
             return reduceSimpleRhs();
-        case 42:
+        case 41:
             return reduceGuardedRhs();
-        case 43:
+        case 42:
             return reduceConstructor();
-        case 44:
+        case 43:
             return reduceRecordConstructor();
-        case 45:
+        case 44:
             return reduceContext();
-        case 46:
+        case 45:
             return reduceFundeps();
-        case 47:
+        case 46:
             return reduceTypeVar();
-        case 48:
+        case 47:
             return reduceTupleType();
-        case 49:
+        case 48:
             return reduceListType();
-        case 50:
+        case 49:
             return reduceListTypeConstructor();
-        case 51:
+        case 50:
             return reduceTupleTypeConstructor();
-        case 52:
+        case 51:
             return reduceLambda();
-        case 53:
+        case 52:
             return reduceLambdaMatch();
-        case 54:
+        case 53:
             return reduceLet();
-        case 55:
+        case 54:
             return reduceIf();
-        case 56:
+        case 55:
             return reduceMatch();
-        case 57:
+        case 56:
             return reduceDo();
-        case 58:
+        case 57:
             return reduceSelect();
-        case 59:
+        case 58:
             return reduceEnforce();
-        case 60:
+        case 59:
             return reduceVar();
-        case 61:
+        case 60:
             return reduceHashedId();
-        case 62:
+        case 61:
             return reduceBlank();
-        case 63:
+        case 62:
             return reduceInteger();
-        case 64:
+        case 63:
             return reduceFloat();
-        case 65:
+        case 64:
             return reduceString();
-        case 66:
+        case 65:
             return reduceChar();
-        case 67:
+        case 66:
             return reduceTuple();
-        case 68:
+        case 67:
             return reduceViewPattern();
-        case 69:
+        case 68:
             return reduceRightSection();
-        case 70:
+        case 69:
             return reduceLeftSection();
-        case 71:
+        case 70:
             return reduceListLiteral();
-        case 72:
+        case 71:
             return reduceRange();
-        case 73:
+        case 72:
             return reduceListComprehension();
-        case 74:
+        case 73:
             return reduceAs();
-        case 75:
+        case 74:
             return reduceRecord();
-        case 76:
+        case 75:
             return reduceTransformation();
-        case 77:
+        case 76:
             return reduceEq();
-        case 78:
+        case 77:
             return reduceRuleDeclarations();
-        case 79:
+        case 78:
             return reduceImportShowing();
-        case 80:
+        case 79:
             return reduceImportHiding();
-        case 81:
+        case 80:
             return reduceImportValueItem();
-        case 82:
+        case 81:
             return reduceFieldDescription();
-        case 83:
+        case 82:
             return reduceStatements();
-        case 84:
+        case 83:
             return reduceGuardedExpEq();
-        case 85:
+        case 84:
             return reduceFundep();
-        case 86:
+        case 85:
             return reduceQueryRuleDeclaration();
-        case 87:
+        case 86:
             return reduceAnnotation();
-        case 88:
+        case 87:
             return reduceGuardQuery();
-        case 89:
+        case 88:
             return reduceEqualsQuery();
-        case 90:
+        case 89:
             return reduceBindQuery();
-        case 91:
+        case 90:
             return reduceCompositeQuery();
+        case 91:
+            return reduceApply();
         case 92:
-            return reduceQueryBlock();
+            return reduceSymbol();
         case 93:
-            return reduceApply();
+            return reduceEscapedId();
         case 94:
-            return reduceSymbol();
+            return reduceMinus();
         case 95:
-            return reduceEscapedId();
+            return reduceLess();
         case 96:
-            return reduceMinus();
+            return reduceGreater();
         case 97:
-            return reduceLess();
+            return reduceDot();
         case 98:
-            return reduceGreater();
+            return reduceFieldAccess();
         case 99:
-            return reduceDot();
+            return reduceIdAccessor();
         case 100:
-            return reduceFieldAccess();
+            return reduceStringAccessor();
         case 101:
-            return reduceIdAccessor();
+            return reduceExpAccessor();
         case 102:
-            return reduceStringAccessor();
+            return reduceCase();
         case 103:
-            return reduceExpAccessor();
+            return reduceQueryBlock();
         case 104:
-            return reduceCase();
-        case 105:
             return reduceStringLiteral();
-        case 106:
+        case 105:
             return reduceSymbol();
-        case 107:
+        case 106:
             return reduceEscapedId();
-        case 108:
+        case 107:
             return reduceLess();
-        case 109:
+        case 108:
             return reduceGreater();
-        case 110:
+        case 109:
             return reduceDot();
-        case 111:
+        case 110:
             return reduceGuardQualifier();
-        case 112:
+        case 111:
             return reduceLetQualifier();
-        case 113:
+        case 112:
             return reduceBindQualifier();
-        case 114:
+        case 113:
             return reduceThenQualifier();
-        case 115:
+        case 114:
             return reduceCHRQuery();
-        case 116:
+        case 115:
             return reduceVerboseCHRQuery();
-        case 117:
+        case 116:
             return reduceSimpleCaseRhs();
-        case 118:
+        case 117:
             return reduceGuardedCaseRhs();
-        case 119:
+        case 118:
             return reduceGuardedExpArrow();
-        case 120:
+        case 119:
             return reduceGuardEquation();
-        case 121:
+        case 120:
             return reduceBasicEquation();
-        case 122:
+        case 121:
             return reduceEffect();
-        case 123:
+        case 122:
             return reduceJustEtype();
-        case 124:
+        case 123:
             return reduceForAll();
-        case 125:
+        case 124:
             return reduceApplyType();
-        case 126:
+        case 125:
             return reduceDummy();
 
         default:
@@ -709,10 +707,6 @@ public abstract class SCLParser {
      * exp ::= bexp (HASTYPE type)?
      */
     protected abstract Object reduceLocalTypeAnnotation();
-    /**
-     * exp ::= bexp COLON ID (queryBlock | WITH queryBlock?)?
-     */
-    protected abstract Object reduceEntityTypeAnnotation();
     /**
      * equationBlock ::= (equation (SEMICOLON equation)&#42;)?
      */
@@ -1049,10 +1043,6 @@ public abstract class SCLParser {
      * query ::= QUERY_OP queryBlock
      */
     protected abstract Object reduceCompositeQuery();
-    /**
-     * queryBlock ::= LBRACE (query (SEMICOLON (query SEMICOLON)&#42; query)?)? RBRACE
-     */
-    protected abstract Object reduceQueryBlock();
     /**
      * lexp ::= faexp faexp&#42;
      */
@@ -1101,6 +1091,10 @@ public abstract class SCLParser {
      * case ::= exp caseRhs
      */
     protected abstract Object reduceCase();
+    /**
+     * queryBlock ::= LBRACE (query (SEMICOLON (query SEMICOLON)&#42; query)?)? RBRACE
+     */
+    protected abstract Object reduceQueryBlock();
     /**
      * stringLiteral ::= BEGIN_STRING (SUSPEND_STRING exp CONTINUE_STRING)&#42; END_STRING
      */
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
index 90c801403..799e59099 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
@@ -21,7 +21,6 @@ import org.simantics.scl.compiler.elaboration.expressions.EBinaryRightSide;
 import org.simantics.scl.compiler.elaboration.expressions.EBlock;
 import org.simantics.scl.compiler.elaboration.expressions.EConstant;
 import org.simantics.scl.compiler.elaboration.expressions.EEnforce;
-import org.simantics.scl.compiler.elaboration.expressions.EEntityTypeAnnotation;
 import org.simantics.scl.compiler.elaboration.expressions.EEquations;
 import org.simantics.scl.compiler.elaboration.expressions.EFieldAccess;
 import org.simantics.scl.compiler.elaboration.expressions.EIf;
@@ -957,30 +956,30 @@ public class SCLParserImpl extends SCLParser {
 
     @Override
     protected Object reduceIdAccessor() {
-        return new IdAccessor(((Token)get(0)).text);
+        return new IdAccessor('.', ((Token)get(0)).text);
     }
 
     @Override
     protected Object reduceStringAccessor() {
-        return new StringAccessor(((Token)get(1)).text);
+        return new StringAccessor('.', ((Token)get(1)).text);
     }
 
     @Override
     protected Object reduceExpAccessor() {
-        return new ExpressionAccessor((Expression)get(1));
+        return new ExpressionAccessor('.', (Expression)get(1));
     }
 
     @Override
     protected Object reduceFieldAccess() {
         if(length() == 1)
             return get(0);
-        FieldAccessor[] accessors = new FieldAccessor[length()/2];
-        for(int i=0;i<accessors.length;++i) {
-            FieldAccessor accessor = (FieldAccessor)get(i*2+2);
-            accessor.accessSeparator = ((Token)get(i*2+1)).text.charAt(0);
-            accessors[i] = accessor;
+        Expression result = (Expression)get(0);
+        for(int i=2;i<length();i+=2) {
+            FieldAccessor accessor = (FieldAccessor)get(i);
+            accessor.accessSeparator = ((Token)get(i-1)).text.charAt(0);
+            result = new EFieldAccess(result, accessor);
         }
-        return new EFieldAccess((Expression)get(0), accessors);
+        return result;
     }
 
     @Override
@@ -1024,14 +1023,6 @@ public class SCLParserImpl extends SCLParser {
     protected Object reduceRuleStatement() {
         return new RuleStatement((Expression)get(0), new QConjunction((Query[])get(2)));
     }
-    
-    @Override
-    protected Object reduceEntityTypeAnnotation() {
-        return new EEntityTypeAnnotation((Expression)get(0), (Token)get(2), 
-                length() > 3 
-                ? new QConjunction((Query[])get(length()-1))
-                : null);
-    }
 
     @Override
     protected Object reduceHashedId() {
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
index 98ef910f3..c7723eea8 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
@@ -38,37 +38,37 @@ public interface SCLTerminals {
     public static final int HIDING = 34;
     public static final int ARROW = 35;
     public static final int COLON = 36;
-    public static final int WITH = 37;
-    public static final int MINUS = 38;
-    public static final int SYMBOL = 39;
-    public static final int LESS = 40;
-    public static final int GREATER = 41;
-    public static final int SEPARATED_DOT = 42;
-    public static final int ESCAPED_ID = 43;
-    public static final int LAMBDA = 44;
-    public static final int LAMBDA_MATCH = 45;
-    public static final int LET = 46;
-    public static final int IF = 47;
-    public static final int MATCH = 48;
-    public static final int DO = 49;
-    public static final int MDO = 50;
-    public static final int ENFORCE = 51;
-    public static final int BLANK = 52;
-    public static final int FLOAT = 53;
-    public static final int LBRACKET = 54;
-    public static final int ESCAPED_SYMBOL = 55;
-    public static final int CHAR = 56;
-    public static final int WHEN = 57;
-    public static final int ATTACHED_HASH = 58;
-    public static final int SELECT = 59;
-    public static final int SELECT_FIRST = 60;
-    public static final int SELECT_DISTINCT = 61;
-    public static final int TRANSFORMATION = 62;
-    public static final int EQ = 63;
-    public static final int ATTACHED_DOT = 64;
-    public static final int IN = 65;
-    public static final int THEN = 66;
-    public static final int ELSE = 67;
+    public static final int MINUS = 37;
+    public static final int SYMBOL = 38;
+    public static final int LESS = 39;
+    public static final int GREATER = 40;
+    public static final int SEPARATED_DOT = 41;
+    public static final int ESCAPED_ID = 42;
+    public static final int LAMBDA = 43;
+    public static final int LAMBDA_MATCH = 44;
+    public static final int LET = 45;
+    public static final int IF = 46;
+    public static final int MATCH = 47;
+    public static final int DO = 48;
+    public static final int MDO = 49;
+    public static final int ENFORCE = 50;
+    public static final int BLANK = 51;
+    public static final int FLOAT = 52;
+    public static final int LBRACKET = 53;
+    public static final int ESCAPED_SYMBOL = 54;
+    public static final int CHAR = 55;
+    public static final int WHEN = 56;
+    public static final int ATTACHED_HASH = 57;
+    public static final int SELECT = 58;
+    public static final int SELECT_FIRST = 59;
+    public static final int SELECT_DISTINCT = 60;
+    public static final int TRANSFORMATION = 61;
+    public static final int EQ = 62;
+    public static final int ATTACHED_DOT = 63;
+    public static final int IN = 64;
+    public static final int THEN = 65;
+    public static final int ELSE = 66;
+    public static final int WITH = 67;
     public static final int RBRACKET = 68;
     public static final int DOTDOT = 69;
     public static final int AT = 70;
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
index 55ee202f7..c6210ce49 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/ConcreteModule.java
@@ -37,6 +37,7 @@ public class ConcreteModule implements Module {
     THashMap<String, TypeClass> typeClasses = new THashMap<String, TypeClass>();
     THashMap<TCon, ArrayList<TypeClassInstance>> typeClassInstances = new THashMap<TCon, ArrayList<TypeClassInstance>>();
     THashMap<String, SCLValue> values = new THashMap<String, SCLValue>();
+    THashMap<String, List<Constant>> fieldAccessors = new THashMap<String, List<Constant>>();
     THashMap<String, SCLRelation> relations = new THashMap<String, SCLRelation>();
     THashMap<String, SCLEntityType> entityTypes = new THashMap<String, SCLEntityType>();
     THashMap<String, TransformationRule> rules = new THashMap<String, TransformationRule>();
@@ -106,6 +107,11 @@ public class ConcreteModule implements Module {
         addValue(value);
         return value;
     }
+    
+    @Override
+    public List<Constant> getFieldAccessors(String name) {
+        return fieldAccessors.get(name);
+    }
 
     public void addRelation(String name, SCLRelation relation) {
         relations.put(name, relation);
@@ -300,4 +306,13 @@ public class ConcreteModule implements Module {
             throw new NullPointerException();
         this.parentClassLoader = parentClassLoader;
     }
+    
+    public void addFieldAccessor(String name, Constant accessor) {
+        List<Constant> list = fieldAccessors.get(name);
+        if(list == null) {
+            list = new ArrayList<Constant>(2);
+            fieldAccessors.put(name, list);
+        }
+        list.add(accessor);
+    }
 }
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
index fe57054cc..a53a90b91 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
@@ -2,7 +2,9 @@ package org.simantics.scl.compiler.module;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.modules.Documentation;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
@@ -70,6 +72,11 @@ public abstract class LazyModule implements Module {
         }
     }
     
+    @Override
+    public List<Constant> getFieldAccessors(String name) {
+        return null;
+    }
+    
     public SCLRelation getRelation(String name) {
         if(relations.containsKey(name))
             return relations.get(name);
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
index aff2e2d7f..51d39e103 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/Module.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.elaboration.modules.Documentation;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
@@ -28,6 +29,7 @@ public interface Module {
     String getDefaultLocalName();
     
     SCLValue getValue(String name);
+    List<Constant> getFieldAccessors(String name);
     SCLRelation getRelation(String name);
     SCLEntityType getEntityType(String name);
     
diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/runtime/RuntimeModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/runtime/RuntimeModule.java
index 93ecb2f17..aeb21ffa6 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/runtime/RuntimeModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/runtime/RuntimeModule.java
@@ -2,6 +2,7 @@ package org.simantics.scl.compiler.runtime;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import org.simantics.scl.compiler.constants.Constant;
@@ -205,6 +206,11 @@ public class RuntimeModule {
         @Override
         public void collectRules(Collection<TransformationRule> rules) {
         }
+        @Override
+        public List<Constant> getFieldAccessors(String name) {
+            // TODO Not clear if this is needed.
+            return null;
+        }
     };
     
     public RuntimeModule(Module module, RuntimeModuleMap parentModuleMap,
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
index cecc93e84..4701e2586 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
@@ -187,6 +187,7 @@ public class ModuleRegressionTests extends TestBase {
     @Test public void Random1() { test(); }
     @Test public void RangeSyntax() { test(); }
     @Test public void Record1() { test(); }
+    @Test public void Record2() { test(); }
     @Test public void RecordShorthand() { test(); }
     @Test public void RecursiveContext() { test(); }
     @Test public void RecursiveValues2() { test(); }
@@ -201,7 +202,6 @@ public class ModuleRegressionTests extends TestBase {
     @Test public void Sections() { test(); }
     @Test public void Select1() { test(); }
     @Test public void Select2() { test(); }
-    @Test public void Select3() { test(); }
     @Test public void Select4() { test(); }
     @Test public void Select5() { test(); }
     @Test public void Select6() { test(); }
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl
index cd9425658..e5b4785ae 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/InvalidPattern3.scl
@@ -4,5 +4,5 @@ foo x = b
 
 main = "Not to be executed."
 --
-1:9-1:10: Couldn't resolve variable b.
+1:9-1:10: Couldn't resolve b.
 3:5-3:23: Pattern was expected here.
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Record2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Record2.scl
new file mode 100644
index 000000000..de71cf487
--- /dev/null
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Record2.scl
@@ -0,0 +1,15 @@
+module {
+    fields
+}
+
+import "Prelude"
+
+data Foo = Foo { x :: Double }
+data Bar = Bar { x :: Double, y :: Double }
+
+main = f.x + b.x + b.y
+  where
+    f = Foo 1.0
+    b = Bar 2.0 3.0
+-- 
+6.0
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl
index e81fd508b..252e7ccfa 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/RecursiveValues2.scl
@@ -2,4 +2,4 @@ f g = a
   where 
     a = g a
 --
-3:11-3:12: Couldn't resolve variable a.
\ No newline at end of file
+3:11-3:12: Couldn't resolve a.
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Select3.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Select3.scl
deleted file mode 100644
index a3e4f44e8..000000000
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Select3.scl
+++ /dev/null
@@ -1,18 +0,0 @@
-import "StandardLibrary"
-import "Minigraph"
-
-main = withGraph do
-    a = resource "a"
-    b = map resource ["b0", "b1", "b2", "b3", "b4"]
-    r = map resource ["r0", "r1"]
-    
-    enforce
-        Statement a (r!0) (b!0)
-        Statement a (r!0) (b!1)
-        Statement a (r!1) (b!4)
-        Statement (b!1) (r!1) (b!3)
-        Statement (b!1) (r!0) (b!2)
-    sort $ map uriOf $ select ?x where 
-        Statement a (r!0) (_ : Resource { #r1 = ?x })
---
-[b3]
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl
index d49b1cb80..70b20b360 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable.scl
@@ -1,4 +1,4 @@
 a = b
 
 --
-1:5-1:6: Couldn't resolve variable b.
\ No newline at end of file
+1:5-1:6: Couldn't resolve b.
\ No newline at end of file
diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl
index 8fddcf679..9e607cbe8 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/UnresolvedVariable2.scl
@@ -4,4 +4,4 @@ b = b
 c = a + b
 
 --
-4:7-4:8: Couldn't resolve variable +.
\ No newline at end of file
+4:7-4:8: Couldn't resolve +.
\ No newline at end of file
-- 
2.43.2