Changeset 14025

Timestamp:

2012-11-22T16:30:57+01:00 (11 years ago)

Author:

perost

Message:

• Disable SCodeLookup.crefStripEnvPrefix when the scodeInst flag is used.

Location:

trunk

Files:

• Compiler/FrontEnd/SCodeLookup.mo (modified) (1 diff)
• testsuite/flattening/modelica/scodeinst/Makefile (modified) (2 diffs)
• testsuite/flattening/modelica/scodeinst/const11.mo (modified) (1 diff)

trunk/Compiler/FrontEnd/SCodeLookup.mo

@@ -1555 +1555 @@
     case (_, _)
       equation
+        // Don't do this if +d=scodeInst is used, it messed up the new
+        // instantiation which handles this correctly.
+        false = Flags.isSet(Flags.SCODE_INST);
         env_path = SCodeEnv.getEnvPath(inEnv);
         cref = Absyn.unqualifyCref(inCref);

trunk/testsuite/flattening/modelica/scodeinst/Makefile

@@ -33 +33 @@
 const14.mo \
 const16.mo \
+const17.mo \
 dim1.mo \
 dim7.mo \
@@ -139 +140 @@
 const12.mo \
 const15.mo \
-const17.mo \
 dim2.mo \
 dim3.mo \

trunk/testsuite/flattening/modelica/scodeinst/const11.mo

@@ -20 +20 @@
     Integer x = P.A.B.i;
     A a(j = 3);
-    Integer y = a.B.i;
+    Integer y = a.j;
     A.B b;
     Integer z = b.i;