Merge: ordered_tree: make OrderedTree implement Collection

[nit.git] / contrib / nitcc / src / nitcc_lexer0.nit

diff --git a/contrib/nitcc/src/nitcc_lexer0.nit b/contrib/nitcc/src/nitcc_lexer0.nit
index 50d590e..7fa876f 100644 (file)
--- a/contrib/nitcc/src/nitcc_lexer0.nit
+++ b/contrib/nitcc/src/nitcc_lexer0.nit
@@ -22,17 +22,17 @@ import nitcc_parser
 
 # Hand-writen lexer of nitcc
 # Used only for the boostrap of the tool.
-class MyLexer
+class Lexer_nitcc
        var text: String
 
-       var iter: Iterator[Char] = "".iterator
+       var iter: Iterator[Char] = "".chars.iterator
        var pos = 0
 
        var tokens = new Array[NToken]
 
        fun lex: Array[NToken]
        do
-               iter = text.iterator
+               iter = text.chars.iterator
                while iter.is_ok do
                        trim
                        if not iter.is_ok then break
@@ -62,6 +62,8 @@ class MyLexer
                                tokens.add new Nccur
                        else if c == '|' then
                                tokens.add new Npipe
+                       else if c == ',' then
+                               tokens.add new Ncomma
                        else if c == ':' then
                                tokens.add new Ncolo
                        else if c == ';' then
@@ -94,7 +96,7 @@ class MyLexer
 
        fun str
        do
-               var b = new Buffer
+               var b = new FlatBuffer
                b.add('\'')
                while iter.is_ok do
                        var c = iter.item
@@ -121,7 +123,7 @@ class MyLexer
 
        fun id(c: Char)
        do
-               var b = new Buffer
+               var b = new FlatBuffer
                b.add c
                while iter.is_ok do
                        c = iter.item
@@ -138,7 +140,7 @@ class MyLexer
 
        fun kw(c: Char)
        do
-               var b = new Buffer
+               var b = new FlatBuffer
                b.add c
                while iter.is_ok do
                        c = iter.item