use the section names from the spec, better clean in the Makefile

sjoelund · Sep 12, 2019 · 6cf9810 · 6cf9810
1 parent 4dc913a
commit 6cf9810
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/grammar/Lexer.g → grammar/B1_lexical_conventions.g b/grammar/Lexer.g → grammar/B1_lexical_conventions.g
@@ -1,4 +1,4 @@
-lexer grammar Lexer;
+lexer grammar B1_lexical_conventions;
 
 // Whitespace and comments
 

diff --git a/grammar/Parser_stored_definition.g → grammar/B21_stored_definition.g b/grammar/Parser_stored_definition.g → grammar/B21_stored_definition.g
@@ -1,4 +1,4 @@
-parser grammar Parser_stored_definition;
+parser grammar B21_stored_definition;
 
 // Stored Definition - Within
 

diff --git a/grammar/Parser_class_definition.g → grammar/B22_class_definition.g b/grammar/Parser_class_definition.g → grammar/B22_class_definition.g
@@ -1,4 +1,4 @@
-parser grammar Parser_class_definition;
+parser grammar B22_class_definition;
 
 // Class Definition
 

diff --git a/grammar/Parser_extends.g → grammar/B23_extends.g b/grammar/Parser_extends.g → grammar/B23_extends.g
@@ -1,4 +1,4 @@
-parser grammar Parser_extends;
+parser grammar B23_extends;
 
 // Extends
 

diff --git a/grammar/Parser_component_clause.g → grammar/B24_component_clause.g b/grammar/Parser_component_clause.g → grammar/B24_component_clause.g
@@ -1,4 +1,4 @@
-parser grammar Parser_component_clause;
+parser grammar B24_component_clause;
 
 // Component Clause
 

diff --git a/grammar/Parser_modification.g → grammar/B25_modification.g b/grammar/Parser_modification.g → grammar/B25_modification.g
@@ -1,4 +1,4 @@
-parser grammar Parser_modification;
+parser grammar B25_modification;
 
 // Modification
 

diff --git a/grammar/Parser_equations.g → grammar/B26_equations.g b/grammar/Parser_equations.g → grammar/B26_equations.g
@@ -1,4 +1,4 @@
-parser grammar Parser_equations;
+parser grammar B26_equations;
 
 // Equations
 

diff --git a/grammar/Parser_expressions.g → grammar/B27_expressions.g b/grammar/Parser_expressions.g → grammar/B27_expressions.g
@@ -1,4 +1,4 @@
-parser grammar Parser_expressions;
+parser grammar B27_expressions;
 
 // Expressions
 

diff --git a/grammar/Makefile b/grammar/Makefile
@@ -9,4 +9,4 @@ all: $(ALL_G4)
 	mv $@.tmp $@
 
 clean:
-	rm -rf *Listener*.java ModelicaLexer.java ModelicaParser.java Modelica_*.java *.tokens *.interp *.g4
+	rm -rf *Listener*.java ModelicaLexer.java ModelicaParser.java Modelica_*.java *.tokens *.interp *.g4 *.class
diff --git a/grammar/Modelica.g b/grammar/Modelica.g
@@ -5,7 +5,7 @@ options {
 }
 
 
-import Lexer, Parser_stored_definition, Parser_class_definition, Parser_extends, Parser_component_clause, Parser_modification, Parser_equations, Parser_expressions;
+import B1_lexical_conventions, B21_stored_definition, B22_class_definition, B23_extends, B24_component_clause, B25_modification, B26_equations, B27_expressions;
 
 start_rule: stored_definition;