From c31f782863554f13e78ee66386d06ae8ce98219f Mon Sep 17 00:00:00 2001 From: Florian Deljarry Date: Tue, 13 Aug 2019 12:46:35 -0400 Subject: [PATCH] astbuilder: First implementation of clonable for ast nodes Add implementation of `clone` method for the ast nodes. Signed-off-by: Florian Deljarry --- src/astbuilder.nit | 363 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 311 insertions(+), 52 deletions(-) diff --git a/src/astbuilder.nit b/src/astbuilder.nit index d81ac6b..681c4bf 100644 --- a/src/astbuilder.nit +++ b/src/astbuilder.nit @@ -19,6 +19,7 @@ intrude import semantize::typing intrude import literal intrude import parser intrude import semantize::scope +intrude import modelbuilder_base # General factory to build semantic nodes in the AST of expressions class ASTBuilder @@ -157,11 +158,20 @@ class ASTBuilder do return new AReturnExpr.make(expr) end - # Create a callsite with the given `mproperty`. Take the current method `actual_method` as a context - fun create_callsite(modelbuilder: ModelBuilder, actual_method : AMethPropdef, mproperty: MMethod, is_self_call: Bool): CallSite + + # Make a new not + fun make_not(expr: AExpr): ANotExpr + do + return new ANotExpr.make(expr) + end + + # Build a callsite to call the `mproperty` in the current method `caller_method`. + # `is_self_call` indicate if the method caller is a property of `self` + fun create_callsite(modelbuilder: ModelBuilder, caller_method : AMethPropdef, mproperty: MMethod, is_self_call: Bool): CallSite do - var type_visitor = new TypeVisitor(modelbuilder, actual_method.mpropdef.as(not null)) - var callsite = type_visitor.build_callsite_by_property(actual_method, mproperty.intro_mclassdef.bound_mtype, mproperty, is_self_call) + # FIXME It's not the better solution to call `TypeVisitor` here to build a model entity, but some make need to have a callsite + var type_visitor = new TypeVisitor(modelbuilder, caller_method.mpropdef.as(not null)) + var callsite = type_visitor.build_callsite_by_property(caller_method, mproperty.intro_mclassdef.bound_mtype, mproperty, is_self_call) assert callsite != null return callsite end @@ -252,6 +262,13 @@ class APlaceholderExpr end end +redef class ANotExpr + private init make(expr: AExpr) + do + self.init_anotexpr(new TKwnot, expr) + end +end + redef class AReturnExpr private init make(expr: nullable AExpr) do @@ -260,24 +277,17 @@ redef class AReturnExpr end redef class ASuperExpr - private init make(args: nullable Array[AExpr], n_qualified: nullable AQualified) + private init make(args: nullable Array[AExpr], n_qualified: nullable AQualified, mpropdef: nullable MMethodDef) do var n_args = new AListExprs if args != null then n_args.n_exprs.add_all(args) end + _mpropdef = mpropdef 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 @@ -307,11 +317,7 @@ redef class AMethPropdef 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 + self.mpropdef = mmethoddef end end @@ -325,18 +331,6 @@ redef class AAssertExpr end end -redef class ABlockExpr - private init make - do - self.is_typed = true - end - - redef fun add(expr) - do - n_expr.add expr - end -end - redef class ALoopExpr private init make do @@ -399,26 +393,108 @@ redef class AIfExpr _n_kwelse = new TKwelse _n_else = new ABlockExpr.make self.mtype = mtype - self.is_typed = true + if mtype != null then self.is_typed = true end end redef class AType - private init make + + private init make(t: nullable MType) do var n_id = new TClassid var n_qid = new AQclassid n_qid.n_id = n_id _n_qid = n_qid + _mtype = t + end + + redef fun clone: SELF + do + return new AType.make(mtype) end end +# Primitive type + redef class AIntegerExpr - private init make(value: Int, t: MType) + + private init make(value: nullable Numeric, t: nullable MType) do - self.value = value - self._n_integer = new TInteger # dummy - self.mtype = t + _mtype = t + if t != null then self.is_typed = true + _value = value + _n_integer = new TInteger # dummy + end + + redef fun clone: SELF + do + return new AIntegerExpr.make(value, mtype) + end +end + +redef class AFloatExpr + + private init make(value: nullable Float, t: nullable MType) + do + _mtype = t + if t != null then self.is_typed = true + _value = value + _n_float = new TFloat # dummy + end + + redef fun clone: SELF + do + return new AFloatExpr.make(value, mtype) + end +end + +redef class ATrueExpr + + private init make(t: nullable MType) + do + init_atrueexpr(new TKwtrue, null) + _mtype = t + if t != null then self.is_typed = true + end + + redef fun clone: SELF + do + return new ATrueExpr.make(mtype) + end +end + +redef class AFalseExpr + + private init make(t: nullable MType) + do + init_afalseexpr(new TKwfalse, null) + _mtype = t + if t != null then self.is_typed = true + end + + redef fun clone: SELF + do + return new AFalseExpr.make(mtype) + end +end + +redef class ACharExpr + + # `token_text` represent the real value as it's present in a file not only the char. + # `token_text` is needed if you want to use some methods (for exemple: `prefix`, `suffix` or `is_code_point methods`) + private init make(value: nullable Char, t: nullable MType, token_text: nullable String) + do + _value = value + _mtype = t + _n_char = new TChar + if token_text != null then n_char.text = token_text + if t != null then self.is_typed = true + end + + redef fun clone: SELF + do + var self_clone = new ACharExpr.make(self.value, mtype, n_char.text) + return self_clone end end @@ -443,7 +519,7 @@ redef class ANewExpr end redef class ACallExpr - private init make(recv: AExpr, callsite: CallSite, args: nullable Array[AExpr]) + private init make(recv: AExpr, callsite: nullable CallSite, args: nullable Array[AExpr]) do self._n_expr = recv _n_args = new AListExprs @@ -453,25 +529,81 @@ redef class ACallExpr if args != null then self.n_args.n_exprs.add_all(args) end - self.callsite = callsite - self.mtype = callsite.msignature.return_mtype - self.is_typed = true + + if callsite != null then + self.callsite = callsite + self.mtype = callsite.msignature.return_mtype + self.is_typed = true + end + end +end + +redef class AAsCastExpr + private init make(n_expr: AExpr, n_type: AType) + do + init_aascastexpr(n_expr, new TKwas , null , n_type, null) + end +end + +redef class AAsNotnullExpr + private init make(n_expr: AExpr, t: nullable MType) + do + init_aasnotnullexpr(n_expr, new TKwas, null, new TKwnot, new TKwnull, null) + _mtype = t + if t != null then _is_typed = true + end +end + +redef class ANullExpr + + private init make(t: nullable MType) + do + init_anullexpr(new TKwnull, null) + _mtype = t + if t != null then self.is_typed = true + end +end + +redef class ASelfExpr + + private init make(v: nullable Variable, t: nullable MType) + do + init_aselfexpr(new TKwself, null) + _mtype = t + if t != null then is_typed =true + end + + redef fun clone: SELF + do + return new ASelfExpr.make(self.variable, self.mtype) end end +redef class AImplicitSelfExpr + + redef fun clone: SELF + do + var self_clone = new AImplicitSelfExpr.make(variable, mtype) + self_clone.is_sys = is_sys + return self_clone + end +end + + redef class AAttrExpr - private init make(recv: AExpr, attribute: MAttribute, t: MType) + private init make(recv: AExpr, attribute: nullable MAttribute, t: nullable MType) do _n_expr = recv recv.parent = self _n_id = new TAttrid - mproperty = attribute - mtype = t + _mproperty = attribute + _mtype = t + if t != null then _is_typed = true end end redef class AAttrAssignExpr - private init make(recv: AExpr, attribute: MAttribute, value: AExpr) + private init make(recv: AExpr, attribute: nullable MAttribute, value: AExpr) do _n_expr = recv recv.parent = self @@ -479,29 +611,128 @@ redef class AAttrAssignExpr _n_value = value value.parent = self _n_assign = new TAssign - mproperty = attribute - mtype = value.mtype + _mproperty = attribute + _mtype = value.mtype end end redef class AVarExpr - private init make(v: Variable, mtype: MType) + private init make(v: nullable Variable, t: nullable MType) do _n_id = new TId - variable = v - self.mtype = mtype + if v != null then _n_id.text = v.name + _variable = v + _mtype = t + if t != null then is_typed = true end end redef class AVarAssignExpr - private init make(v: Variable, value: AExpr) + private init make(v: nullable Variable, value: AExpr) do _n_id = new TId + if v != null then _n_id.text = v.name _n_value = value value.parent = self _n_assign = new TAssign - variable = v - mtype = value.mtype + _variable = v + _mtype = value.mtype + if _mtype != null then _is_typed = true + end +end + +redef class ASignature + redef fun clone: SELF + do + var ntype = n_type + if ntype != null then ntype = n_type.clone + return new ASignature.init_asignature(null, n_params.clone, null, ntype) + end +end + +redef class AParam + + private init make(v: nullable Variable, t: nullable AType) + do + _n_id = new TId + _variable = v + _n_type = t + end + + redef fun clone: SELF + do + var ntype = n_type + if ntype != null then ntype = n_type.clone + return new AParam.make(variable, ntype) + end +end + +redef class ABlockExpr + private init make(t: nullable MType) + do + if t != null then + _mtype = t + _is_typed = true + end + end + + redef fun add(expr) + do + n_expr.add expr + expr.parent = self + end + + fun add_all(exprs: Array[AExpr]) + do + for expr in exprs do + add(expr) + end + end + + redef fun clone: SELF + do + var clone = new ABlockExpr.make(mtype) + for expr in self.n_expr do + clone.add(expr.clone) + end + return clone + end +end + +redef class AQclassid + redef fun clone: SELF + do + return new AQclassid.init_aqclassid(n_qualified.clone, n_id) + end +end + +redef class AQualified + redef fun clone: SELF + do + return new AQualified.init_aqualified(n_id.clone, n_classid) + end +end + +redef class AQid + redef fun clone: SELF + do + var clone_n_qualified = n_qualified + if n_qualified != null then clone_n_qualified = n_qualified.clone + return new AQid.init_aqid(clone_n_qualified, n_id.clone) + end +end + +redef class TId + redef fun clone: SELF + do + return new TId.init_tk(location) + end +end + +redef class AParExpr + private init make(expr: AExpr, annotations: nullable AAnnotations) + do + self.init_aparexpr(new TOpar, expr, new TCpar, annotations) end end @@ -516,7 +747,28 @@ class ASTValidationVisitor private var seen = new HashSet[ANode] end +redef class ANodes + super Cloneable + + redef fun clone: SELF + do + var clone_anodes = new ANodes[E](self.parent) + for node in self do + clone_anodes.add(node.clone) + end + return clone_anodes + end +end + redef class ANode + super Cloneable + + redef fun clone: SELF + do + # By default the clone abort to avoid surprises + print "The clone method is not implemented for the `{self.class_name}` class" + abort + end # Recursively validate a AST node. # This ensure that location and parenting are defined and coherent. # @@ -563,8 +815,15 @@ redef class ANode end redef class AAnnotation + redef fun accept_ast_validation(v) do # Do not enter in annotations end + + private init make(n_args : ANodes[AExpr]) + do + _n_visibility = new APublicVisibility + _n_args = n_args + end end -- 1.7.9.5