git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1958 f25d…

…12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 11, 2005 · 81ce0e0 · 81ce0e0
1 parent 37c6875
commit 81ce0e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Compiler/SimCodegen.rml b/Compiler/SimCodegen.rml
@@ -125,7 +125,7 @@ relation generate_makefile: (string, (*filename*)
 			     string, (* classname *)
 			     string list (* libs *)
 			     ) => () =
-
+			      
   rule	Util.string_append_list([cname,".cpp"]) => cpp_file &
 	Util.string_delimit_list(libs, " ") => libs' &
 	Util.string_append_list(["#Makefile generated by OpenModelica\n\n",
@@ -359,8 +359,9 @@ relation generate_var_names_and_comments:(DAELow.DAELow,int, int) => (string,str
               output_str'',output_comments'',num_output'',(* output *)
               param_str'',param_comments'',num_param'' (* param *)) &
 
+
 
-        Util.string_append_list([state_str'',", ",derivative_str'',", ",algvars_str'']) => var_names &
+        Util.string_delimit_list_no_empty([state_str'',derivative_str'',algvars_str''],", ") => var_names &
         int_add(num_state'',num_derivative'') => num_var_names &
         int_add(num_var_names,num_algvars'') => num_var_names' &
 

diff --git a/flat_modelica_parser/src/flatmodelicaTokenTypes.txt b/flat_modelica_parser/src/flatmodelicaTokenTypes.txt
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.5 (20050213): flat_modelica_lexer.g -> flatmodelicaTokenTypes.txt$
+// $ANTLR 2.7.4: flat_modelica_lexer.g -> flatmodelicaTokenTypes.txt$
 flatmodelica    // output token vocab name
 ALGORITHM="algorithm"=4
 AND="and"=5