Changeset 22487

Timestamp:

2014-09-29T23:53:59+02:00 (10 years ago)

Author:

adrpo

Message:

Fix bug #2851

• handle named arguments for homotopy

File:

• trunk/Compiler/FrontEnd/Static.mo (modified) (3 diffs)

trunk/Compiler/FrontEnd/Static.mo

@@ -718 +718 @@
 
     // homotopy replacement (usually used for debugging only)
-    case (cache,env,Absyn.CALL(function_ = Absyn.CREF_IDENT("homotopy", _),functionArgs = Absyn.FUNCTIONARGS(args = args,argNames = _)),impl,st,doVect,pre,_,_)
+    case (cache,env,Absyn.CALL(function_ = Absyn.CREF_IDENT("homotopy", _),functionArgs = Absyn.FUNCTIONARGS(args = args,argNames = nargs)),impl,st,doVect,pre,_,_)
       equation
         replaceWith = Flags.getConfigString(Flags.REPLACE_HOMOTOPY);
@@ -725 +725 @@
         true = boolOr(stringEq(replaceWith, "actual"), stringEq(replaceWith, "simplified"));
         // TODO, handle empy args and nargs for homotopy!
-        {e1, e2} = args;
+        {e1, e2} = getHomotopyArguments(args, nargs);
         e = Util.if_(stringEq(replaceWith, "actual"), e1, e2);
         (cache,e_1,prop,st_1) = elabExpInExpression(cache, env, e, impl, st, doVect, pre, info);
@@ -899 +899 @@
   end matchcontinue;
 end elabExp2;
+
+public function getHomotopyArguments
+  input list<Absyn.Exp> args;
+  input list<Absyn.NamedArg> nargs;
+  output list<Absyn.Exp> outPositionalArgs;
+algorithm
+  outPositionalArgs := matchcontinue(args, nargs)
+    local
+      Absyn.Exp e1, e2;
+
+    // only positional
+    case ({e1, e2}, _) then {e1, e2};
+    // only named
+    case ({}, {Absyn.NAMEDARG("actual", e1), Absyn.NAMEDARG("simplified", e2)}) then {e1, e2};
+    case ({}, {Absyn.NAMEDARG("simplified", e2), Absyn.NAMEDARG("actual", e1)}) then {e1, e2};
+    // combination
+    case ({e1}, {Absyn.NAMEDARG("simplified", e2)}) then {e1, e2};
+    case (_, _)
+      equation
+        Error.addCompilerError("+replaceHomotopy: homotopy called with wrong arguments: " +&
+          Dump.printFunctionArgsStr(Absyn.FUNCTIONARGS(args, nargs)));
+      then
+        fail();
+  end matchcontinue;
+end getHomotopyArguments;
 
 protected function elabIfExp