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

diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 96d3ea4..614a11e 100644
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -1,6 +1,6 @@
 # Lexer and its tokens.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package lexer
+module lexer
 
 intrude import parser_nodes
 private import tables
@@ -49,7 +49,7 @@ redef class TComment
     end
 end
 
-redef class TKwmodule
+redef class TKwpackage
     redef fun parser_index: Int
     do
 	return 2
@@ -61,7 +61,7 @@ redef class TKwmodule
     end
 end
 
-redef class TKwimport
+redef class TKwmodule
     redef fun parser_index: Int
     do
 	return 3
@@ -73,7 +73,7 @@ redef class TKwimport
     end
 end
 
-redef class TKwclass
+redef class TKwimport
     redef fun parser_index: Int
     do
 	return 4
@@ -85,7 +85,7 @@ redef class TKwclass
     end
 end
 
-redef class TKwabstract
+redef class TKwclass
     redef fun parser_index: Int
     do
 	return 5
@@ -97,7 +97,7 @@ redef class TKwabstract
     end
 end
 
-redef class TKwinterface
+redef class TKwabstract
     redef fun parser_index: Int
     do
 	return 6
@@ -109,7 +109,7 @@ redef class TKwinterface
     end
 end
 
-redef class TKwenum
+redef class TKwinterface
     redef fun parser_index: Int
     do
 	return 7
@@ -121,7 +121,7 @@ redef class TKwenum
     end
 end
 
-redef class TKwend
+redef class TKwenum
     redef fun parser_index: Int
     do
 	return 8
@@ -133,7 +133,7 @@ redef class TKwend
     end
 end
 
-redef class TKwmeth
+redef class TKwend
     redef fun parser_index: Int
     do
 	return 9
@@ -145,7 +145,7 @@ redef class TKwmeth
     end
 end
 
-redef class TKwtype
+redef class TKwmeth
     redef fun parser_index: Int
     do
 	return 10
@@ -157,7 +157,7 @@ redef class TKwtype
     end
 end
 
-redef class TKwinit
+redef class TKwtype
     redef fun parser_index: Int
     do
 	return 11
@@ -169,7 +169,7 @@ redef class TKwinit
     end
 end
 
-redef class TKwredef
+redef class TKwinit
     redef fun parser_index: Int
     do
 	return 12
@@ -181,7 +181,7 @@ redef class TKwredef
     end
 end
 
-redef class TKwis
+redef class TKwredef
     redef fun parser_index: Int
     do
 	return 13
@@ -193,7 +193,7 @@ redef class TKwis
     end
 end
 
-redef class TKwdo
+redef class TKwis
     redef fun parser_index: Int
     do
 	return 14
@@ -205,7 +205,7 @@ redef class TKwdo
     end
 end
 
-redef class TKwreadable
+redef class TKwdo
     redef fun parser_index: Int
     do
 	return 15
@@ -217,7 +217,7 @@ redef class TKwreadable
     end
 end
 
-redef class TKwwritable
+redef class TKwreadable
     redef fun parser_index: Int
     do
 	return 16
@@ -229,7 +229,7 @@ redef class TKwwritable
     end
 end
 
-redef class TKwvar
+redef class TKwwritable
     redef fun parser_index: Int
     do
 	return 17
@@ -241,7 +241,7 @@ redef class TKwvar
     end
 end
 
-redef class TKwintern
+redef class TKwvar
     redef fun parser_index: Int
     do
 	return 18
@@ -253,7 +253,7 @@ redef class TKwintern
     end
 end
 
-redef class TKwextern
+redef class TKwintern
     redef fun parser_index: Int
     do
 	return 19
@@ -265,7 +265,7 @@ redef class TKwextern
     end
 end
 
-redef class TKwprotected
+redef class TKwextern
     redef fun parser_index: Int
     do
 	return 20
@@ -277,7 +277,7 @@ redef class TKwprotected
     end
 end
 
-redef class TKwprivate
+redef class TKwprotected
     redef fun parser_index: Int
     do
 	return 21
@@ -289,7 +289,7 @@ redef class TKwprivate
     end
 end
 
-redef class TKwintrude
+redef class TKwprivate
     redef fun parser_index: Int
     do
 	return 22
@@ -301,7 +301,7 @@ redef class TKwintrude
     end
 end
 
