parser: Do not crash if last_loken is unset

[nit.git] / src / parser / xss / parser.xss

diff --git a/src/parser/xss/parser.xss b/src/parser/xss/parser.xss
index 2f6d2db..c4df56c 100644 (file)
--- a/src/parser/xss/parser.xss
+++ b/src/parser/xss/parser.xss
@@ -33,7 +33,8 @@ private class State
        end
 end
 
-redef class Parser
+class Parser
+special ParserTable
        # Associated lexer
        attr _lexer: Lexer
 
@@ -170,7 +171,7 @@ redef class Parser
        attr _reduce_table: Array[ReduceAction]
        private meth build_reduce_table
        do
-               _reduce_table = new Array[ReduceAction].with(
+               _reduce_table = new Array[ReduceAction].with_items(
 $ foreach {rules/rule}
                        new ReduceAction@index[-sep ','-]
 $ end foreach
@@ -278,8 +279,8 @@ $ end template
 
 $ template make_parser_tables()
 # Parser that build a full AST
-class Parser
-       attr _action_table: Array[Array[Int]]
+abstract class ParserTable
+       attr _action_table: Array[Array[Int]] = null
        private meth build_action_table
        do
                _action_table = once [ 
@@ -300,7 +301,7 @@ $   end foreach
        end
 $ end foreach
 
-       attr _goto_table: Array[Array[Int]]
+       attr _goto_table: Array[Array[Int]] = null
        private meth build_goto_table
        do
                _goto_table = once [