# Current knowledge about variables names and types
readable writable attr _variable_ctx: VariableContext
+ # Non-bypassable knowledge about variables names and types
+ readable writable attr _base_variable_ctx: VariableContext
+
# Current knowledge about escapable blocks
readable writable attr _escapable_ctx: EscapableContext = new EscapableContext(self)
private meth use_if_true_variable_ctx(e: PExpr)
do
var ctx = e.if_true_variable_ctx
- if ctx != null then
- variable_ctx = ctx
- end
+ if ctx != null then variable_ctx = ctx
+ end
+
+ # Make the if_false_variable_ctx of the expression effective
+ private meth use_if_false_variable_ctx(e: PExpr)
+ do
+ var ctx = e.if_false_variable_ctx
+ if ctx != null then variable_ctx = ctx
end
# Number of nested once
redef meth accept_typing(v)
do
v.variable_ctx = new RootVariableContext(v, self)
+ v.base_variable_ctx = v.variable_ctx
_self_var = v.self_var
super
end
v.variable_ctx.add(variable)
var old_var_ctx = v.variable_ctx
+ var old_base_var_ctx = v.base_variable_ctx
+ v.base_variable_ctx = v.variable_ctx
v.variable_ctx = v.variable_ctx.sub(self)
_escapable = new EscapableClosure(self, variable.closure, null)
old_var_ctx.merge(v.variable_ctx)
v.variable_ctx = old_var_ctx
+ v.base_variable_ctx = old_base_var_ctx
v.escapable_ctx.pop
end
end
# The variable type information if current boolean expression is true
readable private attr _if_true_variable_ctx: VariableContext
+
+ # The variable type information if current boolean expression is false
+ readable private attr _if_false_variable_ctx: VariableContext
end
redef class AVardeclExpr
v.visit(n_expr)
v.check_conform_expr(n_expr, v.type_bool)
+ # Prepare 'then' context
v.use_if_true_variable_ctx(n_expr)
- v.variable_ctx = v.variable_ctx.sub(n_then)
- v.visit(n_then)
+ # Process the 'then'
+ if n_then != null then
+ v.variable_ctx = v.variable_ctx.sub(n_then)
+ v.visit(n_then)
+ end
- if n_else == null then
- # Restore variable ctx since the 'then' block is optional
- v.variable_ctx = old_var_ctx
- else
- # Remember what appened in the 'then'
- var then_var_ctx = v.variable_ctx
- # Reset to process the 'else'
- v.variable_ctx = old_var_ctx.sub(n_else)
+ # Remember what appened in the 'then'
+ var then_var_ctx = v.variable_ctx
+
+ # Prepare 'else' context
+ v.variable_ctx = old_var_ctx
+ v.use_if_false_variable_ctx(n_expr)
+
+ # Process the 'else'
+ if n_else != null then
+ v.variable_ctx = v.variable_ctx.sub(n_else)
v.visit(n_else)
- # Merge then and else in the old control_flow
- old_var_ctx.merge2(then_var_ctx, v.variable_ctx)
- v.variable_ctx = old_var_ctx
end
+
+ # Merge 'then' and 'else' contexts
+ old_var_ctx.merge2(then_var_ctx, v.variable_ctx, v.base_variable_ctx)
+ v.variable_ctx = old_var_ctx
_is_typed = true
end
end
_escapable = new EscapableBlock(self)
v.escapable_ctx.push(_escapable)
var old_var_ctx = v.variable_ctx
+ var old_base_var_ctx = v.base_variable_ctx
+ v.base_variable_ctx = v.variable_ctx
v.variable_ctx = v.variable_ctx.sub(self)
- super
-
+ # Process condition
+ v.visit(n_expr)
v.check_conform_expr(n_expr, v.type_bool)
+
+ # Prepare inside context (assert cond)
+ v.use_if_true_variable_ctx(n_expr)
+
+ # Process inside
+ if n_block != null then
+ v.variable_ctx = v.variable_ctx.sub(n_block)
+ v.visit(n_block)
+ end
+
v.variable_ctx = old_var_ctx
+ v.base_variable_ctx = old_base_var_ctx
v.escapable_ctx.pop
_is_typed = true
end
v.escapable_ctx.push(_escapable)
var old_var_ctx = v.variable_ctx
+ var old_base_var_ctx = v.base_variable_ctx
+ v.base_variable_ctx = v.variable_ctx
v.variable_ctx = v.variable_ctx.sub(self)
var va = new AutoVariable(n_id.to_symbol, self)
variable = va
# pop context
v.variable_ctx = old_var_ctx
+ v.base_variable_ctx = old_base_var_ctx
v.escapable_ctx.pop
_is_typed = true
end
do
v.variable_ctx.mark_is_set(variable)
var t = v.variable_ctx.stype(variable)
- v.check_conform_expr(n_value, t)
+
+ # Check the base type
+ var btype = v.base_variable_ctx.stype(variable)
+ if not v.check_conform_expr(n_value, btype) then return
+
+ # Always cast
+ v.variable_ctx.stype(variable) = n_value.stype
+
_is_typed = true
end
end
var t = v.variable_ctx.stype(variable)
var t2 = do_rvalue_typing(v, t)
if t2 == null then return
- v.check_conform(self, t2, n_value.stype)
+
+ # Check the base type
+ var btype = v.base_variable_ctx.stype(variable)
+ if not v.check_conform(n_value, t2, btype) then return
+
+ # Always cast
+ v.variable_ctx.stype(variable) = t2
+
_is_typed = true
end
end
v.use_if_true_variable_ctx(n_expr)
v.visit(n_then)
v.variable_ctx = old_var_ctx
+ v.use_if_false_variable_ctx(n_expr)
v.visit(n_else)
v.check_conform_expr(n_expr, v.type_bool)
end
redef class AOrExpr
- redef meth after_typing(v)
+ redef meth accept_typing(v)
do
+ var old_var_ctx = v.variable_ctx
+
+ v.visit(n_expr)
+ v.use_if_false_variable_ctx(n_expr)
+
+ v.visit(n_expr2)
+ if n_expr2.if_false_variable_ctx != null then
+ _if_false_variable_ctx = n_expr2.if_false_variable_ctx
+ else
+ _if_false_variable_ctx = v.variable_ctx
+ end
+
+ v.variable_ctx = old_var_ctx
+
v.check_conform_expr(n_expr, v.type_bool)
v.check_conform_expr(n_expr2, v.type_bool)
_stype = v.type_bool
redef meth after_typing(v)
do
v.check_conform_expr(n_expr, v.type_bool)
+
+ # Invert if_true/if_false information
+ _if_false_variable_ctx = n_expr._if_true_variable_ctx
+ _if_true_variable_ctx = n_expr._if_false_variable_ctx
+
_stype = v.type_bool
_is_typed = true
end
closure = esc.closure
var old_var_ctx = v.variable_ctx
+ var old_base_var_ctx = v.base_variable_ctx
+ v.base_variable_ctx = v.variable_ctx
v.variable_ctx = v.variable_ctx.sub(self)
variables = new Array[AutoVariable]
for i in [0..n_id.length[ do
end
end
v.variable_ctx = old_var_ctx
+ v.base_variable_ctx = old_base_var_ctx
end
end
nitlanguage / nit.git / blobdiff