Changeset 06f4d98e in OpenModelica

Timestamp:

2013-02-26T11:15:41+01:00 (11 years ago)

Author:

Daniel Hedberg <daniel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

fea78539

Parents:

a81e91aa

Message:

Fixed bugs in unparsing of enumeration literals:

• Allow enumerations with only one enumerator/literal.
• Do not print a space after last literal if no comment is available.

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

File:

• Compiler/FrontEnd/Dump.mo (modified) (2 diffs)

Compiler/FrontEnd/Dump.mo

@@ -497 +497 @@
   outString := matchcontinue (inAbsynEnumLiteralLst)
     local
-      Ident s1,s2,res,str,str2;
-      Option<Absyn.Comment> optcmt,optcmt2;
+      Ident s1,s2,res,str;
+      Option<Absyn.Comment> optcmt;
       Absyn.EnumLiteral a;
       list<Absyn.EnumLiteral> b;
@@ -512 +512 @@
         res;
     
-    case ({Absyn.ENUMLITERAL(literal = str,comment = optcmt),Absyn.ENUMLITERAL(literal = str2,comment = optcmt2)})
+    case ({Absyn.ENUMLITERAL(literal = str,comment = NONE())}) then str;
+    case ({Absyn.ENUMLITERAL(literal = str,comment = optcmt as SOME(_))})
       equation
         s1 = unparseCommentOption(optcmt);
-        s2 = unparseCommentOption(optcmt2);
-        res = stringAppendList({str," ",s1,", ",str2," ",s2});
+        res = stringAppendList({str," ",s1});
       then
         res;
-  end matchcontinue;
+
+    end matchcontinue;
 end unparseEnumliterals;