-redef class TKwif
+redef class TKwintrude
     redef fun parser_index: Int
     do
 	return 23
@@ -313,7 +313,7 @@ redef class TKwif
     end
 end
 
-redef class TKwthen
+redef class TKwif
     redef fun parser_index: Int
     do
 	return 24
@@ -325,7 +325,7 @@ redef class TKwthen
     end
 end
 
-redef class TKwelse
+redef class TKwthen
     redef fun parser_index: Int
     do
 	return 25
@@ -337,7 +337,7 @@ redef class TKwelse
     end
 end
 
-redef class TKwwhile
+redef class TKwelse
     redef fun parser_index: Int
     do
 	return 26
@@ -349,7 +349,7 @@ redef class TKwwhile
     end
 end
 
-redef class TKwloop
+redef class TKwwhile
     redef fun parser_index: Int
     do
 	return 27
@@ -361,7 +361,7 @@ redef class TKwloop
     end
 end
 
-redef class TKwfor
+redef class TKwloop
     redef fun parser_index: Int
     do
 	return 28
@@ -373,7 +373,7 @@ redef class TKwfor
     end
 end
 
-redef class TKwin
+redef class TKwfor
     redef fun parser_index: Int
     do
 	return 29
@@ -385,7 +385,7 @@ redef class TKwin
     end
 end
 
-redef class TKwand
+redef class TKwin
     redef fun parser_index: Int
     do
 	return 30
@@ -397,7 +397,7 @@ redef class TKwand
     end
 end
 
-redef class TKwor
+redef class TKwand
     redef fun parser_index: Int
     do
 	return 31
@@ -409,7 +409,7 @@ redef class TKwor
     end
 end
 
-redef class TKwnot
+redef class TKwor
     redef fun parser_index: Int
     do
 	return 32
@@ -421,7 +421,7 @@ redef class TKwnot
     end
 end
 
-redef class TKwreturn
+redef class TKwnot
     redef fun parser_index: Int
     do
 	return 33
@@ -433,7 +433,7 @@ redef class TKwreturn
     end
 end
 
-redef class TKwcontinue
+redef class TKwimplies
     redef fun parser_index: Int
     do
 	return 34
@@ -445,7 +445,7 @@ redef class TKwcontinue
     end
 end
 
-redef class TKwbreak
+redef class TKwreturn
     redef fun parser_index: Int
     do
 	return 35
@@ -457,7 +457,7 @@ redef class TKwbreak
     end
 end
 
-redef class TKwabort
+redef class TKwcontinue
     redef fun parser_index: Int
     do
 	return 36
@@ -469,7 +469,7 @@ redef class TKwabort
     end
 end
 
-redef class TKwassert
+redef class TKwbreak
     redef fun parser_index: Int
     do
 	return 37
@@ -481,7 +481,7 @@ redef class TKwassert
     end
 end
 
-redef class TKwnew
+redef class TKwabort
     redef fun parser_index: Int
     do
 	return 38
@@ -493,7 +493,7 @@ redef class TKwnew
     end
 end
 
-redef class TKwisa
+redef class TKwassert
     redef fun parser_index: Int
     do
 	return 39
@@ -505,7 +505,7 @@ redef class TKwisa
     end
 end
 
-redef class TKwonce
+redef class TKwnew
     redef fun parser_index: Int
     do
 	return 40
@@ -517,7 +517,7 @@ redef class TKwonce
     end
 end
 
-redef class TKwsuper
+redef class TKwisa
     redef fun parser_index: Int
     do
 	return 41
@@ -529,7 +529,7 @@ redef class TKwsuper
     end
 end
 
-redef class TKwself
+redef class TKwonce
     redef fun parser_index: Int
     do
 	return 42
@@ -541,7 +541,7 @@ redef class TKwself
     end
 end
 
-redef class TKwtrue
+redef class TKwsuper
     redef fun parser_index: Int
     do
 	return 43
@@ -553,7 +553,7 @@ redef class TKwtrue
     end
 end
 
-redef class TKwfalse
+redef class TKwself
     redef fun parser_index: Int
     do
 	return 44
@@ -565,7 +565,7 @@ redef class TKwfalse
     end
 end
 
-redef class TKwnull
+redef class TKwtrue
     redef fun parser_index: Int
     do
 	return 45
@@ -577,7 +577,7 @@ redef class TKwnull
     end
 end
 
