typing: introduce SignatureMap to factorize parameters<->arguments mapping work

[nit.git] / src / parser / parser_abs.nit

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index bc9b980..f2917d4 100644 (file)
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -154,6 +154,9 @@ end
 class TKwlabel
        super Token
 end
 class TKwlabel
        super Token
 end

+class TKwwith
+       super Token
+end

 class TKwdebug
        super Token
 end
 class TKwdebug
        super Token
 end

@@ -187,6 +190,24 @@ end
 class TMinuseq
        super Token
 end
 class TMinuseq
        super Token
 end

+class TStareq
+       super Token
+end
+class TSlasheq
+       super Token
+end
+class TPercenteq
+       super Token
+end
+class TStarstareq
+       super Token
+end
+class TLleq
+       super Token
+end
+class TGgeq
+       super Token
+end

 class TDotdotdot
        super Token
 end
 class TDotdotdot
        super Token
 end

@@ -309,7 +330,6 @@ class AVisibility super Prod end
 class AClassdef super Prod end
 class AClasskind super Prod end
 class AFormaldef super Prod end
 class AClassdef super Prod end
 class AClasskind super Prod end
 class AFormaldef super Prod end

-class ASuperclass super Prod end

 class APropdef super Prod end
 class AMethid super Prod end
 class ASignature super Prod end
 class APropdef super Prod end
 class AMethid super Prod end
 class ASignature super Prod end

@@ -383,9 +403,7 @@ class AStdClassdef
        var n_classkind: AClasskind is writable, noinit
        var n_id: nullable TClassid = null is writable
        var n_formaldefs: List[AFormaldef] = new List[AFormaldef]
        var n_classkind: AClasskind is writable, noinit
        var n_id: nullable TClassid = null is writable
        var n_formaldefs: List[AFormaldef] = new List[AFormaldef]

-       var n_annotations: nullable AAnnotations = null is writable

        var n_extern_code_block: nullable AExternCodeBlock = null is writable
        var n_extern_code_block: nullable AExternCodeBlock = null is writable

-       var n_superclasses: List[ASuperclass] = new List[ASuperclass]

        var n_propdefs: List[APropdef] = new List[APropdef]
        var n_kwend: TKwend is writable, noinit
 end
        var n_propdefs: List[APropdef] = new List[APropdef]
        var n_kwend: TKwend is writable, noinit
 end

@@ -425,12 +443,6 @@ class AFormaldef
        var n_type: nullable AType = null is writable
        var n_annotations: nullable AAnnotations = null is writable
 end
        var n_type: nullable AType = null is writable
        var n_annotations: nullable AAnnotations = null is writable
 end

-class ASuperclass
-       super ASuperclass
-       var n_kwsuper: TKwsuper is writable, noinit
-       var n_type: AType is writable, noinit
-       var n_annotations: nullable AAnnotations = null is writable
-end

 class AAttrPropdef
        super APropdef
        var n_doc: nullable ADoc = null is writable
 class AAttrPropdef
        super APropdef
        var n_doc: nullable ADoc = null is writable

@@ -473,6 +485,26 @@ class AMethPropdef
        var n_extern_code_block: nullable AExternCodeBlock = null is writable
        var n_block: nullable AExpr = null is writable
 end
        var n_extern_code_block: nullable AExternCodeBlock = null is writable
        var n_block: nullable AExpr = null is writable
 end

+class ASuperPropdef
+       super APropdef
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwsuper: TKwsuper is writable, noinit
+       var n_type: AType is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
+end
+class AAnnotPropdef
+       super APropdef
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: nullable AVisibility = null is writable
+       var n_atid: AAtid is writable, noinit
+       var n_opar: nullable TOpar = null is writable
+       var n_args: List[AExpr] = new List[AExpr]
+       var n_cpar: nullable TCpar = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
+end

 class AIdMethid
        super AMethid
        var n_id: TId is writable, noinit
 class AIdMethid
        super AMethid
        var n_id: TId is writable, noinit

@@ -586,7 +618,7 @@ class ABlockExpr
 end
 class AVardeclExpr
        super AExpr
 end
 class AVardeclExpr
        super AExpr

-       var n_kwvar: TKwvar is writable, noinit
+       var n_kwvar: nullable TKwvar = null is writable

        var n_id: TId is writable, noinit
        var n_type: nullable AType = null is writable
        var n_assign: nullable TAssign = null is writable
        var n_id: TId is writable, noinit
        var n_type: nullable AType = null is writable
        var n_assign: nullable TAssign = null is writable

