syntax: 'meth' -> 'fun', 'attr' -> 'var'

[nit.git] / src / parser / xss / tokens.xss

diff --git a/src/parser/xss/tokens.xss b/src/parser/xss/tokens.xss
index 9e9f808..ae545eb 100644 (file)
--- a/src/parser/xss/tokens.xss
+++ b/src/parser/xss/tokens.xss
@@ -26,23 +26,25 @@ $ end
 $ end
 class EOF 
 special Token
+private init noinit do end
 end
 class PError
 special EOF
+private init noinit do end
 end
 $ end template
 
 $ template make_tokens()
 
 redef class Token
-    readable writable attr _text: String 
-    readable attr _filename: String 
-    readable attr _line: Int 
-    readable attr _pos: Int 
+    readable writable var _text: String 
+    readable var _filename: String 
+    readable var _line: Int 
+    readable var _pos: Int 
     
-    meth parser_index: Int is abstract
+    fun parser_index: Int is abstract
 
-    redef meth to_s: String do
+    redef fun to_s: String do
         return "'{_text}'"
     end
 end
@@ -50,17 +52,17 @@ end
 $ foreach {//token}
 $ if {@parser_index}    
 redef class @ename
-    redef meth parser_index: Int
+    redef fun parser_index: Int
     do
        return @parser_index
     end
 
 $ if {not(@text)}
-    init(text: String, fname: String, line: Int, pos: Int)
+    init init_tk(text: String, fname: String, line: Int, pos: Int)
     do
         _text = text
 $ else
-    init(fname: String, line: Int, pos: Int)
+    init init_tk(fname: String, line: Int, pos: Int)
     do
         _text = once "${sablecc:string2escaped_unicode(@text)}"
 $ end
@@ -74,7 +76,7 @@ $ end if
 $ end foreach
 
 redef class EOF 
-    redef meth parser_index: Int
+    redef fun parser_index: Int
     do
        return ${tokens/eof/@parser_index}
     end
@@ -89,7 +91,7 @@ redef class EOF
 end
 
 redef class PError
-    readable writable attr _message: String 
+    readable writable var _message: String 
     
     init init_error(fname: String, line: Int, pos: Int, message: String)
     do