- Add parentheses around subscripted expressions in ExpressionDump when needed.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14923 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: perost

Compiler/FrontEnd/NFLookup.mo

@@ -148,6 +148,34 @@ algorithm
     SOME(Error.LOOKUP_FUNCTION_ERROR));
 end lookupFunctionName;
 
+public function lookupUnresolvedSimpleName
+  "Looks up a name and returns the unresolved entry from the environment."
+  input String inName;
+  input Env inEnv;
+  output Entry outEntry;
+algorithm
+  outEntry := matchcontinue(inName, inEnv)
+    local
+      Entry entry;
+      Env env;
+
+    case (_, _)
+      equation
+        entry = NFEnv.lookupEntry(inName, inEnv);
+      then
+        entry;
+
+    else
+      equation
+        true = NFEnv.isScopeEncapsulated(inEnv);
+        env = NFEnv.builtinScope(inEnv);
+        entry = lookupUnresolvedSimpleName(inName, env);
+      then
+        entry;
+
+  end matchcontinue;
+end lookupUnresolvedSimpleName;
+
 protected function lookupBuiltinType
   input String inName;
   input Env inEnv;
@@ -236,7 +264,7 @@ algorithm
       then
         (entry, env);
 
-    case (_, _)
+    else
       equation
         true = NFEnv.isScopeEncapsulated(inEnv);
         env = NFEnv.builtinScope(inEnv);
@@ -259,7 +287,7 @@ algorithm
   (outEntry, outEnv) := lookupNameInPackage(inName, inEnv);
 end lookupFullyQualified;
 
-protected function lookupInLocalScope
+public function lookupInLocalScope
   input String inName;
   input Env inEnv;
   output Entry outEntry;

Compiler/Template/ExpressionDumpTpl.tpl

@@ -75,12 +75,18 @@ match exp
     let ty_str = dumpType(ty)
     '/*<%ty_str%>*/(<%exp_str%>)'
   case ASUB(__) then
+    let needs_paren = parenthesizeSubExp(exp)
+    let lparen = if needs_paren then "("
+    let rparen = if needs_paren then ")"
     let exp_str = dumpExp(exp, stringDelimiter)
     let sub_str = dumpExpList(sub, stringDelimiter, ", ")
-    '<%exp_str%>[<%sub_str%>]'
+    '<%lparen%><%exp_str%><%rparen%>[<%sub_str%>]'
   case TSUB(__) then
+    let needs_paren = parenthesizeSubExp(exp)
+    let lparen = if needs_paren then "("
+    let rparen = if needs_paren then ")"
     let exp_str = dumpExp(exp, stringDelimiter)
-    '<%exp_str%>[<%ix%>]'
+    '<%lparen%><%exp_str%><%rparen%>[<%ix%>]'
   case SIZE(__) then
     let exp_str = dumpExp(exp, stringDelimiter)
     let dim_str = match sz case SOME(dim) then ', <%dumpExp(dim, stringDelimiter)%>'
@@ -132,6 +138,25 @@ match exp
   else errorMsg("ExpressionDumpTpl.dumpExp: Unknown expression.")
 end dumpExp;
 
+template parenthesizeSubExp(DAE.Exp exp)
+::=
+match exp
+  case ICONST(__) then ""
+  case RCONST(__) then ""
+  case SCONST(__) then ""
+  case BCONST(__) then ""
+  case ENUM_LITERAL(__) then ""
+  case CREF(__) then ""
+  case CALL(__) then ""
+  case ARRAY(__) then ""
+  case MATRIX(__) then ""
+  case TUPLE(__) then  ""
+  case CAST(__) then ""
+  case SIZE(__) then ""
+  case REDUCTION(__) then ""
+  else "y"
+end parenthesizeSubExp;
+
 template dumpExpList(list<DAE.Exp> expl, String stringDelimiter, String expDelimiter)
 ::= (expl |> exp => dumpExp(exp, stringDelimiter) ;separator=expDelimiter)
 end dumpExpList;