Skip to content

Commit

Permalink
- Call Static.canonCref before prefixing the cref in
Browse files Browse the repository at this point in the history
  InstSection.instAssignment2, to get rid of some failtrace.
- Changed unbalanced connector warning to an error.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10670 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
perost committed Dec 7, 2011
1 parent d9a3eb5 commit ac13eb0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Compiler/FrontEnd/InstSection.mo
Expand Up @@ -4522,9 +4522,9 @@ algorithm
/* v := expr; */
case (cache,env,ih,pre,Absyn.CREF(cr),e_1,eprop,info,source,initial_,impl,unrollForLoops)
equation
(cache,SOME((cre,cprop,attr))) = Static.elabCref(cache, env, cr, impl, false,pre,info);
(cache,DAE.CREF(ce,t)) = PrefixUtil.prefixExp(cache, env, ih, cre, pre);
(cache,ce_1) = Static.canonCref(cache, env, ce, impl);
(cache,SOME((DAE.CREF(ce,t),cprop,attr))) = Static.elabCref(cache, env, cr, impl, false,pre,info);
(cache, ce_1) = Static.canonCref(cache, env, ce, impl);
(cache, ce_1) = PrefixUtil.prefixCref(cache, env, ih, pre, ce_1);
(cache, e_1, eprop) = Ceval.cevalIfConstant(cache, env, e_1, eprop, impl, info);
(cache,e_2) = PrefixUtil.prefixExp(cache, env, ih, e_1, pre);
source = DAEUtil.addElementSourceFileInfo(source, info);
Expand Down
2 changes: 1 addition & 1 deletion Compiler/Util/Error.mo
Expand Up @@ -437,7 +437,7 @@ public constant Message LOOKUP_FUNCTION_GOT_CLASS = MESSAGE(148, TRANSLATION(),
"Looking for a function %s but found a %s.");
public constant Message NON_STREAM_OPERAND_IN_STREAM_OPERATOR = MESSAGE(149, TRANSLATION(), ERROR(),
"Operand %s to operator %s is not a stream variable.");
public constant Message UNBALANCED_CONNECTOR = MESSAGE(150, TRANSLATION(), WARNING(),
public constant Message UNBALANCED_CONNECTOR = MESSAGE(150, TRANSLATION(), ERROR(),
"Connector %s is not balanced: %s");
public constant Message RESTRICTION_VIOLATION = MESSAGE(151, TRANSLATION(), ERROR(),
"Restriction violation: %s is a %s, not a %s");
Expand Down

0 comments on commit ac13eb0

Please sign in to comment.