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

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 2a2298e..261694a 100644
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -203,6 +203,7 @@ class ANodes[E: ANode]
 	private var parent: ANode
 	private var items = new Array[E]
 	redef fun iterator do return items.iterator
+	redef fun reverse_iterator do return items.reverse_iterator
 	redef fun length do return items.length
 	redef fun is_empty do return items.is_empty
 	redef fun push(e)
@@ -311,6 +312,35 @@ abstract class Token
 	# May have disappeared in the AST
 	var next_token: nullable Token = null
 
+	# Is `self` a token discarded from the AST?
+	#
+	# Loose tokens are not present in the AST.
+	# It means they were identified by the lexer but were discarded by the parser.
+	# It also means that they are not visited or manipulated by AST-related functions.
+	#
+	# Each loose token is attached to the non-loose token that precedes or follows it.
+	# The rules are the following:
+	#
+	# * tokens that follow a non-loose token on a same line are attached to it.
+	#   See `next_looses`.
+	# * other tokens, thus that precede a non-loose token on the same line or the next one,
+	# are attached to this one. See `prev_looses`.
+	#
+	# Loose tokens are mostly end of lines (`TEol`) and comments (`TComment`).
+	# Whitespace are ignored by the lexer, so they are not even considered as loose tokens.
+	# See `blank_before` to get the whitespace that separate tokens.
+	var is_loose = false
+
+	# Loose tokens that precede `self`.
+	#
+	# These tokens start the line or belong to a line with only loose tokens.
+	var prev_looses = new Array[Token] is lazy
+
+	# Loose tokens that follow `self`
+	#
+	# These tokens are on the same line than `self`.
+	var next_looses = new Array[Token] is lazy
+
 	# The verbatim blank text between `prev_token` and `self`
 	fun blank_before: String
 	do
@@ -491,6 +521,11 @@ class TKwdo
 	super TokenKeyword
 end
 
+# The keyword `catch`
+class TKwcatch
+	super TokenKeyword
+end
+
 # The keyword `var`
 class TKwvar
 	super TokenKeyword
@@ -666,6 +701,11 @@ class TKwwith
 	super TokenKeyword
 end
 
+# The keyword `yield`
+class TKwyield
+	super TokenKeyword
+end
+
 # The special keyword `__DEBUG__`
 class TKwdebug
 	super Token
@@ -936,23 +976,8 @@ abstract class TokenLiteral
 	end
 end
 
-# A literal decimal integer
-class TNumber
-	super TokenLiteral
-end
-
-# A literal hexadecimal integer
-class THexNumber
-	super TokenLiteral
-end
-
-# A literal binary integer
-class TBinNumber
-	super TokenLiteral
-end
-
-# A literal octal integer
-class TOctNumber
+# A literal integer
+class TInteger
 	super TokenLiteral
 end
 
@@ -1111,7 +1136,7 @@ end
 class APublicVisibility
 	super AVisibility
 	# The `public` keyword, if any
-	var n_kwpublic: nullable TKwpublic is writable
+	var n_kwpublic: nullable TKwpublic = null is writable
 end
 # An explicit private visibility modifier
 class APrivateVisibility
@@ -1150,7 +1175,7 @@ class AStdClassdef
 	var n_classkind: AClasskind is writable, noinit
 
 	# The name of the class
-	var n_id: nullable TClassid = null is writable
+	var n_qid: nullable AQclassid = null is writable
 
 	# The `[` symbol
 	var n_obra: nullable TObra = null is writable
@@ -1171,7 +1196,7 @@ class AStdClassdef
 		return [for d in n_propdefs do if d isa ASuperPropdef then d]
 	end
 
-	redef fun hot_location do return n_id.location
+	redef fun hot_location do return n_qid.location
 end
 
 # The implicit class definition of the implicit main method
@@ -1476,7 +1501,7 @@ class ATypePropdef
 	var n_kwtype: TKwtype is writable, noinit
 
 	# The name of the virtual type
-	var n_id: TClassid is writable, noinit
+	var n_qid: AQclassid is writable, noinit
 
 	# The bound of the virtual type
 	var n_type: AType is writable, noinit
@@ -1634,6 +1659,26 @@ class ABraassignMethid
 	var n_assign: TAssign is writable, noinit
 end
 
+# A potentially qualified simple identifier `foo::bar::baz`
+class AQid
+	super Prod
+	# The qualifier, if any
+	var n_qualified: nullable AQualified = null is writable
+
+	# The final identifier
+	var n_id: TId is writable, noinit
+end
+
+# A potentially qualified class identifier `foo::bar::Baz`
+class AQclassid
+	super Prod
+	# The qualifier, if any
+	var n_qualified: nullable AQualified = null is writable
+
+	# The final identifier
+	var n_id: TClassid is writable, noinit
+end
+
 # A signature in a method definition. eg `(x,y:X,z:Z):T`
 class ASignature
 	super Prod
@@ -1672,7 +1717,7 @@ class AType
 	var n_kwnullable: nullable TKwnullable = null is writable
 
 	# The name of the class or of the formal type
-	var n_id: TClassid is writable, noinit
+	var n_qid: AQclassid is writable, noinit
 
 	# The opening bracket
 	var n_obra: nullable TObra = null is writable