@@ -657,6 +689,14 @@ class AForExpr
        var n_block: nullable AExpr = null is writable
        var n_label: nullable ALabel = null is writable
 end
        var n_block: nullable AExpr = null is writable
        var n_label: nullable ALabel = null is writable
 end

+class AWithExpr
+       super AExpr
+       var n_kwwith: TKwwith is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
+       var n_label: nullable ALabel = null is writable
+end

 class AAssertExpr
        super AExpr
        var n_kwassert: TKwassert is writable, noinit
 class AAssertExpr
        super AExpr
        var n_kwassert: TKwassert is writable, noinit

@@ -681,21 +721,26 @@ end
 class AOrExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
 class AOrExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TKwor is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AAndExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AAndExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TKwand is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AOrElseExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AOrElseExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TKwor is writable, noinit
+       var n_kwelse: TKwelse is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AImpliesExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AImpliesExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TKwimplies is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ANotExpr
        var n_expr2: AExpr is writable, noinit
 end
 class ANotExpr

@@ -706,81 +751,97 @@ end
 class AEqExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
 class AEqExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TEq is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ANeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class ANeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TNe is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ALtExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class ALtExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TLt is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ALeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class ALeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TLe is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ALlExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class ALlExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TLl is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AGtExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AGtExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TGt is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AGeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AGeExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TGe is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AGgExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AGgExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TGg is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AIsaExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AIsaExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_kwisa: TKwisa is writable, noinit

        var n_type: AType is writable, noinit
 end
 class APlusExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_type: AType is writable, noinit
 end
 class APlusExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TPlus is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AMinusExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AMinusExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TMinus is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AStarshipExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AStarshipExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TStarship is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AStarExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AStarExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TStar is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AStarstarExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class AStarstarExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TStarstar is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class ASlashExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class ASlashExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TSlash is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class APercentExpr
        super AExpr
        var n_expr: AExpr is writable, noinit
        var n_expr2: AExpr is writable, noinit
 end
 class APercentExpr
        super AExpr
        var n_expr: AExpr is writable, noinit

+       var n_op: TPercent is writable, noinit

        var n_expr2: AExpr is writable, noinit
 end
 class AUminusExpr
        var n_expr2: AExpr is writable, noinit
 end
 class AUminusExpr

@@ -788,6 +849,11 @@ class AUminusExpr
        var n_minus: TMinus is writable, noinit
        var n_expr: AExpr is writable, noinit
 end
        var n_minus: TMinus is writable, noinit
        var n_expr: AExpr is writable, noinit
 end

+class AUplusExpr
+       super AExpr
+       var n_plus: TPlus is writable, noinit
+       var n_expr: AExpr is writable, noinit
+end

 class ANewExpr
        super AExpr
        var n_kwnew: TKwnew is writable, noinit
 class ANewExpr
        super AExpr
        var n_kwnew: TKwnew is writable, noinit

@@ -1055,11 +1121,35 @@ class ABraExprs
 end
 class APlusAssignOp
        super AAssignOp
 end
 class APlusAssignOp
        super AAssignOp

-       var n_pluseq: TPluseq is writable, noinit
+       var n_op: TPluseq is writable, noinit

 end
 class AMinusAssignOp
        super AAssignOp
 end
 class AMinusAssignOp
        super AAssignOp

-       var n_minuseq: TMinuseq is writable, noinit
+       var n_op: TMinuseq is writable, noinit
+end
+class AStarAssignOp
+       super AAssignOp
+       var n_op: TStareq is writable, noinit
+end
+class ASlashAssignOp
+       super AAssignOp
+       var n_op: TSlasheq is writable, noinit
+end
+class APercentAssignOp
+       super AAssignOp
+       var n_op: TPercenteq is writable, noinit
+end
+class AStarstarAssignOp
+       super AAssignOp
+       var n_op: TStarstareq is writable, noinit
+end
+class ALlAssignOp
+       super AAssignOp
+       var n_op: TLleq is writable, noinit
+end
+class AGgAssignOp
+       super AAssignOp
+       var n_op: TGgeq is writable, noinit

 end
 class AModuleName
        super AModuleName
 end
 class AModuleName
        super AModuleName