-redef class TKwas
+redef class TKwfalse
     redef fun parser_index: Int
     do
 	return 46
@@ -589,7 +589,7 @@ redef class TKwas
     end
 end
 
-redef class TKwnullable
+redef class TKwnull
     redef fun parser_index: Int
     do
 	return 47
@@ -601,7 +601,7 @@ redef class TKwnullable
     end
 end
 
-redef class TKwisset
+redef class TKwas
     redef fun parser_index: Int
     do
 	return 48
@@ -613,7 +613,7 @@ redef class TKwisset
     end
 end
 
-redef class TKwlabel
+redef class TKwnullable
     redef fun parser_index: Int
     do
 	return 49
@@ -625,7 +625,7 @@ redef class TKwlabel
     end
 end
 
-redef class TKwdebug
+redef class TKwisset
     redef fun parser_index: Int
     do
 	return 50
@@ -637,7 +637,7 @@ redef class TKwdebug
     end
 end
 
-redef class TOpar
+redef class TKwlabel
     redef fun parser_index: Int
     do
 	return 51
@@ -649,7 +649,7 @@ redef class TOpar
     end
 end
 
-redef class TCpar
+redef class TKwdebug
     redef fun parser_index: Int
     do
 	return 52
@@ -661,7 +661,7 @@ redef class TCpar
     end
 end
 
-redef class TObra
+redef class TOpar
     redef fun parser_index: Int
     do
 	return 53
@@ -673,7 +673,7 @@ redef class TObra
     end
 end
 
-redef class TCbra
+redef class TCpar
     redef fun parser_index: Int
     do
 	return 54
@@ -685,7 +685,7 @@ redef class TCbra
     end
 end
 
-redef class TComma
+redef class TObra
     redef fun parser_index: Int
     do
 	return 55
@@ -697,7 +697,7 @@ redef class TComma
     end
 end
 
-redef class TColumn
+redef class TCbra
     redef fun parser_index: Int
     do
 	return 56
@@ -709,7 +709,7 @@ redef class TColumn
     end
 end
 
-redef class TQuad
+redef class TComma
     redef fun parser_index: Int
     do
 	return 57
@@ -721,7 +721,7 @@ redef class TQuad
     end
 end
 
-redef class TAssign
+redef class TColumn
     redef fun parser_index: Int
     do
 	return 58
@@ -733,7 +733,7 @@ redef class TAssign
     end
 end
 
-redef class TPluseq
+redef class TQuad
     redef fun parser_index: Int
     do
 	return 59
@@ -745,7 +745,7 @@ redef class TPluseq
     end
 end
 
-redef class TMinuseq
+redef class TAssign
     redef fun parser_index: Int
     do
 	return 60
@@ -757,7 +757,7 @@ redef class TMinuseq
     end
 end
 
-redef class TDotdotdot
+redef class TPluseq
     redef fun parser_index: Int
     do
 	return 61
@@ -769,7 +769,7 @@ redef class TDotdotdot
     end
 end
 
-redef class TDotdot
+redef class TMinuseq
     redef fun parser_index: Int
     do
 	return 62
@@ -781,7 +781,7 @@ redef class TDotdot
     end
 end
 
-redef class TDot
+redef class TDotdotdot
     redef fun parser_index: Int
     do
 	return 63
@@ -793,7 +793,7 @@ redef class TDot
     end
 end
 
-redef class TPlus
+redef class TDotdot
     redef fun parser_index: Int
     do
 	return 64
@@ -805,7 +805,7 @@ redef class TPlus
     end
 end
 
-redef class TMinus
+redef class TDot
     redef fun parser_index: Int
     do
 	return 65
@@ -817,7 +817,7 @@ redef class TMinus
     end
 end
 
-redef class TStar
+redef class TPlus
     redef fun parser_index: Int
     do
 	return 66
@@ -829,7 +829,7 @@ redef class TStar
     end
 end
 
-redef class TSlash
+redef class TMinus
     redef fun parser_index: Int
     do
 	return 67
@@ -841,7 +841,7 @@ redef class TSlash
     end
 end
 
-redef class TPercent
+redef class TStar
     redef fun parser_index: Int
     do
 	return 68
@@ -853,7 +853,7 @@ redef class TPercent
     end
 end
 
-redef class TEq
+redef class TSlash
     redef fun parser_index: Int
     do
 	return 69
