diff --git a/assets/parser.d.erb b/assets/parser.d.erb index 4e17c87..3bda15c 100644 --- a/assets/parser.d.erb +++ b/assets/parser.d.erb @@ -360,7 +360,7 @@ class <%= @classname %> } else if (attempt_match_info.length == 0u) { - result.token = TOKEN_0EOF; + result.token = TOKEN___EOF; result.type = Result.Type.TOKEN; return; } @@ -471,7 +471,7 @@ class <%= @classname %> if (shift_state == 0xFFFFFFFFu) { shift_state = check_shift(statevalues[$-1].state, token); - if ((shift_state != 0xFFFFFFFFu) && (token == TOKEN_0EOF)) + if ((shift_state != 0xFFFFFFFFu) && (token == TOKEN___EOF)) { /* Successful parse. */ parse_result = statevalues[$-1].pvalue; diff --git a/lib/propane/token.rb b/lib/propane/token.rb index 0bf91e5..68c1542 100644 --- a/lib/propane/token.rb +++ b/lib/propane/token.rb @@ -9,7 +9,7 @@ class Propane # @return [String] # Name of the token to use in code (special characters replaced). def code_name(name) - name.sub(/^\$/, "0") + name.sub(/^\$/, "__") end end diff --git a/spec/test_d_lexer.d b/spec/test_d_lexer.d index 16deb0c..7e40412 100644 --- a/spec/test_d_lexer.d +++ b/spec/test_d_lexer.d @@ -45,8 +45,8 @@ unittest assert(lexer.lex_token() == Result(Result.Type.TOKEN, 1, 0, 3, Testparser.TOKEN_int)); assert(lexer.lex_token() == Result(Result.Type.TOKEN, 1, 4, 1, Testparser.TOKEN_plus)); assert(lexer.lex_token() == Result(Result.Type.TOKEN, 1, 6, 3, Testparser.TOKEN_int)); - assert(lexer.lex_token() == Result(Result.Type.TOKEN, 1, 9, 0, Testparser.TOKEN_0EOF)); + assert(lexer.lex_token() == Result(Result.Type.TOKEN, 1, 9, 0, Testparser.TOKEN___EOF)); lexer = new Testparser.Lexer(""); - assert(lexer.lex_token() == Result(Result.Type.TOKEN, 0, 0, 0, Testparser.TOKEN_0EOF)); + assert(lexer.lex_token() == Result(Result.Type.TOKEN, 0, 0, 0, Testparser.TOKEN___EOF)); }