Skip to content

Commit

Permalink
- Fixed some type errors in elaboration of CONS expressions (minor th…
Browse files Browse the repository at this point in the history
…ing that RML also did not handle properly)

- Updated PartialFn15.mo to its original form


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7560 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Dec 23, 2010
1 parent 74937e8 commit 85afab4
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Compiler/FrontEnd/Static.mo
Expand Up @@ -550,9 +550,7 @@ algorithm
(cache,e2_1,DAE.PROP((DAE.T_LIST(t2),_),c2),st_1) = elabExp(cache,env, e2, impl, st,doVect,pre,info);
t1 = Types.getPropType(prop1);
c1 = Types.propAllConst(prop1);
t = Types.superType(t1,Types.unboxedType(t2));
t = Types.superType(t,t); // For example TUPLE should be META_TUPLE; if it's only 1 argument, it might not be
t = Types.boxIfUnboxedType(t);
t = Types.superType(Types.boxIfUnboxedType(t1),Types.boxIfUnboxedType(t2));

(e1_1,_) = Types.matchType(e1_1, t1, t, true);
(e2_1,_) = Types.matchType(e2_1, (DAE.T_LIST(t2),NONE()), (DAE.T_LIST(t),NONE()), true);
Expand Down

0 comments on commit 85afab4

Please sign in to comment.