Skip to content

Commit 04535a6

Browse files
sjoelundsjoelund
committed
- Fix more RML crap
git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6583 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent bd485be commit 04535a6

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎Compiler/Inst.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10005,7 +10005,7 @@ algorithm
1000510005
// set the source of this element
1000610006
source = DAEUtil.createElementSource(info, Env.getEnvPath(env), PrefixUtil.prefixToCrefOpt(pre), NONE(), NONE());
1000710007
then
10008-
(cache,env_1,ih,{DAE.FUNCTION(fpath,DAE.FUNCTION_EXT(daeElts,extdecl)::derFuncs,ty1,partialPrefix,DAE.NO_INLINE,source)});
10008+
(cache,env_1,ih,{DAE.FUNCTION(fpath,DAE.FUNCTION_EXT(daeElts,extdecl)::derFuncs,ty1,partialPrefix,DAE.NO_INLINE(),source)});
1000910009

1001010010
/* Instantiate overloaded functions */
1001110011
case (cache,env,ih,mod,pre,csets,(c as SCode.CLASS(name = n,restriction = (restr as SCode.R_FUNCTION()),
@@ -10446,7 +10446,7 @@ algorithm
1044610446
(c,cl,env) = Lookup.lookupClass(c,env,p,true);
1044710447
then
1044810448
isInlineFunc2(cl);
10449-
case(_,_,_) then DAE.NO_INLINE;
10449+
case(_,_,_) then DAE.NO_INLINE();
1045010450
end matchcontinue;
1045110451
end isInlineFunc;
1045210452

@@ -10465,7 +10465,7 @@ algorithm
1046510465

1046610466
case(SCode.CLASS(classDef = SCode.CLASS_EXTENDS(annotationLst = anns)))
1046710467
then isInlineFunc3(anns);
10468-
case(_) then DAE.NO_INLINE;
10468+
case(_) then DAE.NO_INLINE();
1046910469
end matchcontinue;
1047010470
end isInlineFunc2;
1047110471

@@ -10480,7 +10480,7 @@ algorithm
1048010480
list<SCode.Annotation> cdr;
1048110481
list<SCode.SubMod> smlst;
1048210482
DAE.InlineType res;
10483-
case({}) then DAE.NO_INLINE;
10483+
case({}) then DAE.NO_INLINE();
1048410484
case(SCode.ANNOTATION(SCode.MOD(_,_,smlst,_)) :: cdr)
1048510485
equation
1048610486
res = isInlineFunc4(smlst);
@@ -10506,7 +10506,7 @@ algorithm
1050610506
local
1050710507
list<SCode.SubMod> cdr;
1050810508
Boolean res;
10509-
case({}) then DAE.NO_INLINE;
10509+
case({}) then DAE.NO_INLINE();
1051010510

1051110511
case(SCode.NAMEMOD("Inline",SCode.MOD(_,_,_,SOME((Absyn.BOOL(true),_)))) :: _)
1051210512
then DAE.NORM_INLINE;

‎Compiler/Interactive.mo‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8931,15 +8931,15 @@ protected function isProtected
89318931
and returns true if the component referenced is in a protected section."
89328932
input Absyn.ComponentRef inComponentRef1;
89338933
input Absyn.ComponentRef inComponentRef2;
8934-
input Absyn.Program inProgram3;
8934+
input Absyn.Program p;
89358935
output Boolean outBoolean;
89368936
algorithm
89378937
outBoolean:=
8938-
matchcontinue (inComponentRef1,inComponentRef2,inProgram3)
8938+
matchcontinue (inComponentRef1,inComponentRef2,p)
89398939
local
89408940
Absyn.Path path;
89418941
String i;
8942-
Boolean p,f,e;
8942+
Boolean f,e;
89438943
Absyn.Restriction r;
89448944
list<Absyn.ClassPart> parts;
89458945
list<Absyn.ElementItem> publst,protlst;
@@ -8948,15 +8948,15 @@ algorithm
89488948
case (cr,classname,p)
89498949
equation
89508950
path = Absyn.crefToPath(classname);
8951-
Absyn.CLASS(i,p,f,e,r,Absyn.PARTS(parts,_),_) = getPathedClassInProgram(path, p);
8951+
Absyn.CLASS(body = Absyn.PARTS(parts,_)) = getPathedClassInProgram(path, p);
89528952
publst = getPublicList(parts);
89538953
_ = getComponentsContainsName(cr, publst);
89548954
then
89558955
false;
89568956
case (cr,classname,p)
89578957
equation
89588958
path = Absyn.crefToPath(classname);
8959-
Absyn.CLASS(i,p,f,e,r,Absyn.PARTS(parts,_),_) = getPathedClassInProgram(path, p);
8959+
Absyn.CLASS(body = Absyn.PARTS(parts,_)) = getPathedClassInProgram(path, p);
89608960
protlst = getProtectedList(parts);
89618961
_ = getComponentsContainsName(cr, protlst);
89628962
then
@@ -8965,15 +8965,15 @@ algorithm
89658965
case (cr,classname,p)
89668966
equation
89678967
path = Absyn.crefToPath(classname);
8968-
Absyn.CLASS(i,p,f,e,r,Absyn.CLASS_EXTENDS(_,_,_,parts),_) = getPathedClassInProgram(path, p);
8968+
Absyn.CLASS(body = Absyn.CLASS_EXTENDS(_,_,_,parts)) = getPathedClassInProgram(path, p);
89698969
publst = getPublicList(parts);
89708970
_ = getComponentsContainsName(cr, publst);
89718971
then
89728972
false;
89738973
case (cr,classname,p)
89748974
equation
89758975
path = Absyn.crefToPath(classname);
8976-
Absyn.CLASS(i,p,f,e,r,Absyn.CLASS_EXTENDS(_,_,_,parts),_) = getPathedClassInProgram(path, p);
8976+
Absyn.CLASS(body = Absyn.CLASS_EXTENDS(_,_,_,parts)) = getPathedClassInProgram(path, p);
89778977
protlst = getProtectedList(parts);
89788978
_ = getComponentsContainsName(cr, protlst);
89798979
then
@@ -14754,7 +14754,8 @@ algorithm
1475414754
Absyn.Path envpath,p_1,p;
1475514755
String tpname,typename,finalPrefix,repl,inout_str,flowPrefixstr,streamPrefixstr,variability_str,dir_str,str,access;
1475614756
String typeAdStr;
14757-
list<String> names,lst,lst_1,dims;
14757+
list<Absyn.ComponentItem> lst;
14758+
list<String> names,lst_1,dims,strLst;
1475814759
Boolean r_1,f;
1475914760
Option<Absyn.RedeclareKeywords> r;
1476014761
Absyn.InnerOuter inout;
@@ -14772,7 +14773,7 @@ algorithm
1477214773
typename = Absyn.pathString(p_1);
1477314774
names = getComponentitemsName(lst);
1477414775
dims = getComponentitemsDimension(lst);
14775-
lst = prefixTypename(typename, names);
14776+
strLst = prefixTypename(typename, names);
1477614777
finalPrefix = Util.boolString(f);
1477714778
r_1 = keywordReplaceable(r);
1477814779
repl = Util.boolString(r_1);
@@ -14784,7 +14785,7 @@ algorithm
1478414785
typeAdStr = arrayDimensionStr(typeAd);
1478514786
typeAdStr = attrDimensionStr(attr);
1478614787
str = Util.stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,variability_str,inout_str,dir_str}, ", ");
14787-
lst_1 = suffixInfos(lst,dims,typeAdStr,str);
14788+
lst_1 = suffixInfos(strLst,dims,typeAdStr,str);
1478814789
then
1478914790
lst_1;
1479014791

@@ -14795,7 +14796,7 @@ algorithm
1479514796
typename = Absyn.pathString(p);
1479614797
names = getComponentitemsName(lst);
1479714798
dims = getComponentitemsDimension(lst);
14798-
lst = prefixTypename(typename, names);
14799+
strLst = prefixTypename(typename, names);
1479914800
finalPrefix = Util.boolString(f);
1480014801
r_1 = keywordReplaceable(r);
1480114802
repl = Util.boolString(r_1);
@@ -14806,7 +14807,7 @@ algorithm
1480614807
dir_str = attrDirectionStr(attr);
1480714808
str = Util.stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,variability_str,inout_str,dir_str}, ", ");
1480814809
typeAdStr = attrDimensionStr(attr);
14809-
lst_1 = suffixInfos(lst,dims,typeAdStr,str);
14810+
lst_1 = suffixInfos(strLst,dims,typeAdStr,str);
1481014811
then
1481114812
lst_1;
1481214813

