nitcc: better name of generated classes to avoid name conflicts

[nit.git] / contrib / nitcc / src / nitcc.nit

diff --git a/contrib/nitcc/src/nitcc.nit b/contrib/nitcc/src/nitcc.nit
index bc2e8b3..8063b43 100644 (file)
--- a/contrib/nitcc/src/nitcc.nit
+++ b/contrib/nitcc/src/nitcc.nit
@@ -36,10 +36,10 @@ end
 
 # Parse the grammar file
 
-var l = new MyLexer(text)
+var l = new Lexer_nitcc(text)
 var ts = l.lex
 
-var p = new MyParser
+var p = new Parser_nitcc
 p.tokens.add_all ts
 
 var node = p.parse
@@ -129,21 +129,21 @@ dfa.to_dot("{name}.dfa.dot")
 # Generate Nit code
 
 print "Generate {name}_lexer.nit {name}_parser.nit {name}_test_parser.nit"
-dfa.gen_to_nit("{name}_lexer.nit", "{name}_parser")
-lr.gen_to_nit("{name}_parser.nit")
+dfa.gen_to_nit("{name}_lexer.nit", name, "{name}_parser")
+lr.gen_to_nit("{name}_parser.nit", name)
 
 f = new OFStream.open("{name}_test_parser.nit")
 f.write """# Generated by nitcc for the language {{{name}}}
 import nitcc_runtime
 import {{{name}}}_lexer
 import {{{name}}}_parser
-class MyTest
+class TestParser_{{{name}}}
        super TestParser
        redef fun name do return \"{{{name}}}\"
-       redef fun new_lexer(text) do return new MyLexer(text)
-       redef fun new_parser do return new MyParser
+       redef fun new_lexer(text) do return new Lexer_{{{name}}}(text)
+       redef fun new_parser do return new Parser_{{{name}}}
 end
-var t = new MyTest
+var t = new TestParser_{{{name}}}
 t.main
 """
 f.close