@@ -1736,10 +1781,18 @@ end
 
 # A `return` statement. eg `return x`
 class AReturnExpr
-	super AExpr
+	super AEscapeExpr
 
 	# The `return` keyword
 	var n_kwreturn: nullable TKwreturn = null is writable
+end
+
+# A `yield` statement. eg `yield x`
+class AYieldExpr
+	super AExpr
+
+	# The `yield` keyword
+	var n_kwyield: nullable TKwyield = null is writable
 
 	# The return value, if any
 	var n_expr: nullable AExpr = null is writable
@@ -1796,6 +1849,12 @@ class ADoExpr
 
 	# The list of statements of the `do`.
 	var n_block: nullable AExpr = null is writable
+
+	# The `catch` keyword
+	var n_kwcatch: nullable TKwcatch = null is writable
+
+	# The do catch block
+	var n_catch: nullable AExpr = null is writable
 end
 
 # A `if` statement
@@ -1882,6 +1941,23 @@ class AForExpr
 	# The `for` keyword
 	var n_kwfor: TKwfor is writable, noinit
 
+	# The list of groups to iterate
+	var n_groups = new ANodes[AForGroup](self)
+
+	# The `do` keyword
+	var n_kwdo: TKwdo is writable, noinit
+
+	# The body of the loop
+	var n_block: nullable AExpr = null is writable
+end
+
+# A collection iterated by a for, its automatic variables and its implicit iterator.
+#
+# Standard `for` iterate on a single collection.
+# Multiple `for` can iterate on more than one collection at once.
+class AForGroup
+	super Prod
+
 	# The list of name of the automatic variables
 	var n_ids = new ANodes[TId](self)
 
@@ -1890,12 +1966,6 @@ class AForExpr
 
 	# The expression used as the collection to iterate on
 	var n_expr: AExpr is writable, noinit
-
-	# The `do` keyword
-	var n_kwdo: TKwdo is writable, noinit
-
-	# The body of the loop
-	var n_block: nullable AExpr = null is writable
 end
 
 # A `with` statement
@@ -2045,15 +2115,22 @@ class ANotExpr
 	var n_expr: AExpr is writable, noinit
 end
 
+# A `==` or a `!=` expression
+#
+# Both have a similar effect on adaptive typing, so this class factorizes the common behavior.
+class AEqFormExpr
+	super ABinopExpr
+end
+
 # A `==` expression
 class AEqExpr
-	super ABinopExpr
+	super AEqFormExpr
 	redef fun operator do return "=="
 end
 
 # A `!=` expression
 class ANeExpr
-	super ABinopExpr
+	super AEqFormExpr
 	redef fun operator do return "!="
 end
 
@@ -2168,7 +2245,7 @@ class AAmpExpr
 end
 
 # A unary operation on a method
-class AUnaryopExpr
+abstract class AUnaryopExpr
 	super ASendExpr
 
 	# The operator
@@ -2207,7 +2284,7 @@ class ANewExpr
 	var n_type: AType is writable, noinit
 
 	# The name of the named-constructor, if any
-	var n_id: nullable TId = null is writable
+	var n_qid: nullable AQid = null is writable
 
 	# The arguments of the `new`
 	var n_args: AExprs is writable, noinit
@@ -2241,7 +2318,7 @@ abstract class ACallFormExpr
 	super ASendExpr
 
 	# The name of the method
-	var n_id: TId is writable, noinit
+	var n_qid: AQid is writable, noinit
 
 	# The arguments of the call
 	var n_args: AExprs is writable, noinit
@@ -2452,40 +2529,11 @@ class ANullExpr
 end
 
 # An integer literal
-class AIntExpr
+class AIntegerExpr
 	super AExpr
-end
-
-# An integer literal in decimal format
-class ADecIntExpr
-	super AIntExpr
-
-	# The decimal token
-	var n_number: TNumber is writable, noinit
-end
-
-# An integer literal in hexadecimal format
-class AHexIntExpr
-	super AIntExpr
-
-	# The hexadecimal token
-	var n_hex_number: THexNumber is writable, noinit
-end
-
-# An integer literal in binary format
-class ABinIntExpr
-	super AIntExpr
-
-	# The binary token
-	var n_bin_number: TBinNumber is writable, noinit
-end
-
-# An integer literal in octal format
-class AOctIntExpr
-	super AIntExpr
 
-	# The octal token
-	var n_oct_number: TOctNumber is writable, noinit
+	# The integer token
+	var n_integer: TInteger is writable, noinit
 end
 
 # A float literal
@@ -2808,7 +2856,7 @@ class AModuleName
 	# The starting quad (`::`)
 	var n_quad: nullable TQuad = null is writable
 
-	# The list of quad-separated project/group identifiers
+	# The list of quad-separated package/group identifiers
 	var n_path = new ANodes[TId](self)
 
 	# The final module identifier
@@ -2844,7 +2892,7 @@ class AQualified
 	# The starting quad (`::`)
 	var n_quad: nullable TQuad = null is writable
 
-	# The list of quad-separated project/group/module identifiers
+	# The list of quad-separated package/group/module identifiers
 	var n_id = new ANodes[TId](self)
 
 	# A class identifier