Skip to content

Commit

Permalink
- Fixed makeASUBArrayAdressing for package constants.
Browse files Browse the repository at this point in the history 
- Updated some test cases, because for some reason we use different formatting
  for crefs and ASUBs.
- Better elaboration of inStream and actualStream.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6534 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@perost
perost committed Oct 22, 2010
1 parent ac7b87e commit 3194e0b
Showing 1 changed file with 77 additions and 67 deletions.
144 changes: 77 additions & 67 deletions Compiler/Static.mo
View file
Expand Up @@ -3872,122 +3872,123 @@ protected function elabBuiltinInStream "function: elabBuiltinInStream
input Env.Env inEnv;
input list<Absyn.Exp> inAbsynExpLst;
input list<Absyn.NamedArg> inNamedArg;
input Boolean inBoolean;
input Boolean inImpl;
input Prefix inPrefix;
output Env.Cache outCache;
output DAE.Exp outExp;
output DAE.Properties outProperties;
output DAE.DAElist outDae "contain functions";
algorithm
(outCache,outExp,outProperties,outDae) := matchcontinue (inCache,inEnv,inAbsynExpLst,inNamedArg,inBoolean,inPrefix)
(outCache,outExp,outProperties,outDae) := matchcontinue (inCache,inEnv,inAbsynExpLst,inNamedArg,inImpl,inPrefix)
local
DAE.Exp exp_1,exp_2;
tuple<DAE.TType, Option<Absyn.Path>> tp;
DAE.Type tp;
DAE.Const c;
list<Env.Frame> env;
DAE.ExpType t;
Env.Env env;
Absyn.Exp exp;
DAE.Dimension dim;
Boolean impl;
Ident s,el_str,pre_str;
list<Absyn.Exp> expl;
Env.Cache cache;
DAE.DAElist dae,dae1,dae2;
DAE.DAElist dae;
Prefix pre;

/* a scalar? */
case (cache,env,{exp},_,impl,pre) /* impl */
local DAE.ExpType t; String str;

case (cache, env, {exp as Absyn.CREF(componentRef = _)}, _, impl, pre)
equation
(cache,exp_1,DAE.PROP(tp,c),_,dae1) = elabExp(cache,env, exp, impl, NONE,true,pre);
(tp,_) = Types.flattenArrayType(tp);
true = Types.basicType(tp);
(cache, exp_1, DAE.PROP(tp, c), _, dae) =
elabExp(cache, env, exp, impl, NONE, true, pre);
exp_2 :: _ = Exp.flattenArrayExpToList(exp_1);
(tp, _) = Types.flattenArrayType(tp);
validateBuiltinStreamOperator(cache, env, exp_2, tp, "inStream", pre);
t = Types.elabType(tp);
exp_2 = makeBuiltinCall("inStream", {exp_1}, t);
then
(cache,exp_2,DAE.PROP(tp,c),dae1);
case (cache,env,{exp},_,impl,pre)
local DAE.Exp exp;
equation
(cache,exp,DAE.PROP(tp,c),_,_) = elabExp(cache,env, exp, impl, NONE,true,pre);
(tp,_) = Types.flattenArrayType(tp);
false = Types.basicType(tp);
s = Exp.printExpStr(exp);
pre_str = PrefixUtil.printPrefixStr3(pre);
Error.addMessage(Error.OPERAND_BUILTIN_TYPE, {"inStream",pre_str,s});
then
fail();
case (cache,env,expl,_,_,pre)
equation
el_str = Exp.printListStr(expl, Dump.printExpStr, ", ");
pre_str = PrefixUtil.printPrefixStr3(pre);
s = System.stringAppendList({"inStream(",el_str,")"});
Error.addMessage(Error.WRONG_TYPE_OR_NO_OF_ARGS, {s,pre_str});
then
fail();
(cache, exp_2, DAE.PROP(tp, c), dae);
end matchcontinue;
end elabBuiltinInStream;

protected function elabBuiltinActualStream "function: elabBuiltinActualStream
This function elaborates the builtin operator inStream.
Input is the arguments to the inStream operator and the environment, Env.Env."
This function elaborates the builtin operator actualStream.
Input is the arguments to the actualStream operator and the environment, Env.Env."
input Env.Cache inCache;
input Env.Env inEnv;
input list<Absyn.Exp> inAbsynExpLst;
input list<Absyn.NamedArg> inNamedArg;
input Boolean inBoolean;
input Boolean inImpl;
input Prefix inPrefix;
output Env.Cache outCache;
output DAE.Exp outExp;
output DAE.Properties outProperties;
output DAE.DAElist outDae "contain functions";
algorithm
(outCache,outExp,outProperties,outDae) := matchcontinue (inCache,inEnv,inAbsynExpLst,inNamedArg,inBoolean,inPrefix)
(outCache,outExp,outProperties,outDae) := matchcontinue (inCache,inEnv,inAbsynExpLst,inNamedArg,inImpl,inPrefix)
local
DAE.Exp exp_1,exp_2;
tuple<DAE.TType, Option<Absyn.Path>> tp;
DAE.Type tp;
DAE.Const c;
list<Env.Frame> env;
DAE.ExpType t;
Env.Env env;
Absyn.Exp exp;
DAE.Dimension dim;
Boolean impl;
Ident s,el_str,pre_str;
list<Absyn.Exp> expl;
Env.Cache cache;
DAE.DAElist dae,dae1,dae2;
DAE.DAElist dae;
Prefix pre;