@@ -865,7 +865,7 @@ redef class TEq
     end
 end
 
-redef class TNe
+redef class TPercent
     redef fun parser_index: Int
     do
 	return 70
@@ -877,7 +877,7 @@ redef class TNe
     end
 end
 
-redef class TLt
+redef class TEq
     redef fun parser_index: Int
     do
 	return 71
@@ -889,7 +889,7 @@ redef class TLt
     end
 end
 
-redef class TLe
+redef class TNe
     redef fun parser_index: Int
     do
 	return 72
@@ -901,7 +901,7 @@ redef class TLe
     end
 end
 
-redef class TLl
+redef class TLt
     redef fun parser_index: Int
     do
 	return 73
@@ -913,7 +913,7 @@ redef class TLl
     end
 end
 
-redef class TGt
+redef class TLe
     redef fun parser_index: Int
     do
 	return 74
@@ -925,7 +925,7 @@ redef class TGt
     end
 end
 
-redef class TGe
+redef class TLl
     redef fun parser_index: Int
     do
 	return 75
@@ -937,7 +937,7 @@ redef class TGe
     end
 end
 
-redef class TGg
+redef class TGt
     redef fun parser_index: Int
     do
 	return 76
@@ -949,7 +949,7 @@ redef class TGg
     end
 end
 
-redef class TStarship
+redef class TGe
     redef fun parser_index: Int
     do
 	return 77
@@ -961,7 +961,7 @@ redef class TStarship
     end
 end
 
-redef class TBang
+redef class TGg
     redef fun parser_index: Int
     do
 	return 78
@@ -973,7 +973,7 @@ redef class TBang
     end
 end
 
-redef class TAt
+redef class TStarship
     redef fun parser_index: Int
     do
 	return 79
@@ -985,7 +985,7 @@ redef class TAt
     end
 end
 
-redef class TClassid
+redef class TBang
     redef fun parser_index: Int
     do
 	return 80
@@ -997,7 +997,7 @@ redef class TClassid
     end
 end
 
-redef class TId
+redef class TAt
     redef fun parser_index: Int
     do
 	return 81
@@ -1009,7 +1009,7 @@ redef class TId
     end
 end
 
-redef class TAttrid
+redef class TClassid
     redef fun parser_index: Int
     do
 	return 82
@@ -1021,7 +1021,7 @@ redef class TAttrid
     end
 end
 
-redef class TNumber
+redef class TId
     redef fun parser_index: Int
     do
 	return 83
@@ -1033,7 +1033,7 @@ redef class TNumber
     end
 end
 
-redef class TFloat
+redef class TAttrid
     redef fun parser_index: Int
     do
 	return 84
@@ -1045,7 +1045,7 @@ redef class TFloat
     end
 end
 
-redef class TString
+redef class TNumber
     redef fun parser_index: Int
     do
 	return 85
@@ -1057,7 +1057,7 @@ redef class TString
     end
 end
 
-redef class TStartString
+redef class TFloat
     redef fun parser_index: Int
     do
 	return 86
@@ -1069,7 +1069,7 @@ redef class TStartString
     end
 end
 
-redef class TMidString
+redef class TString
     redef fun parser_index: Int
     do
 	return 87
@@ -1081,7 +1081,7 @@ redef class TMidString
     end
 end
 
-redef class TEndString
+redef class TStartString
     redef fun parser_index: Int
     do
 	return 88
@@ -1093,7 +1093,7 @@ redef class TEndString
     end
 end
 
-redef class TChar
+redef class TMidString
     redef fun parser_index: Int
     do
 	return 89
@@ -1105,7 +1105,7 @@ redef class TChar
     end
 end
 
-redef class TBadString
+redef class TEndString
     redef fun parser_index: Int
     do
 	return 90
@@ -1117,7 +1117,7 @@ redef class TBadString
     end
 end
 
-redef class TBadChar
+redef class TChar
     redef fun parser_index: Int
     do
 	return 91
@@ -1129,7 +1129,7 @@ redef class TBadChar
     end
 end
 
-redef class TExternCodeSegment
+redef class TBadString
     redef fun parser_index: Int
     do
 	return 92
@@ -1141,11 +1141,35 @@ redef class TExternCodeSegment
     end
 end
 
