astbuilder: Make the construction of the `AMethPropdef` more generic
[nit.git] / src / astbuilder.nit
index 8e17b4e..36f157f 100644 (file)
 module astbuilder
 
 intrude import semantize::typing
-intrude import semantize::literal
-intrude import semantize::parser
+intrude import literal
+intrude import parser
 intrude import semantize::scope
 
 # General factory to build semantic nodes in the AST of expressions
 class ASTBuilder
        # The module used as reference for the building
-       # It is used to gather types and other stufs
+       # It is used to gather types and other stuff
        var mmodule: MModule
 
        # The anchor used for some mechanism relying on types
        var anchor: nullable MClassType
 
+       # Check mmodule to avoid a new instantiation of ASTBuilder
+       fun check_mmodule(mmodule: MModule)
+       do
+               if self.mmodule != mmodule then self.mmodule = mmodule
+       end
+
        # Make a new Int literal
-       fun make_int(value: Int): AIntExpr
+       fun make_int(value: Int): AIntegerExpr
        do
-               return new ADecIntExpr.make(value, mmodule.get_primitive_class("Int").mclass_type)
+               return new AIntegerExpr.make(value, mmodule.int_type)
        end
 
-       # Make a new instatiation
+       # Make a new instantiation
        fun make_new(callsite: CallSite, args: nullable Array[AExpr]): ANewExpr
        do
                return new ANewExpr.make(callsite, args)
@@ -53,6 +59,12 @@ class ASTBuilder
                return new ABlockExpr.make
        end
 
+       # Make a new, empty, loop of statements
+       fun make_loop: ALoopExpr
+       do
+               return new ALoopExpr.make
+       end
+
        # Make a new variable read
        fun make_var_read(variable: Variable, mtype: MType): AVarExpr
        do
@@ -84,12 +96,67 @@ class ASTBuilder
                return new ADoExpr.make
        end
 
-       # Make a new condinionnal
+       # Make a new break for a given escapemark
+       fun make_break(escapemark: EscapeMark): ABreakExpr
+       do
+               return new ABreakExpr.make(escapemark)
+       end
+
+       # Make a new conditional
        # `mtype` is the return type of the whole if, in case of a ternary operator.
        fun make_if(condition: AExpr, mtype: nullable MType): AIfExpr
        do
                return new AIfExpr.make(condition, mtype)
        end
+
+       # Make a new assert
+       fun make_assert(n_id : nullable TId , n_expr : AExpr , n_else : nullable AExpr): AAssertExpr
+       do
+               return new AAssertExpr.make(n_id , n_expr , n_else)
+       end
+
+       # Make a new method
+       fun make_method(n_visibility: nullable AVisibility,
+                                       tk_redef: nullable TKwredef,
+                                       mmethoddef: nullable MMethodDef,
+                                       n_signature: nullable ASignature,
+                                       n_annotations: nullable AAnnotations,
+                                       n_extern_calls: nullable AExternCalls,
+                                       n_extern_code_block: nullable AExternCodeBlock,
+                                       n_block: nullable AExpr): AMethPropdef
+       do
+               return new AMethPropdef.make(n_visibility, tk_redef, mmethoddef, n_signature, n_annotations, n_extern_calls, n_extern_code_block, n_block)
+       end
+
+       # Make a new or with two expr
+       fun make_or(right_expr: AExpr, left_expr: AExpr): AOrExpr
+       do
+               return new AOrExpr.make(right_expr,left_expr)
+       end
+
+       # Make a new and with two expr
+       fun make_and(right_expr: AExpr, left_expr: AExpr): AAndExpr
+       do
+               return new AAndExpr.make(right_expr,left_expr)
+       end
+
+       # Make a new parenthesis expr
+       fun make_parenthesis(expr: AExpr, annotations: nullable AAnnotations): AParExpr
+       do
+               return new AParExpr.make(expr,annotations)
+       end
+
+       # Make a new message super
+       fun make_super_call(args: nullable Array[AExpr], n_qualified: nullable AQualified): ASuperExpr
+       do
+               return new ASuperExpr.make(args,n_qualified)
+       end
+
+       # Make a new return
+       fun make_return(expr: nullable AExpr): AReturnExpr
+       do
+               return new AReturnExpr.make(expr)
+       end
 end
 
 redef class AExpr
@@ -116,17 +183,19 @@ redef class AExpr
        private var variable_cache: nullable Variable
 
        # The `detach` method completely remove the node in the parent.
-       # Owever, sometime, it is useful to keep the emplacement of the removed child.
+       # However, sometime, it is useful to keep the emplacement of the removed child.
        #
-       # The standard usecase is the insertion of a node beetwen a parent `p` and a child `p.c`.
+       # The standard use case is the insertion of a node between a parent `p` and a child `p.c`.
        # To create the new node `n`, we need to attach the child to it.
        # But, to put `n` where `c` was in `p`, the place has to be remembered.
        #
