package typing
import syntax_base
+import escape
redef class MMSrcModule
# Walk trough the module and type statments and expressions
# Current knowledge about variables names and types
readable writable attr _variable_ctx: VariableContext
+ # Current knowledge about escapable blocks
+ readable writable attr _escapable_ctx: EscapableContext = new EscapableContext(self)
+
# The current reciever
readable writable attr _self_var: ParamVariable
# 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]
end
end
-
###############################################################################
redef class PNode
end
redef class AClosureDecl
+ # The corresponding escapable object
+ readable attr _escapable: EscapableBlock
+
redef meth accept_typing(v)
do
# Register the closure for ClosureCallExpr
var old_var_ctx = v.variable_ctx
v.variable_ctx = v.variable_ctx.sub
- v.closure = variable.closure
+
+ _escapable = new EscapableClosure(self, variable.closure, null)
+ v.escapable_ctx.push(_escapable)
super
v.variable_ctx = old_var_ctx
- v.closure = null
+ v.escapable_ctx.pop
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
+ var esc = compute_escapable_block(v.escapable_ctx)
+ if esc == null then return
+
+ if esc.is_break_block then
+ v.error(self, "Error: 'continue' forbiden in break blocks.")
+ return
end
+ var t = esc.continue_stype
if n_expr == null and t != null then
- v.error(self, "Error: continue with a value required in this bloc.")
+ v.error(self, "Error: continue with a value required in this block.")
else if n_expr != null and t == null then
- v.error(self, "Error: continue without value required in this bloc.")
+ v.error(self, "Error: continue without value required in this block.")
else if n_expr != null and t != null then
v.check_conform_expr(n_expr, t)
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
+ var esc = compute_escapable_block(v.escapable_ctx)
+ if esc == null then return
+
+ var bl = esc.break_list
+ if n_expr == null and bl != null then
+ v.error(self, "Error: break with a value required in this block.")
+ else if n_expr != null and bl == null then
+ v.error(self, "Error: break without value required in this block.")
+ else if n_expr != null and bl != null then
# Typing check can only be done later
- v.break_list.add(n_expr)
+ bl.add(n_expr)
end
end
end
end
redef class AWhileExpr
- redef meth after_typing(v)
+ # The corresponding escapable block
+ readable attr _escapable: EscapableBlock
+
+ redef meth accept_typing(v)
do
+ _escapable = new EscapableBlock(self)
+ v.escapable_ctx.push(_escapable)
+
+ super
+
v.check_conform_expr(n_expr, v.type_bool)
+ v.escapable_ctx.pop
end
end
redef class AForExpr
- redef meth after_typing(v)
- do
- # pop context created in AForVardeclExpr
- var varctx = v.variable_ctx
- assert varctx isa SubVariableContext
- v.variable_ctx = varctx.prev
- end
-end
+ # The corresponding escapable block
+ readable attr _escapable: EscapableBlock
-redef class AForVardeclExpr
readable attr _meth_iterator: MMMethod
readable attr _meth_is_ok: MMMethod
readable attr _meth_item: MMMethod
readable attr _meth_next: MMMethod
- redef meth after_typing(v)
+ redef meth accept_typing(v)
do
+ _escapable = new EscapableBlock(self)
+ v.escapable_ctx.push(_escapable)
+
v.variable_ctx = v.variable_ctx.sub
var va = new AutoVariable(n_id.to_symbol, self)
variable = va
v.variable_ctx.add(va)
+ v.visit(n_expr)
+
var expr_type = n_expr.stype
if not v.check_conform_expr(n_expr, v.type_collection) then
return
var t = _meth_item.signature_for(iter_type).return_type
if not n_expr.is_self then t = t.not_for_self
va.stype = t
+
+ if n_block != null then v.visit(n_block)
+
+ # pop context
+ var varctx = v.variable_ctx
+ assert varctx isa SubVariableContext
+ v.variable_ctx = varctx.prev
+
+ v.escapable_ctx.pop
end
end
return
end
var name = n_assign_op.method_name
- var prop = type_lvalue.local_class.select_method(name)
- if prop == null then
+ var lc = type_lvalue.local_class
+ if not lc.has_global_property_by_name(name) then
v.error(self, "Error: Method '{name}' doesn't exists in {type_lvalue}.")
return
end
+ var prop = lc.select_method(name)
prop.global.check_visibility(v, self, v.module, false)
var psig = prop.signature_for(type_lvalue)
_assign_method = prop
end
redef class ASuperstringExpr
- readable attr _meth_init: MMMethod
- readable attr _meth_append: MMMethod
+ readable attr _meth_with_capacity: MMMethod
+ readable attr _meth_add: MMMethod
readable attr _meth_to_s: MMMethod
+ readable attr _atype: MMType
redef meth after_typing(v)
do
_stype = v.type_string
- _meth_init = _stype.local_class.select_method(once "init".to_symbol)
- if _meth_init == null then v.error(self, "{_stype} MUST have an init method.")
- _meth_append = _stype.local_class.select_method(once "append".to_symbol)
- if _meth_append == null then v.error(self, "{_stype} MUST have a append method.")
+ _atype = v.type_array(_stype)
+ _meth_with_capacity = _atype.local_class.select_method(once "with_capacity".to_symbol)
+ if _meth_with_capacity == null then v.error(self, "{_atype} MUST have a with_capacity method.")
+ _meth_add = _atype.local_class.select_method(once "add".to_symbol)
+ if _meth_add == null then v.error(self, "{_atype} MUST have an add method.")
_meth_to_s = v.type_object.local_class.select_method(once "to_s".to_symbol)
if _meth_to_s == null then v.error(self, "Object MUST have a to_s method.")
end
if not v.check_expr(n_expr) then return
var type_recv = n_expr.stype
var name = n_id.to_symbol
- var prop = type_recv.local_class.select_attribute(name)
- if prop == null then
+ var lc = type_recv.local_class
+ if not lc.has_global_property_by_name(name) then
v.error(self, "Error: Attribute {name} doesn't exists in {type_recv}.")
return
- else if v.module.visibility_for(prop.global.local_class.module) < 3 then
+ end
+ var prop = lc.select_attribute(name)
+ if v.module.visibility_for(prop.global.local_class.module) < 3 then
v.error(self, "Error: Attribute {name} from {prop.global.local_class.module} is invisible in {v.module}")
end
_prop = prop
private meth get_property(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, name: Symbol): MMMethod
do
if type_recv == null then return null
- var prop = type_recv.local_class.select_method(name)
+ var lc = type_recv.local_class
+ var prop: MMMethod = null
+ if lc.has_global_property_by_name(name) then prop = lc.select_method(name)
if prop == null and v.local_property.global.is_init then
var props = type_recv.local_class.super_methods_named(name)
if props.length > 1 then
end
if cd != null then
if cs.length == 0 then
- v.error(self, "Error: {name} does not require blocs.")
+ v.error(self, "Error: {name} does not require blocks.")
else if cd.length > cs.length or cd.length < min_arity then
- v.error(self, "Error: {name} requires {cs.length} blocs, {cd.length} found.")
+ v.error(self, "Error: {name} requires {cs.length} blocks, {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]
+ # Initialize the break list if a value is required for breaks (ie. if the method is a function)
+ var break_list: Array[ABreakExpr] = null
+ if t != null then break_list = new Array[ABreakExpr]
+
+ # Process each closure definition
for i in [0..cd.length[ do
- cd[i].accept_typing2(v, cs[i])
+ var csi = cs[i]
+ var cdi = cd[i]
+ var esc = new EscapableClosure(cdi, csi, break_list)
+ v.escapable_ctx.push(esc)
+ cdi.accept_typing2(v, esc)
+ v.escapable_ctx.pop
end
- for n in v.break_list do
- var ntype = n.stype
- if t == null or (t != null and t < ntype) then
- t = ntype
+
+ # Check break type conformity
+ if break_list != null then
+ for n in break_list do
+ var ntype = n.stype
+ if t == null or (t != null and t < ntype) then
+ t = ntype
+ end
+ end
+ for n in break_list do
+ v.check_conform_expr(n, t)
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.")
+ v.error(self, "Error: {name} requires {cs.length} blocks.")
end
return t
end
end
end
end
+
super
end
-
+
redef meth closure_defs
do
if n_closure_defs == null or n_closure_defs.is_empty then
end
redef class PClosureDef
+ # The corresponding escapable object
+ readable attr _escapable: EscapableBlock
+
attr _accept_typing2: Bool
redef meth accept_typing(v)
do
if _accept_typing2 then super
end
- private meth accept_typing2(v: TypingVisitor, clos: MMClosure) is abstract
+ private meth accept_typing2(v: TypingVisitor, esc: EscapableClosure) is abstract
end
redef class AClosureDef
- redef meth accept_typing2(v, clos)
- do
- var sig = clos.signature
+ redef meth accept_typing2(v, esc)
+ do
+ _escapable = esc
+
+ var sig = esc.closure.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
+ closure = esc.closure
v.variable_ctx = v.variable_ctx.sub
variables = new Array[AutoVariable]
_accept_typing2 = true
accept_typing(v)
-
- v.closure = old_clos
end
end