+redef class TBadChar
+    redef fun parser_index: Int
+    do
+	return 93
+    end
+
+    init init_tk(loc: Location)
+    do
+		_location = loc
+    end
+end
+
+redef class TExternCodeSegment
+    redef fun parser_index: Int
+    do
+	return 94
+    end
+
+    init init_tk(loc: Location)
+    do
+		_location = loc
+    end
+end
+
 
 redef class EOF
     redef fun parser_index: Int
     do
-	return 93
+	return 95
     end
 
     init init_tk(loc: Location)
@@ -1273,7 +1297,7 @@ class Lexer
 			if sp >= string_len then
 				dfa_state = -1
 			else
-				var c = string[sp].ascii
+				var c = string.chars[sp].ascii
 				sp += 1
 
 				var cr = _cr
@@ -1357,276 +1381,282 @@ class Lexer
 						return new TComment.init_tk(location)
 					end
 					if accept_token == 3 then
-						return new TKwmodule.init_tk(location)
+						return new TKwpackage.init_tk(location)
 					end
 					if accept_token == 4 then
-						return new TKwimport.init_tk(location)
+						return new TKwmodule.init_tk(location)
 					end
 					if accept_token == 5 then
-						return new TKwclass.init_tk(location)
+						return new TKwimport.init_tk(location)
 					end
 					if accept_token == 6 then
-						return new TKwabstract.init_tk(location)
+						return new TKwclass.init_tk(location)
 					end
 					if accept_token == 7 then
-						return new TKwinterface.init_tk(location)
+						return new TKwabstract.init_tk(location)
 					end
 					if accept_token == 8 then
-						return new TKwenum.init_tk(location)
+						return new TKwinterface.init_tk(location)
 					end
 					if accept_token == 9 then
-						return new TKwend.init_tk(location)
+						return new TKwenum.init_tk(location)
 					end
 					if accept_token == 10 then
-						return new TKwmeth.init_tk(location)
+						return new TKwend.init_tk(location)
 					end
 					if accept_token == 11 then
-						return new TKwtype.init_tk(location)
+						return new TKwmeth.init_tk(location)
 					end
 					if accept_token == 12 then
-						return new TKwinit.init_tk(location)
+						return new TKwtype.init_tk(location)
 					end
 					if accept_token == 13 then
-						return new TKwredef.init_tk(location)
+						return new TKwinit.init_tk(location)
 					end
 					if accept_token == 14 then
-						return new TKwis.init_tk(location)
+						return new TKwredef.init_tk(location)
 					end
 					if accept_token == 15 then
-						return new TKwdo.init_tk(location)
+						return new TKwis.init_tk(location)
 					end
 					if accept_token == 16 then
-						return new TKwreadable.init_tk(location)
+						return new TKwdo.init_tk(location)
 					end
 					if accept_token == 17 then
-						return new TKwwritable.init_tk(location)
+						return new TKwreadable.init_tk(location)
 					end
 					if accept_token == 18 then
-						return new TKwvar.init_tk(location)
+						return new TKwwritable.init_tk(location)
 					end
 					if accept_token == 19 then
-						return new TKwintern.init_tk(location)
+						return new TKwvar.init_tk(location)
 					end
 					if accept_token == 20 then
-						return new TKwextern.init_tk(location)
+						return new TKwintern.init_tk(location)
 					end
 					if accept_token == 21 then
-						return new TKwprotected.init_tk(location)
+						return new TKwextern.init_tk(location)
 					end
 					if accept_token == 22 then
-						return new TKwprivate.init_tk(location)
+						return new TKwprotected.init_tk(location)
 					end
 					if accept_token == 23 then
-						return new TKwintrude.init_tk(location)
+						return new TKwprivate.init_tk(location)
 					end
 					if accept_token == 24 then
-						return new TKwif.init_tk(location)
+						return new TKwintrude.init_tk(location)
 					end
 					if accept_token == 25 then
-						return new TKwthen.init_tk(location)
+						return new TKwif.init_tk(location)
 					end
 					if accept_token == 26 then
-						return new TKwelse.init_tk(location)
+						return new TKwthen.init_tk(location)
 					end
 					if accept_token == 27 then
-						return new TKwwhile.init_tk(location)
+						return new TKwelse.init_tk(location)
 					end
 					if accept_token == 28 then
