# Block of the current method
readable writable attr _top_block: PExpr
- # Current closure 'return' static type (if any)
- readable writable attr _closure_stype: MMType
+ # 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 AContinueExpr
redef meth after_typing(v)
do
- var t = v.closure_stype
+ 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
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
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
if sig == null then return
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, name: Symbol, raw_args: Array[PExpr]): Array[PExpr]
do
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
+ var min_arity = 0
+ for c in cs do
+ if not c.is_optional then min_arity += 1
+ end
+ if cd != null then
+ if cs.length == 0 then
+ v.error(self, "Error: {name} does not require blocs.")
+ else if cd.length > cs.length or cd.length < min_arity 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..cd.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 min_arity != 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
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
- var cd = closure_defs
- var cs = _prop_signature.closures # Closure signatures
- if cd != null then
- if cs.length == 0 then
- v.error(self, "Error: property {prop} does not require blocs.")
- else if cs.length != cd.length then
- v.error(self, "Error: property {prop} requires {cs.length} blocs, {cd.length} found.")
- else
- for i in [0..cs.length[ do
- cd[i].accept_typing2(v, cs[i])
- end
- end
- else if cs.length != 0 then
- v.error(self, "Error: property {prop} requires {cs.length} blocs.")
- end
-
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 meth after_typing(v)
do
var va = variable
- var sig = va.signature
+ 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
if _accept_typing2 then super
end
- private meth accept_typing2(v: TypingVisitor, sig: MMSignature) is abstract
+ private meth accept_typing2(v: TypingVisitor, clos: MMClosure) is abstract
end
redef class AClosureDef
- redef meth accept_typing2(v, sig)
+ 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
- signature = sig
+ closure = clos
- var old_stype = v.closure_stype
- v.closure_stype = sig.return_type
+ var old_clos = v.closure
+ v.closure = clos
v.variable_ctx = v.variable_ctx.sub
variables = new Array[AutoVariable]
_accept_typing2 = true
accept_typing(v)
- v.closure_stype = old_stype
+ v.closure = old_clos
end
end
nitlanguage / nit.git / blobdiff