nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add tests for tests.sh so we can test the test script
[nit.git]
/
lib
/
nitcc_runtime.nit
diff --git
a/lib/nitcc_runtime.nit
b/lib/nitcc_runtime.nit
index
bf778cf
..
51ee0c8
100644
(file)
--- a/
lib/nitcc_runtime.nit
+++ b/
lib/nitcc_runtime.nit
@@
-186,12
+186,14
@@
abstract class Lexer
last_state = state
end
var c
last_state = state
end
var c
+ var next
if pos >= length then
c = '\0'
if pos >= length then
c = '\0'
+ next = null
else
else
- c = text[pos]
+ c = text.chars[pos]
+ next = state.trans(c)
end
end
- var next = state.trans(c)
if next == null then
if pos_start < length then
if last_state == null then
if next == null then
if pos_start < length then
if last_state == null then
@@
-366,7
+368,7
@@
abstract class Node
end
private class DephCollection
end
private class DephCollection
- super NaiveCollection[Node]
+ super Collection[Node]
var node: Node
redef fun iterator do return new DephIterator([node].iterator)
end
var node: Node
redef fun iterator do return new DephIterator([node].iterator)
end
@@
-465,14
+467,15
@@
end
class NLexerError
super NError
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
end
# A parser error linked to a unexpected token
class NParserError
super NError
+
# The unexpected token
# The unexpected token
- var token: nullable NToken
+ var token: nullable NToken = null
redef fun unexpected
do
redef fun unexpected
do
@@
-548,7
+551,7
@@
abstract class TestParser
var filepath = args.shift
var text
if filepath == "-" then
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"
else if filepath == "-e" then
if args.is_empty then
print "Error: -e need a text"