‎Compiler/Mod.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2260,7 +2260,7 @@ algorithm str := matchcontinue(m,depth)
22602260
//print(" ok\n");
22612261
then
22622262
"redeclare...";
2263-
case(DAE.NOMOD,_) then "";
2263+
case(DAE.NOMOD(),_) then "";
22642264
case(_,_) equation print(" failed prettyPrintMod\n"); then fail();
22652265
end matchcontinue;
22662266
end prettyPrintMod;

‎Compiler/Static.mo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7928,7 +7928,7 @@ protected function elabCallInteractive "function: elabCallInteractive
79287928
excludeList = getOptionalNamedArgExpList("exclude", args);
79297929
excludeListSize = listLength(excludeList);
79307930
then
7931-
(cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER,{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
7931+
(cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER(),{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
79327932

79337933
case (cache,env,Absyn.CREF_IDENT(name = "checkExamplePackages"),{Absyn.STRING(value = str)},args,impl,SOME(st),pre,_)
79347934
local
@@ -7937,7 +7937,7 @@ protected function elabCallInteractive "function: elabCallInteractive
79377937
equation
79387938
excludeList = getOptionalNamedArgExpList("exclude", args);
79397939
excludeListSize = listLength(excludeList);
7940-
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER,{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.SCONST(str)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
7940+
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER(),{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.SCONST(str)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
79417941

79427942
case (cache,env,Absyn.CREF_IDENT(name = "checkExamplePackages"),{Absyn.CREF(componentRef = cr)},args,impl,SOME(st),pre,_)
79437943
local
@@ -7948,7 +7948,7 @@ protected function elabCallInteractive "function: elabCallInteractive
79487948
className = Absyn.crefToPath(cr);
79497949
excludeList = getOptionalNamedArgExpList("exclude", args);
79507950
excludeListSize = listLength(excludeList);
7951-
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER,{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.CODE(Absyn.C_TYPENAME(className),DAE.ET_OTHER())},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
7951+
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER(),{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.CODE(Absyn.C_TYPENAME(className),DAE.ET_OTHER())},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
79527952

79537953
case (cache,env,Absyn.CREF_IDENT(name = "checkExamplePackages"),{Absyn.CREF(componentRef = cr), Absyn.STRING(value = str)},args,impl,SOME(st),pre,_)
79547954
local
@@ -7959,7 +7959,7 @@ protected function elabCallInteractive "function: elabCallInteractive
79597959
className = Absyn.crefToPath(cr);
79607960
excludeList = getOptionalNamedArgExpList("exclude", args);
79617961
excludeListSize = listLength(excludeList);
7962-
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER,{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.CODE(Absyn.C_TYPENAME(className),DAE.ET_OTHER()),DAE.SCONST(str)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
7962+
then (cache,DAE.CALL(Absyn.IDENT("checkExamplePackages"),{DAE.ARRAY(DAE.ET_ARRAY(DAE.ET_OTHER(),{DAE.DIM_INTEGER(excludeListSize)}),false,excludeList),DAE.CODE(Absyn.C_TYPENAME(className),DAE.ET_OTHER()),DAE.SCONST(str)},false,true,DAE.ET_STRING(),DAE.NO_INLINE),DAE.PROP(DAE.T_BOOL_DEFAULT,DAE.C_CONST()),SOME(st));
79637963

79647964
case (cache,env,Absyn.CREF_IDENT(name = "dumpXMLDAE"),{Absyn.CREF(componentRef = cr)},args,impl,SOME(st),pre,_)
79657965
local
@@ -8073,7 +8073,7 @@ algorithm
80738073
absynPath = Absyn.crefToPath(absynCr);
80748074
daeCr = pathToComponentRef(absynPath);
80758075
daeExpList = absynExpListToDaeExpList(absynRest);
8076-
then DAE.CREF(daeCr,DAE.ET_OTHER) :: daeExpList;
8076+
then DAE.CREF(daeCr,DAE.ET_OTHER()) :: daeExpList;
80778077
case (_ :: absynRest)
80788078
then absynExpListToDaeExpList(absynRest);
80798079
end matchcontinue;
@@ -13562,7 +13562,7 @@ algorithm
1356213562
case (cache,Absyn.EQUAL(),env,t1,t2)
1356313563
equation
1356413564
enum_op = makeEnumOperator(DAE.EQUAL(DAE.ET_ENUMERATION(Absyn.IDENT(""), {},{})), t1, t2);
13565-
defaultExpType = Util.if_(Types.isBoxedType(t1) and Types.isBoxedType(t2), DAE.ET_BOXED(DAE.ET_OTHER), DAE.ET_ENUMERATION(Absyn.IDENT(""),{},{}));
13565+
defaultExpType = Util.if_(Types.isBoxedType(t1) and Types.isBoxedType(t2), DAE.ET_BOXED(DAE.ET_OTHER()), DAE.ET_ENUMERATION(Absyn.IDENT(""),{},{}));
1356613566
scalars = {
1356713567
(DAE.EQUAL(DAE.ET_INT()),
1356813568
{DAE.T_INTEGER_DEFAULT,DAE.T_INTEGER_DEFAULT},DAE.T_BOOL_DEFAULT),
@@ -13580,7 +13580,7 @@ algorithm
1358013580
case (cache,Absyn.NEQUAL(),env,t1,t2)
1358113581
equation
1358213582
enum_op = makeEnumOperator(DAE.NEQUAL(DAE.ET_ENUMERATION(Absyn.IDENT(""), {},{})), t1, t2);
13583-
defaultExpType = Util.if_(Types.isBoxedType(t1) and Types.isBoxedType(t2), DAE.ET_BOXED(DAE.ET_OTHER), DAE.ET_ENUMERATION(Absyn.IDENT(""),{},{}));
13583+
defaultExpType = Util.if_(Types.isBoxedType(t1) and Types.isBoxedType(t2), DAE.ET_BOXED(DAE.ET_OTHER()), DAE.ET_ENUMERATION(Absyn.IDENT(""),{},{}));
1358413584
scalars = {
1358513585
(DAE.NEQUAL(DAE.ET_INT()),
1358613586
{DAE.T_INTEGER_DEFAULT,DAE.T_INTEGER_DEFAULT},DAE.T_BOOL_DEFAULT),

‎Compiler/Util.mo‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3340,16 +3340,15 @@ protected function listPos "helper function to listPosition"
33403340
algorithm
33413341
outInteger := matchcontinue (inTypeA,inTypeALst,inInteger)
33423342
local
3343-
Type_a x,y,i;
3343+
Type_a x,y;
33443344
list<Type_a> ys;
3345-
Integer i_1,n;
3345+
Integer i,i_1,n;
33463346
case (x,(y :: ys),i)
33473347
equation
33483348
equality(x = y);
33493349
then
33503350
i;
33513351
case (x,(y :: ys),i)
3352-
local Integer i;
33533352
equation
33543353
failure(equality(x = y));
33553354
i_1 = i + 1;

0 commit comments

Comments
 (0)