/* a scalar? */
case (cache,env,{exp},_,impl,pre) /* impl */
local DAE.ExpType t; String str;

case (cache, env, {exp as Absyn.CREF(componentRef = _)}, _, impl, pre)
equation
(cache,exp_1,DAE.PROP(tp,c),_,dae1) = elabExp(cache,env, exp, impl, NONE,true,pre);
(tp,_) = Types.flattenArrayType(tp);
true = Types.basicType(tp);
(cache, exp_1, DAE.PROP(tp, c), _, dae) =
elabExp(cache, env, exp, impl, NONE, true, pre);
exp_2 :: _ = Exp.flattenArrayExpToList(exp_1);
(tp, _) = Types.flattenArrayType(tp);
validateBuiltinStreamOperator(cache, env, exp_2, tp, "actualStream", pre);
t = Types.elabType(tp);
exp_2 = makeBuiltinCall("actualStream", {exp_1}, t);
then
(cache,exp_2,DAE.PROP(tp,c),dae1);
case (cache,env,{exp},_,impl,pre)
local DAE.Exp exp;
(cache, exp_2, DAE.PROP(tp, c), dae);
end matchcontinue;
end elabBuiltinActualStream;

protected function validateBuiltinStreamOperator
input Env.Cache inCache;
input Env.Env inEnv;
input DAE.Exp inOperand;
input DAE.Type inType;
input String inOperator;
input Prefix.Prefix inPrefix;
algorithm
_ := matchcontinue(inCache, inEnv, inOperand, inType, inOperator, inPrefix)
local
DAE.ComponentRef cr;
String pre_str, op_str;
// Operand is a stream variable, ok!
case (_, _, DAE.CREF(componentRef = cr), _, _, _)
equation
(cache,exp,DAE.PROP(tp,c),_,_) = elabExp(cache,env, exp, impl, NONE,true,pre);
(tp,_) = Types.flattenArrayType(tp);
false = Types.basicType(tp);
s = Exp.printExpStr(exp);
pre_str = PrefixUtil.printPrefixStr3(pre);
Error.addMessage(Error.OPERAND_BUILTIN_TYPE, {"actualStream",pre_str,s});
(_, DAE.ATTR(streamPrefix = true), _, _, _, _, _, _, _) =
Lookup.lookupVar(inCache, inEnv, cr);
then
();
// Operand is not a stream variable, error!
case (_, _, DAE.CREF(componentRef = cr), _, _, _)
equation
(_, DAE.ATTR(streamPrefix = false), _, _, _, _, _, _, _) =
Lookup.lookupVar(inCache, inEnv, cr);
op_str = Exp.printComponentRefStr(cr);
pre_str = PrefixUtil.printPrefixStr3(inPrefix);
Error.addMessage(Error.NON_STREAM_OPERAND_IN_STREAM_OPERATOR,
{op_str, inOperator, pre_str});
then
fail();
case (cache,env,expl,_,_,pre)
// Operand is not even a component reference, error!
case (_, _, _, _, _, _)
equation
el_str = Exp.printListStr(expl, Dump.printExpStr, ", ");
pre_str = PrefixUtil.printPrefixStr3(pre);
s = System.stringAppendList({"actualStream(",el_str,")"});
Error.addMessage(Error.WRONG_TYPE_OR_NO_OF_ARGS, {s,pre_str});
false = Exp.isCref(inOperand);
op_str = Exp.printExpStr(inOperand);
pre_str = PrefixUtil.printPrefixStr3(inPrefix);
Error.addMessage(Error.NON_STREAM_OPERAND_IN_STREAM_OPERATOR,
{op_str, inOperator, pre_str});
then
fail();
end matchcontinue;
end elabBuiltinActualStream;
end validateBuiltinStreamOperator;

protected function elabBuiltinMMCGetField "Fetches fields from a boxed datatype:
Tuple: (a,b,c),2 => b
Expand Down Expand Up @@ -10677,6 +10678,15 @@ algorithm
exp1 = DAE.CREF(DAE.CREF_IDENT(id2,tty2,essl),ty);
then
exp1;
// Qualified cref, might be a package constant.
case(_, _, _, _, DAE.CREF(componentRef = cr, ty = ty), _, _, pre)
equation
(essl as _ :: _) = Exp.crefLastSubs(cr);
cr = Exp.crefStripLastSubs(cr);
exp1 = makeASUBArrayAdressing2(essl, pre);
exp1 = DAE.ASUB(DAE.CREF(cr, ty), exp1);
then
exp1;
// adrpo: return exp1 here instead of exp2
// returning exp2 generates x.y[{1,2,3}] for x.Real[3].y;
case(_,_,_,_, (exp1 as DAE.CREF(DAE.CREF_QUAL(id2,_,essl,crr2),ty)), Lookup.SPLICEDEXPDATA(SOME(exp2 as DAE.CREF(cr,_)),idTp),doVect,_)
Expand Down

0 comments on commit 3194e0b

Please sign in to comment.