Updated

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@49 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 1, 1997 · b07e477 · b07e477
1 parent 9c1c07c
commit b07e477
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/modeq/ast/attrib.c b/modeq/ast/attrib.c
@@ -11,7 +11,8 @@ int zzcr_attr(Attrib *attr, int type, char *text)
     attr->u.floatval = atof(text); break;
   case IDENT:
   case STRING:
-    attr->u.stringval = strdup(text); break;
+    attr->u.stringval = strdup(text);
+    break;
   default:
     break;
   }
@@ -23,7 +24,9 @@ void zzd_attr(Attrib *attr)
   {
   case IDENT:
   case STRING:
-    free(attr->u.stringval); break;
+    /* MEMORY LEAK! */
+/*     free(attr->u.stringval); */
+    break;
   }
 }
 
@@ -60,7 +63,7 @@ void print_attr(Attrib *attr, FILE *f)
   case UNSIGNED_NUMBER:
     fprintf(f, "%.2f", attr->u.floatval); break;
   case IDENT:
-    fprintf(f, "%s", attr->u.stringval); break;
+    fprintf(f, "'%s'", attr->u.stringval); break;
   case STRING:
     fprintf(f, "\"%s\"", attr->u.stringval); break;
 
@@ -69,6 +72,8 @@ void print_attr(Attrib *attr, FILE *f)
   tokprinter(BOUNDARY);
   tokprinter(MODEL);
   tokprinter(PARTIAL);
+  tokprinter(EXTENDS);
+  tokprinter(PUBLIC);
   tokprinter(INPUT);
   tokprinter(OUTPUT);
   tokprinter(FLOW);
@@ -77,10 +82,12 @@ void print_attr(Attrib *attr, FILE *f)
   tokprinter(EQUATION);
   tokprinter(LPAR);
   tokprinter(RPAR);
+  tokprinter(DOT);
   tokprinter(COMPONENTS);
   tokprinter(TYPE_PREFIX);
   tokprinter(FUNCALL);
   tokprinter(EQUALS);
+  tokprinter(ELEMENT);
 
   case zzEOF_TOKEN:
   default:

diff --git a/modeq/test.rml b/modeq/test.rml
@@ -17,13 +17,12 @@ val component = Class.COMPONENT(false,
 				false,
 				false,
 				false,
-				"Real",
+				Exp.IDENT("Real"),
 				"par1", 
 				SOME(Class.ONEDIM(SOME((one,NONE)))),
 				NONE)
 
-val ellist =
-	(Class.PUBLIC,[ Class.ELEMENT(true, component) ])
+val parts =
+	[ (Class.PUBLIC([ Class.ELEMENT(true, component) ])) ]
 
-val prog1 = [ Class.CLASS(Class.CL_MODEL,
-		          [ ellist ]) ]
+val prog1 = [ Class.CLASS("class1", false, Class.CL_MODEL, parts) ]