Skip to content

Commit b3b07e2

Browse files
author
Leonardo Laguna
committed
- (recommit) Eliminating error message when the StaticScript.elabCallInteractive succeds
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15881 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent c68246f commit b3b07e2

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Compiler/FrontEnd/Static.mo

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6463,12 +6463,14 @@ algorithm
64636463
case (cache,env,fn,args,nargs,(impl as true),st,pre,_,_)
64646464
equation
64656465
false = hasBuiltInHandler(fn);
6466+
ErrorExt.setCheckpoint("elabCall_InteractiveFunction");
64666467
Debug.fprintln(Flags.SEI, "elab_call 3");
64676468
fn_1 = Absyn.crefToPath(fn);
64686469
(cache,e,prop) = elabCallArgs(cache,env, fn_1, args, nargs, impl, st,pre,info);
64696470
Debug.fprint(Flags.SEI, "elab_call 3 succeeded: ");
64706471
fnstr = Dump.printComponentRefStr(fn);
64716472
Debug.fprintln(Flags.SEI, fnstr);
6473+
ErrorExt.delCheckpoint("elabCall_InteractiveFunction");
64726474
then
64736475
(cache,e,prop,st);
64746476

@@ -6505,8 +6507,14 @@ algorithm
65056507
case (cache,env,fn,args,nargs,impl,st as SOME(_),pre,_,_) /* impl LS: Check if a builtin function call, e.g. size() and calculate if so */
65066508
equation
65076509
(cache,e,prop,st) = StaticScript.elabCallInteractive(cache,env, fn, args, nargs, impl,st,pre,info) "Elaborate interactive function calls, such as simulate(), plot() etc." ;
6510+
ErrorExt.rollBack("elabCall_InteractiveFunction");
65086511
then
65096512
(cache,e,prop,st);
6513+
case(_,_,_,_,_,_,_,_,_,_)
6514+
equation
6515+
true=ErrorExt.isTopCheckpoint("elabCall_InteractiveFunction");
6516+
ErrorExt.delCheckpoint("elabCall_InteractiveFunction");
6517+
then fail();
65106518
end matchcontinue;
65116519
end elabCall;
65126520

0 commit comments

Comments
 (0)