X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fcontexts%2FTranslationContext.java;h=b5f9f93e942cb17bcf21c411d7e37702244bd415;hp=961fa902b9db552469b998f2e30e8255f806dcc1;hb=9a175feb652b2b7bba7afa540831b9076be3c10e;hpb=0b72d3e4ec886838314ffeba0fa201e32c0aae3e

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 961fa902b..b5f9f93e9 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
@@ -1,10 +1,5 @@
 package org.simantics.scl.compiler.elaboration.contexts;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.procedure.TObjectProcedure;
-import gnu.trove.set.hash.THashSet;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -12,6 +7,7 @@ import org.simantics.scl.compiler.common.names.Name;
 import org.simantics.scl.compiler.common.precedence.Associativity;
 import org.simantics.scl.compiler.common.precedence.Precedence;
 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;
@@ -36,6 +32,13 @@ import org.simantics.scl.compiler.environment.filter.AcceptAllNamespaceFilter;
 import org.simantics.scl.compiler.errors.ErrorLog;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.parsing.declarations.DValueAst;
+import org.simantics.scl.compiler.top.SCLCompilerConfiguration;
+import org.simantics.scl.compiler.types.Type;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.hash.THashSet;
 
 public class TranslationContext extends TypeTranslationContext implements EnvironmentalContext {
 
@@ -147,7 +150,45 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
     }
     
     private Expression resolveIn(long location, Namespace namespace, String name) {
-        SCLValue value = resolveValueIn(location, namespace, 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;
+            }
+        }
         if(value == null)
             return new EError(location);
         return new EConstant(location, value);
@@ -340,8 +381,7 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
             return prec;
     }
 
-    private SCLValue resolveValueIn(long location, Namespace namespace, final String name) {
-        try {
+    private SCLValue resolveValueIn(long location, Namespace namespace, final String name) throws AmbiguousNameException {
             SCLValue value = namespace.getValue(name);
             if(value == null) {
                 StringBuilder message = new StringBuilder();
@@ -391,10 +431,6 @@ public class TranslationContext extends TypeTranslationContext implements Enviro
                 return null;
             }
             return value;
-        } catch (AmbiguousNameException e) {
-            errorLog.log(location, e.getMessage());
-            return null;
-        }
     }
     
     public Case translateCase(Expression lhs, Expression rhs) {