Skip to content

Commit

Permalink
+ testsuite fixes for parallel extensions.
Browse files Browse the repository at this point in the history
+ Added parallelism attribute to all variables.

Absyn.ATTR (flowPrefix, streamPrefix, variability, direction, arrayDim)
                                 |
                                 V
Absyn.ATTR (flowPrefix, streamPrefix, parallelism, variability, direction, arrayDim)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10909 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
mahge committed Jan 16, 2012
1 parent 61607e3 commit a0fc944
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Compiler/FrontEnd/Absyn.mo
Expand Up @@ -4369,7 +4369,7 @@ Helper function for mergeElementAttributes
input Parallelism p1;
input Parallelism p2;
output Parallelism p3;
algorithm v3 := matchcontinue(p1,p2)
algorithm p3 := matchcontinue(p1,p2)
case(p1,NON_PARALLEL()) then p1;
case(NON_PARALLEL(),p2) then p2;
case(p1,p2)
Expand Down
11 changes: 7 additions & 4 deletions Compiler/Script/Interactive.mo
Expand Up @@ -15405,7 +15405,7 @@ algorithm
SCode.Element c;
list<Env.Frame> env_1,env;
Absyn.Path envpath,p_1,p;
String tpname,typename,finalPrefix,repl,inout_str,flowPrefixstr,streamPrefixstr,variability_str,dir_str,str,access;
String tpname,typename,finalPrefix,repl,inout_str,flowPrefixstr,streamPrefixstr,variability_str,parallelism_str,dir_str,str,access;
String typeAdStr;
list<Absyn.ComponentItem> lst;
list<String> names,lst_1,dims,strLst;
Expand Down Expand Up @@ -15438,11 +15438,12 @@ algorithm
flowPrefixstr = Util.if_(b,stringAppendList({"\"",flowPrefixstr,"\""}),flowPrefixstr);
streamPrefixstr = attrStreamStr(attr);
streamPrefixstr = Util.if_(b,stringAppendList({"\"",streamPrefixstr,"\""}),streamPrefixstr);
parallelism_str = attrParallelismStr(attr);
variability_str = attrVariabilityStr(attr);
dir_str = attrDirectionStr(attr);
typeAdStr = arrayDimensionStr(typeAd);
typeAdStr = attrDimensionStr(attr);
str = stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,variability_str,inout_str,dir_str}, ", ");
str = stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,parallelism_str,variability_str,inout_str,dir_str}, ", ");
lst_1 = suffixInfos(strLst,dims,typeAdStr,str,b);
then
lst_1;
Expand All @@ -15466,9 +15467,10 @@ algorithm
flowPrefixstr = Util.if_(b,stringAppendList({"\"",flowPrefixstr,"\""}),flowPrefixstr);
streamPrefixstr = attrStreamStr(attr);
streamPrefixstr = Util.if_(b,stringAppendList({"\"",streamPrefixstr,"\""}),streamPrefixstr);
parallelism_str = attrParallelismStr(attr);
variability_str = attrVariabilityStr(attr);
dir_str = attrDirectionStr(attr);
str = stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,variability_str,inout_str,dir_str}, ", ");
str = stringDelimitList({access,finalPrefix,flowPrefixstr,streamPrefixstr,repl,parallelism_str,variability_str,inout_str,dir_str}, ", ");
typeAdStr = attrDimensionStr(attr);
lst_1 = suffixInfos(strLst,dims,typeAdStr,str,b);
then
Expand Down Expand Up @@ -15511,6 +15513,7 @@ protected function getComponentsInfo
where flow is one of: true, false
where stream is one of: true, false
where replaceable is one of: true, false
where parallelism is one of: \"parglobal\", \"parlocal\", \"unspecified\"
where variability is one of: \"constant\", \"parameter\", \"discrete\" or \"unspecified\"
where innerouter is one of: \"inner\", \"outer\", (\"innerouter\") or \"none\"
where vardirection is one of: \"input\", \"output\" or \"unspecified\".
Expand Down Expand Up @@ -15703,7 +15706,7 @@ end attrStreamStr;
protected function attrParallelismStr
"function: attrParallelismStr
Helper function to get_component_info,
retrieve direction as a string."
retrieve parallelism as a string."
input Absyn.ElementAttributes inElementAttributes;
output String outString;
algorithm
Expand Down

0 comments on commit a0fc944

Please sign in to comment.