-       #     var p: AExpr
-       #     var c = p.c
-       #     var h = c.detach_with_placeholder
-       #     var n = astbuilder.make_XXX(c)
-       #     h.replace_with(n)
+       # ~~~nitish
+       # var p: AExpr
+       # var c = p.c
+       # var h = c.detach_with_placeholder
+       # var n = astbuilder.make_XXX(c)
+       # h.replace_with(n)
+       # ~~~
        fun detach_with_placeholder: AExpr
        do
                var h = new APlaceholderExpr.make
@@ -142,12 +211,21 @@ redef class AExpr
        # Note: this method, aimed to `ABlockExpr` is promoted to `AExpr` because of the limitations of the hierarchies generated by sablecc3
        fun add(expr: AExpr)
        do
+               print "add not implemented in {inspect}"
                abort
        end
+
+       redef fun accept_ast_validation(v)
+       do
+               super
+               if mtype == null and not is_typed then
+                       #debug "TYPING: untyped expression"
+               end
+       end
 end
 
 # A placeholder for a `AExpr` node
-# Instances are transiantly used to mark some specific emplacments in the AST
+# Instances are transiantly used to mark some specific emplacements in the AST
 # during complex transformations.
 #
 # Their must not appear in a valid AST
@@ -158,6 +236,85 @@ class APlaceholderExpr
        private init make
        do
        end
+
+       redef fun accept_ast_validation(v)
+       do
+               super
+               debug "PARENT: remaining placeholder"
+       end
+end
+
+redef class AReturnExpr
+       private init make(expr: nullable AExpr)
+       do
+               self.init_areturnexpr(null, expr)
+       end
+end
+
+redef class ASuperExpr
+       private init make(args: nullable Array[AExpr], n_qualified: nullable AQualified)
+       do
+               var n_args = new AListExprs
+               if args != null then
+                       n_args.n_exprs.add_all(args)
+               end
+               self.init_asuperexpr(n_qualified, new TKwsuper, n_args)
+       end
+end
+
+redef class AParExpr
+       private init make(expr: AExpr, annotations: nullable AAnnotations)
+       do
+               self.location = expr.location
+               self.init_aparexpr(new TOpar, expr, new TCpar, annotations)
+       end
+end
+
+redef class AOrExpr
+       private init make(right_expr: AExpr, left_expr: AExpr)
+       do
+               self.init_aorexpr(right_expr,new TKwor,left_expr)
+       end
+end
+
+redef class AAndExpr
+       private init make(right_expr: AExpr, left_expr: AExpr)
+       do
+               self.init_aandexpr(right_expr,new TKwand ,left_expr)
+       end
+end
+
+redef class AMethPropdef
+       private init make(n_visibility: nullable AVisibility,
+                                       tk_redef: nullable TKwredef,
+                                       mmethoddef: nullable MMethodDef,
+                                       n_signature: nullable ASignature,
+                                       n_annotations: nullable AAnnotations,
+                                       n_extern_calls: nullable AExternCalls,
+                                       n_extern_code_block: nullable AExternCodeBlock,
+                                       n_block: nullable AExpr)
+       do
+               var n_tid = new TId
+               var n_methid = new AIdMethid.init_aidmethid(n_tid)
+               if n_signature == null then n_signature = new ASignature
+               if n_visibility == null then n_visibility = new APublicVisibility
+               self.init_amethpropdef(null,tk_redef,n_visibility,new TKwmeth,null,null,null,n_methid,n_signature,n_annotations,n_extern_calls,n_extern_code_block,new TKwdo,n_block,new TKwend)
+
+               if mmethoddef != null then
+                       self.n_methid.as(AIdMethid).n_id.text = mmethoddef.name
+                       self.mpropdef = mmethoddef
+               end
+       end
+end
+
+redef class AAssertExpr
+       private init make(n_id : nullable TId , n_expr : nullable AExpr , n_else : nullable AExpr)
+       do
+               n_kwassert = new TKwassert
+               n_kwelse = null
+               if n_else != null then n_kwelse = new TKwelse
+               self.init_aassertexpr(n_kwassert, n_id , n_expr , n_kwelse , n_else)
+       end
 end
 
 redef class ABlockExpr
@@ -166,35 +323,60 @@ redef class ABlockExpr
                self.is_typed = true
        end
 
-       redef fun add(expr: AExpr)
+       redef fun add(expr)
        do
                n_expr.add expr
        end
 end
 
+redef class ALoopExpr
+       private init make
+       do
+               _n_kwloop = new TKwloop
+               self.is_typed = true
+               n_block = new ABlockExpr
+               n_block.is_typed = true
+       end
+
+       redef fun add(expr)
+       do
+               n_block.add expr
+       end
+end
+
 redef class ADoExpr
        private init make
        do
                _n_kwdo = new TKwdo
