Changeset 2894deef in OpenModelica

Timestamp:

2016-04-06T19:48:13+02:00 (8 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

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:

000a65f

Parents:

96898a5d

git-author:

Martin Sjölund <martin.sjolund@…> (04/06/16 19:26:25)

git-committer:

Martin Sjölund <martin.sjolund@…> (04/06/16 19:48:13)

Message:

Do not allocate memory to traverse prefix

File:

• Compiler/FrontEnd/PrefixUtil.mo (modified) (1 diff)

Compiler/FrontEnd/PrefixUtil.mo

@@ -301 +301 @@
   output Absyn.Path outPath;
 algorithm
-  outPath := matchcontinue (inPrefix)
+  outPath := match inPrefix
+    local
+      Prefix.ComponentPrefix ss;
+    case Prefix.PREFIX(ss,_) then componentPrefixToPath(ss);
+  end match;
+end prefixToPath;
+
+protected function componentPrefixToPath "Convert a Prefix to a Path"
+  input Prefix.ComponentPrefix pre;
+  output Absyn.Path path;
+algorithm
+  path := match pre
     local
       String s;
-      Absyn.Path p;
       Prefix.ComponentPrefix ss;
-      Prefix.ClassPrefix cp;
-
-    case Prefix.NOPRE()
-      equation
-        /*Print.printBuf("#-- Error: Cannot convert empty prefix to a path\n");*/
-      then
-        fail();
-    case Prefix.PREFIX(Prefix.PRE(prefix = s,next = Prefix.NOCOMPPRE()),_) then Absyn.IDENT(s);
-    case Prefix.PREFIX(Prefix.PRE(prefix = s,next = ss),cp)
-      equation
-        p = prefixToPath(Prefix.PREFIX(ss,cp));
-      then
-        Absyn.QUALIFIED(s,p);
-  end matchcontinue;
-end prefixToPath;
+    case Prefix.PRE(prefix = s,next = Prefix.NOCOMPPRE())
+      then Absyn.IDENT(s);
+    case Prefix.PRE(prefix = s,next = ss)
+      then Absyn.QUALIFIED(s,componentPrefixToPath(ss));
+  end match;
+end componentPrefixToPath;
 
 public function prefixCref "Prefix a ComponentRef variable by adding the supplied prefix to