-						return new TKwloop.init_tk(location)
+						return new TKwwhile.init_tk(location)
 					end
 					if accept_token == 29 then
-						return new TKwfor.init_tk(location)
+						return new TKwloop.init_tk(location)
 					end
 					if accept_token == 30 then
-						return new TKwin.init_tk(location)
+						return new TKwfor.init_tk(location)
 					end
 					if accept_token == 31 then
-						return new TKwand.init_tk(location)
+						return new TKwin.init_tk(location)
 					end
 					if accept_token == 32 then
-						return new TKwor.init_tk(location)
+						return new TKwand.init_tk(location)
 					end
 					if accept_token == 33 then
-						return new TKwnot.init_tk(location)
+						return new TKwor.init_tk(location)
 					end
 					if accept_token == 34 then
-						return new TKwreturn.init_tk(location)
+						return new TKwnot.init_tk(location)
 					end
 					if accept_token == 35 then
-						return new TKwcontinue.init_tk(location)
+						return new TKwimplies.init_tk(location)
 					end
 					if accept_token == 36 then
-						return new TKwbreak.init_tk(location)
+						return new TKwreturn.init_tk(location)
 					end
 					if accept_token == 37 then
-						return new TKwabort.init_tk(location)
+						return new TKwcontinue.init_tk(location)
 					end
 					if accept_token == 38 then
-						return new TKwassert.init_tk(location)
+						return new TKwbreak.init_tk(location)
 					end
 					if accept_token == 39 then
-						return new TKwnew.init_tk(location)
+						return new TKwabort.init_tk(location)
 					end
 					if accept_token == 40 then
-						return new TKwisa.init_tk(location)
+						return new TKwassert.init_tk(location)
 					end
 					if accept_token == 41 then
-						return new TKwonce.init_tk(location)
+						return new TKwnew.init_tk(location)
 					end
 					if accept_token == 42 then
-						return new TKwsuper.init_tk(location)
+						return new TKwisa.init_tk(location)
 					end
 					if accept_token == 43 then
-						return new TKwself.init_tk(location)
+						return new TKwonce.init_tk(location)
 					end
 					if accept_token == 44 then
-						return new TKwtrue.init_tk(location)
+						return new TKwsuper.init_tk(location)
 					end
 					if accept_token == 45 then
-						return new TKwfalse.init_tk(location)
+						return new TKwself.init_tk(location)
 					end
 					if accept_token == 46 then
-						return new TKwnull.init_tk(location)
+						return new TKwtrue.init_tk(location)
 					end
 					if accept_token == 47 then
-						return new TKwas.init_tk(location)
+						return new TKwfalse.init_tk(location)
 					end
 					if accept_token == 48 then
-						return new TKwnullable.init_tk(location)
+						return new TKwnull.init_tk(location)
 					end
 					if accept_token == 49 then
-						return new TKwisset.init_tk(location)
+						return new TKwas.init_tk(location)
 					end
 					if accept_token == 50 then
-						return new TKwlabel.init_tk(location)
+						return new TKwnullable.init_tk(location)
 					end
 					if accept_token == 51 then
-						return new TKwdebug.init_tk(location)
+						return new TKwisset.init_tk(location)
 					end
 					if accept_token == 52 then
-						return new TOpar.init_tk(location)
+						return new TKwlabel.init_tk(location)
 					end
 					if accept_token == 53 then
-						return new TCpar.init_tk(location)
+						return new TKwdebug.init_tk(location)
 					end
 					if accept_token == 54 then
-						return new TObra.init_tk(location)
+						return new TOpar.init_tk(location)
 					end
 					if accept_token == 55 then
-						return new TCbra.init_tk(location)
+						return new TCpar.init_tk(location)
 					end
 					if accept_token == 56 then
-						return new TComma.init_tk(location)
+						return new TObra.init_tk(location)
 					end
 					if accept_token == 57 then
-						return new TColumn.init_tk(location)
+						return new TCbra.init_tk(location)
 					end
 					if accept_token == 58 then
-						return new TQuad.init_tk(location)
+						return new TComma.init_tk(location)
 					end
 					if accept_token == 59 then
-						return new TAssign.init_tk(location)
+						return new TColumn.init_tk(location)
 					end
 					if accept_token == 60 then
-						return new TPluseq.init_tk(location)
+						return new TQuad.init_tk(location)
 					end
 					if accept_token == 61 then