-               escapemark = new EscapeMark(null, false)
+               self.is_typed = true
+               n_block = new ABlockExpr
+               n_block.is_typed = true
        end
 
        # Make a new break expression of the given do
        fun make_break: ABreakExpr
        do
-               var escapemark = self.escapemark
+               var escapemark = self.break_mark
                if escapemark == null then
-                       escapemark = new EscapeMark(null, false)
-                       self.escapemark = escapemark
+                       escapemark = new EscapeMark(null)
+                       self.break_mark = escapemark
                end
                return new ABreakExpr.make(escapemark)
        end
+
+       redef fun add(expr)
+       do
+               n_block.add expr
+       end
 end
 
 redef class ABreakExpr
        private init make(escapemark: EscapeMark)
        do
+               _n_kwbreak = new TKwbreak
                self.escapemark = escapemark
+               escapemark.escapes.add self
+               self.is_typed = true
        end
 end
 
@@ -204,7 +386,9 @@ redef class AIfExpr
                _n_kwif = new TKwif
                _n_expr = condition
                _n_expr.parent = self
+               _n_kwthen = new TKwthen
                _n_then = new ABlockExpr.make
+               _n_kwelse = new TKwelse
                _n_else = new ABlockExpr.make
                self.mtype = mtype
                self.is_typed = true
@@ -214,15 +398,18 @@ end
 redef class AType
        private init make
        do
-               _n_id = new TClassid
+               var n_id = new TClassid
+               var n_qid = new AQclassid
+               n_qid.n_id = n_id
+               _n_qid = n_qid
        end
 end
 
-redef class ADecIntExpr
+redef class AIntegerExpr
        private init make(value: Int, t: MType)
        do
                self.value = value
-               self._n_number = new TNumber # dummy
+               self._n_integer = new TInteger # dummy
                self.mtype = t
        end
 end
@@ -237,7 +424,12 @@ redef class ANewExpr
                        n_args.n_exprs.add_all(args)
                end
                self.callsite = callsite
-               self.mtype = callsite.recv
+               self.recvtype = callsite.recv.as(MClassType)
+               if callsite.mproperty.is_new then
+                       self.mtype = callsite.msignature.return_mtype
+               else
+                       self.mtype = callsite.recv
+               end
                self.is_typed = true
        end
 end
@@ -247,11 +439,12 @@ redef class ACallExpr
        do
                self._n_expr = recv
                _n_args = new AListExprs
-               _n_id = new TId
+               _n_qid = new AQid
+               _n_qid.n_id = new TId
+               _n_qid.n_id.text = callsite.mproperty.name
                if args != null then
                        self.n_args.n_exprs.add_all(args)
                end
-               var mtype = recv.mtype.as(not null)
                self.callsite = callsite
                self.mtype = callsite.msignature.return_mtype
                self.is_typed = true
@@ -304,3 +497,66 @@ redef class AVarAssignExpr
        end
 end
 
+# Check the consitency of AST
+class ASTValidationVisitor
+       super Visitor
+       redef fun visit(node)
+       do
+               node.accept_ast_validation(self)
+       end
+       private var path = new CircularArray[ANode]
+       private var seen = new HashSet[ANode]
+end
+
+redef class ANode
+       # Recursively validate a AST node.
+       # This ensure that location and parenting are defined and coherent.
+       #
+       # After complex low-level AST manipulation and construction,
+       # it is recommended to call it.
+       #
+       # Note: this just instantiate and run an `ASTValidationVisitor`.
+       fun validate
+       do
+               (new ASTValidationVisitor).enter_visit(self)
+       end
+
+       private fun accept_ast_validation(v: ASTValidationVisitor)
+       do
+               var parent = self.parent
+               var path = v.path
+
+               if path.length > 0 then
+                       var path_parent = v.path.first
+                       if parent == null then
+                               self.parent = path_parent
+                               #debug "PARENT: expected parent: {path_parent}"
+                               v.seen.add(self)
+                       else if parent != path_parent then
+                               self.parent = path_parent
+                               if v.seen.has(self) then
+                                       debug "DUPLICATE (NOTATREE): already seen node with parent {parent} now with {path_parent}."
+                               else
+                                       v.seen.add(self)
+                                       debug "PARENT: expected parent: {path_parent}, got {parent}"
+                               end
+                       end
+               end
+
+               if not isset _location then
+                       #debug "LOCATION: unlocated node {v.path.join(", ")}"
+                       _location = self.parent.location
+               end
+
+               path.unshift(self)
+               visit_all(v)
+               path.shift
+       end
+end
+
+redef class AAnnotation
+       redef fun accept_ast_validation(v)
+       do
+               # Do not enter in annotations
+       end
+end