X-Git-Url: http://nitlanguage.org

diff --git a/lib/nitcc_runtime.nit b/lib/nitcc_runtime.nit
index b5fb0fb..51ee0c8 100644
--- a/lib/nitcc_runtime.nit
+++ b/lib/nitcc_runtime.nit
@@ -186,12 +186,14 @@ abstract class Lexer
 				last_state = state
 			end
 			var c
+			var next
 			if pos >= length then
 				c = '\0'
+				next = null
 			else
-				c = text[pos]
+				c = text.chars[pos]
+				next = state.trans(c)
 			end
-			var next = state.trans(c)
 			if next == null then
 				if pos_start < length then
 					if last_state == null then
@@ -465,14 +467,15 @@ end
 class NLexerError
 	super NError
 
-	redef fun unexpected do return "character '{text.first}'"
+	redef fun unexpected do return "character '{text.chars.first}'"
 end
 
 # A parser error linked to a unexpected token
 class NParserError
 	super NError
+
 	# The unexpected token
-	var token: nullable NToken
+	var token: nullable NToken = null
 
 	redef fun unexpected
 	do
@@ -548,7 +551,7 @@ abstract class TestParser
 		var filepath = args.shift
 		var text
 		if filepath == "-" then
-			text = stdin.read_all
+			text = sys.stdin.read_all
 		else if filepath == "-e" then
 			if args.is_empty then
 				print "Error: -e need a text"