-						return new TMinuseq.init_tk(location)
+						return new TAssign.init_tk(location)
 					end
 					if accept_token == 62 then
-						return new TDotdotdot.init_tk(location)
+						return new TPluseq.init_tk(location)
 					end
 					if accept_token == 63 then
-						return new TDotdot.init_tk(location)
+						return new TMinuseq.init_tk(location)
 					end
 					if accept_token == 64 then
-						return new TDot.init_tk(location)
+						return new TDotdotdot.init_tk(location)
 					end
 					if accept_token == 65 then
-						return new TPlus.init_tk(location)
+						return new TDotdot.init_tk(location)
 					end
 					if accept_token == 66 then
-						return new TMinus.init_tk(location)
+						return new TDot.init_tk(location)
 					end
 					if accept_token == 67 then
-						return new TStar.init_tk(location)
+						return new TPlus.init_tk(location)
 					end
 					if accept_token == 68 then
-						return new TSlash.init_tk(location)
+						return new TMinus.init_tk(location)
 					end
 					if accept_token == 69 then
-						return new TPercent.init_tk(location)
+						return new TStar.init_tk(location)
 					end
 					if accept_token == 70 then
-						return new TEq.init_tk(location)
+						return new TSlash.init_tk(location)
 					end
 					if accept_token == 71 then
-						return new TNe.init_tk(location)
+						return new TPercent.init_tk(location)
 					end
 					if accept_token == 72 then
-						return new TLt.init_tk(location)
+						return new TEq.init_tk(location)
 					end
 					if accept_token == 73 then
-						return new TLe.init_tk(location)
+						return new TNe.init_tk(location)
 					end
 					if accept_token == 74 then
-						return new TLl.init_tk(location)
+						return new TLt.init_tk(location)
 					end
 					if accept_token == 75 then
-						return new TGt.init_tk(location)
+						return new TLe.init_tk(location)
 					end
 					if accept_token == 76 then
-						return new TGe.init_tk(location)
+						return new TLl.init_tk(location)
 					end
 					if accept_token == 77 then
-						return new TGg.init_tk(location)
+						return new TGt.init_tk(location)
 					end
 					if accept_token == 78 then
-						return new TStarship.init_tk(location)
+						return new TGe.init_tk(location)
 					end
 					if accept_token == 79 then
-						return new TBang.init_tk(location)
+						return new TGg.init_tk(location)
 					end
 					if accept_token == 80 then
-						return new TAt.init_tk(location)
+						return new TStarship.init_tk(location)
 					end
 					if accept_token == 81 then
-						return new TClassid.init_tk(location)
+						return new TBang.init_tk(location)
 					end
 					if accept_token == 82 then
-						return new TId.init_tk(location)
+						return new TAt.init_tk(location)
 					end
 					if accept_token == 83 then
-						return new TAttrid.init_tk(location)
+						return new TClassid.init_tk(location)
 					end
 					if accept_token == 84 then
-						return new TNumber.init_tk(location)
+						return new TId.init_tk(location)
 					end
 					if accept_token == 85 then
-						return new TFloat.init_tk(location)
+						return new TAttrid.init_tk(location)
 					end
 					if accept_token == 86 then
-						return new TString.init_tk(location)
+						return new TNumber.init_tk(location)
 					end
 					if accept_token == 87 then
-						return new TStartString.init_tk(location)
+						return new TFloat.init_tk(location)
 					end
 					if accept_token == 88 then
-						return new TMidString.init_tk(location)
+						return new TString.init_tk(location)
 					end
 					if accept_token == 89 then
-						return new TEndString.init_tk(location)
+						return new TStartString.init_tk(location)
 					end
 					if accept_token == 90 then
-						return new TChar.init_tk(location)
+						return new TMidString.init_tk(location)
 					end
 					if accept_token == 91 then
-						return new TBadString.init_tk(location)
+						return new TEndString.init_tk(location)
 					end
 					if accept_token == 92 then
-						return new TBadChar.init_tk(location)
+						return new TChar.init_tk(location)
 					end
 					if accept_token == 93 then
+						return new TBadString.init_tk(location)
+					end
+					if accept_token == 94 then
+						return new TBadChar.init_tk(location)
+					end
+					if accept_token == 95 then
 						return new TExternCodeSegment.init_tk(location)
 					end
 				else