Merge branch 'update_syntax' into next

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

diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 7ac93d4..e66dc87 100644 (file)
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -1200,7 +1200,7 @@ end
 # The lexer extract NIT tokens from an input stream.
 # It is better user with the Parser
 class Lexer
-special TablesCapable
+       super TablesCapable
        # Last peeked token
        var _token: nullable Token
 
@@ -1264,7 +1264,7 @@ special TablesCapable
                        result = get_token
                end
                _token = null
-               return result.as(not null)
+               return result
        end
 
        # Get a token, or null if it is discarded
@@ -1655,9 +1655,7 @@ special TablesCapable
                                        end
                                end
                        end
-                       if false then break # FIXME remove once unreach loop exits are in c_src
                end
-               return null # FIXME remove once unreach loop exits are in c_src
        end
 
        # Read the next character.