- Give as many strings as there are %s directives in the error-string

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12558 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 17, 2012 · 5557985 · 5557985
1 parent 49600db
commit 5557985
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/Compiler/FrontEnd/Mod.mo b/Compiler/FrontEnd/Mod.mo
@@ -1142,7 +1142,7 @@ algorithm
       equation
         mod1 = lookupCompModification2(subs, n);
         mod2 = lookupComplexCompModification(eqMod,n,f,e);
-        mod = checkDuplicateModifications(mod1,mod2);
+        mod = checkDuplicateModifications(mod1,mod2,n);
       then
         mod;
   end match;
@@ -1169,7 +1169,7 @@ algorithm
       equation
         mod1 = lookupCompModification2(subs, n);
         mod2 = lookupComplexCompModification(eqMod,n,f,e);
-        mod = selectEqMod(mod1, mod2);
+        mod = selectEqMod(mod1, mod2, n);
       then
         mod;
   end match;
@@ -1181,18 +1181,19 @@ protected function selectEqMod
   Otherwise check for duplicates"
  input DAE.Mod subMod;
  input DAE.Mod eqMod;
+ input String n;
  output DAE.Mod mod;
 algorithm
-  mod := matchcontinue(subMod, eqMod)
+  mod := match (subMod, eqMod, n)
     // eqmod is nomod!
-    case (subMod, eqMod as DAE.NOMOD()) then subMod;
-    case (subMod, eqMod as DAE.MOD(eqModOption = SOME(DAE.TYPED(modifierAsExp = _)))) then eqMod;
-    case (subMod, eqMod)
+    case (subMod, DAE.NOMOD(), _) then subMod;
+    case (_, eqMod as DAE.MOD(eqModOption = SOME(DAE.TYPED(modifierAsExp = _))), _) then eqMod;
+    case (subMod, eqMod, n)
       equation
-        mod = checkDuplicateModifications(subMod,eqMod);
+        mod = checkDuplicateModifications(subMod,eqMod,n);
       then
         mod;
-  end matchcontinue;
+  end match;
 end selectEqMod;
 
 public function lookupCompModification12 "function: lookupCompModification
@@ -1302,25 +1303,26 @@ protected function checkDuplicateModifications "Checks if two modifiers are pres
 print error of duplicate modifications, if not, the one modification having a value is returned"
   input DAE.Mod mod1;
   input DAE.Mod mod2;
+  input String n;
   output DAE.Mod outMod;
 algorithm
-  outMod := matchcontinue(mod1,mod2)
+  outMod := matchcontinue(mod1,mod2,n)
     local 
       String s1,s2,s;
 
-    case(DAE.NOMOD(),mod2) then mod2;
-    case(mod1,DAE.NOMOD()) then mod1;
+    case(DAE.NOMOD(),mod2,_) then mod2;
+    case(mod1,DAE.NOMOD(),_) then mod1;
     // if they are equal, return the second one!
-    case(mod1,mod2) 
+    case(mod1,mod2,_) 
       equation
         true = modEqual(mod1, mod2);
       then mod2;
     // print error message
-    case(mod1,mod2) equation
+    case(mod1,mod2,n) equation
       s1 = printModStr(mod1);
       s2 = printModStr(mod2);
       s = s1 +& " and " +& s2;
-      Error.addMessage(Error.DUPLICATE_MODIFICATIONS,{s});
+      Error.addMessage(Error.DUPLICATE_MODIFICATIONS,{s,n});
     then fail();
   end matchcontinue;
 end checkDuplicateModifications;

diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -5060,12 +5060,8 @@ case UNARY(exp = e as CREF(__)) then
   <<
   <%lhsStr%> = -<%rhsStr%>;
   >>
-case _ then 
-  <<
-  /* SimCodeC.tpl template: writeLhsCref: UNHANDLED LHS 
-   * <%ExpressionDump.printExpStr(exp)%> = <%rhsStr%> 
-   */
-  >>
+else
+  error(sourceInfo(), 'writeLhsCref UNHANDLED: <%ExpressionDump.printExpStr(exp)%> = <%rhsStr%>')
 end writeLhsCref;
 
 template algStmtIf(DAE.Statement stmt, Context context, Text &varDecls /*BUFP*/)