# Block of the current method
readable writable attr _top_block: PExpr
+ # Current closure (if any)
+ readable writable attr _closure: MMClosure
+
+ # Current closure method return type (for break) (if any)
+ readable writable attr _closure_break_stype: MMType = null
+
+ # Current closure break expressions (if any)
+ readable writable attr _break_list: Array[PExpr]
+
# List of explicit invocation of constructors of super-classes
readable writable attr _explicit_super_init_calls: Array[MMMethod]
redef class PParam
redef meth after_typing(v)
do
+ # TODO: why the test?
if v.variable_ctx != null then
v.variable_ctx.add(variable)
end
end
end
+redef class AClosureDecl
+ redef meth after_typing(v)
+ do
+ v.variable_ctx.add(variable)
+ end
+end
+
redef class PType
readable attr _stype: MMType
redef meth after_typing(v)
end
end
+redef class AContinueExpr
+ redef meth after_typing(v)
+ do
+ var c = v.closure
+ var t: MMType = null
+ if c != null then
+ if c.is_break then
+ v.error(self, "Error: 'continue' forbiden in break blocks.")
+ return
+ end
+ t = c.signature.return_type
+ end
+
+ if n_expr == null and t != null then
+ v.error(self, "Error: continue with a value required in this bloc.")
+ else if n_expr != null and t == null then
+ v.error(self, "Error: continue without value required in this bloc.")
+ else if n_expr != null and t != null then
+ v.check_conform_expr(n_expr, t)
+ end
+ end
+end
+
+redef class ABreakExpr
+ redef meth after_typing(v)
+ do
+ var t = v.closure_break_stype
+ if n_expr == null and t != null then
+ v.error(self, "Error: break with a value required in this bloc.")
+ else if n_expr != null and t == null then
+ v.error(self, "Error: break without value required in this bloc.")
+ else if n_expr != null and t != null then
+ # Typing check can only be done later
+ v.break_list.add(n_expr)
+ end
+ end
+end
+
redef class AIfExpr
redef meth accept_typing(v)
do
register_super_init_call(v, p)
if n_args.length > 0 then
var signature = get_signature(v, v.self_var.stype, p, true)
- _arguments = process_signature(v, signature, p, n_args.to_a)
+ _arguments = process_signature(v, signature, p.name, n_args.to_a)
end
else
v.error(self, "Error: No super method to call for {v.local_property}.")
class AAbsSendExpr
special PExpr
+ # The signature of the called property
+ readable attr _prop_signature: MMSignature
+
# Compute the called global property
- private meth do_typing(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, recv_is_self: Bool, name: Symbol, raw_args: Array[PExpr])
+ private meth do_typing(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, recv_is_self: Bool, name: Symbol, raw_args: Array[PExpr], closure_defs: Array[PClosureDef])
do
var prop = get_property(v, type_recv, is_implicit_self, name)
if prop == null then return
var sig = get_signature(v, type_recv, prop, recv_is_self)
if sig == null then return
- var args = process_signature(v, sig, prop, raw_args)
+ var args = process_signature(v, sig, prop.name, raw_args)
if args == null then return
+ var rtype = process_closures(v, sig, prop.name, closure_defs)
_prop = prop
+ _prop_signature = sig
_arguments = args
+ _return_type = rtype
end
private meth get_property(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, name: Symbol): MMMethod
return prop
end
+ # Get the signature for a local property and a receiver
private meth get_signature(v: TypingVisitor, type_recv: MMType, prop: MMMethod, recv_is_self: Bool): MMSignature
do
prop.global.check_visibility(v, self, v.module, recv_is_self)
if not recv_is_self then psig = psig.not_for_self
return psig
end
-
+
# Check the conformity of a set of arguments `raw_args' to a signature.
- private meth process_signature(v: TypingVisitor, psig: MMSignature, prop: MMMethod, raw_args: Array[PExpr]): Array[PExpr]
+ private meth process_signature(v: TypingVisitor, psig: MMSignature, name: Symbol, raw_args: Array[PExpr]): Array[PExpr]
do
var par_vararg = psig.vararg_rank
var par_arity = psig.arity
var raw_arity: Int
if raw_args == null then raw_arity = 0 else raw_arity = raw_args.length
if par_arity > raw_arity or (par_arity != raw_arity and par_vararg == -1) then
- v.error(self, "Error: Method '{prop}' arity missmatch.")
+ v.error(self, "Error: '{name}' arity missmatch.")
return null
end
var arg_idx = 0
return args
end
+ # Check the conformity of a set of defined closures
+ private meth process_closures(v: TypingVisitor, psig: MMSignature, name: Symbol, cd: Array[PClosureDef]): MMType
+ do
+ var t = psig.return_type
+ var cs = psig.closures # Declared closures
+ if cd != null then
+ if cs.length == 0 then
+ v.error(self, "Error: {name} does not require blocs.")
+ else if cs.length != cd.length then
+ v.error(self, "Error: {name} requires {cs.length} blocs, {cd.length} found.")
+ else
+ var old_bbst = v.closure_break_stype
+ var old_bl = v.break_list
+ v.closure_break_stype = t
+ v.break_list = new Array[ABreakExpr]
+ for i in [0..cs.length[ do
+ cd[i].accept_typing2(v, cs[i])
+ end
+ for n in v.break_list do
+ var ntype = n.stype
+ if t == null or (t != null and t < ntype) then
+ t = ntype
+ end
+ end
+ for n in v.break_list do
+ v.check_conform_expr(n, t)
+ end
+
+ v.closure_break_stype = old_bbst
+ v.break_list = old_bl
+ end
+ else if cs.length != 0 then
+ v.error(self, "Error: {name} requires {cs.length} blocs.")
+ end
+ return t
+ end
+
# The invoked method (once computed)
readable attr _prop: MMMethod
# The real arguments used (after star transformation) (once computed)
readable attr _arguments: Array[PExpr]
+
+ # The return type (if any) (once computed)
+ readable attr _return_type: MMType
end
# A possible call of constructor in a super class
name = n_id.to_symbol
end
- do_typing(v, t, false, false, name, n_args.to_a)
+ do_typing(v, t, false, false, name, n_args.to_a, null)
if prop == null then return
if not prop.global.is_init then
# Raw arguments used (withour star transformation)
meth raw_arguments: Array[PExpr] is abstract
+ # Closure definitions
+ meth closure_defs: Array[PClosureDef] do return null
+
redef meth after_typing(v)
do
do_all_typing(v)
private meth do_all_typing(v: TypingVisitor)
do
if not v.check_expr(n_expr) then return
- do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_arguments)
+ do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_arguments, closure_defs)
if prop == null then return
+
if prop.global.is_init then
if not v.local_property.global.is_init then
v.error(self, "Error: try to invoke constructor {prop} in a method.")
register_super_init_call(v, prop)
end
end
- var t = prop.signature_for(n_expr.stype).return_type
- if t != null and not n_expr.is_self then t = t.not_for_self
- _stype = t
+
+ _stype = return_type
end
end
do
if not v.check_expr(n_expr) then return
var raw_args = raw_arguments
- do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_args)
+ do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_args, null)
if prop == null then return
if prop.global.is_init then
if not v.local_property.global.is_init then
var old_args = arguments
raw_args.add(n_value)
- do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, "{name}=".to_symbol, raw_args)
+ do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, "{name}=".to_symbol, raw_args, null)
if prop == null then return
if prop.global.is_init then
if not v.local_property.global.is_init then
redef class ACallFormExpr
redef meth after_typing(v)
do
- if n_expr.is_implicit_self then
+ if n_expr != null and n_expr.is_implicit_self then
var name = n_id.to_symbol
var variable = v.variable_ctx[name]
if variable != null then
- if not n_args.is_empty then
- v.error(self, "Error: {name} is variable, not a function.")
+ if variable isa ClosureVariable then
+ var n = new AClosureCallExpr(n_id, n_args, n_closure_defs)
+ replace_with(n)
+ n.variable = variable
+ n.after_typing(v)
+ return
+ else
+ if not n_args.is_empty then
+ v.error(self, "Error: {name} is variable, not a function.")
+ end
+ var vform = variable_create(variable)
+ vform.variable = variable
+ replace_with(vform)
+ vform.after_typing(v)
+ return
end
- var vform = variable_create(variable)
- vform.variable = variable
- replace_with(vform)
- vform.after_typing(v)
- return
end
end
super
end
+
+ redef meth closure_defs
+ do
+ if n_closure_defs == null or n_closure_defs.is_empty then
+ return null
+ else
+ return n_closure_defs.to_a
+ end
+ end
# Create a variable acces corresponding to the call form
meth variable_create(variable: Variable): AVarFormExpr is abstract
redef meth raw_arguments do return n_args.to_a
end
+redef class AClosureCallExpr
+ redef meth after_typing(v)
+ do
+ var va = variable
+ var sig = va.closure.signature
+ var args = process_signature(v, sig, n_id.to_symbol, n_args.to_a)
+ if closure_defs != null then
+ process_closures(v, sig, n_id.to_symbol, closure_defs)
+ end
+ if args == null then return
+ _prop = null
+ _prop_signature = sig
+ _arguments = args
+ _stype = sig.return_type
+ end
+end
+
+redef class PClosureDef
+ attr _accept_typing2: Bool
+ redef meth accept_typing(v)
+ do
+ # Typing is deferred, wait accept_typing2(v)
+ if _accept_typing2 then super
+ end
+
+ private meth accept_typing2(v: TypingVisitor, clos: MMClosure) is abstract
+end
+
+redef class AClosureDef
+ redef meth accept_typing2(v, clos)
+ do
+ var sig = clos.signature
+ if sig.arity != n_id.length then
+ v.error(self, "Error: {sig.arity} automatic variable names expected, {n_id.length} found.")
+ return
+ end
+
+ closure = clos
+
+ var old_clos = v.closure
+ v.closure = clos
+
+ v.variable_ctx = v.variable_ctx.sub
+ variables = new Array[AutoVariable]
+ for i in [0..n_id.length[ do
+ var va = new AutoVariable(n_id[i].to_symbol, self)
+ variables.add(va)
+ va.stype = sig[i]
+ v.variable_ctx.add(va)
+ end
+
+ _accept_typing2 = true
+ accept_typing(v)
+
+ v.closure = old_clos
+ end
+end
+
redef class AIsaExpr
redef meth after_typing(v)
do
nitlanguage / nit.git / blobdiff