if _variables.has_key(v) then
return _variables[v]
else
- var reg = new_register(v.stype.as(not null))
+ var t = v.stype
+ if t == null then t = visitor.type_object.as_nullable
+ var reg = new_register(t)
_variables[v] = reg
return reg
end
redef fun accept_icode_generation(vv)
do
var v = vv.icode_ctx
- var iclos = variable.closure.signature.generate_empty_iclosuredef
+ var iclos = variable.closure.signature.generate_empty_iclosuredef(v)
var old_seq = v.seq
v.seq = iclos.body
escapable.continue_seq = iclos.body
escapable.continue_value = iclos.result
+ escapable.break_seq = v.return_seq
+ escapable.break_value = v.return_value
n_signature.fill_iroutine_parameters(v, variable.closure.signature, iclos.params, null)
if n_expr != null then
v.generate_stmt(n_expr)
v.iroutine.closure_decls[position].default = iclos
+
+ # Add a final break in case of break block witout value
+ if variable.closure.is_break and v.return_value == null then
+ v.add_escape(v.return_seq.as(not null))
+ end
end
v.seq = old_seq
end
end
else if c == once "NativeArray".to_symbol then
if n == once "object_id".to_symbol then
- s = "TAG_Int(UNBOX_NativeArray(@@@))"
+ s = "TAG_Int(((Nit_NativeArray)@@@)->object_id)"
else if n == once "[]".to_symbol then
- s = "UNBOX_NativeArray(@@@)[UNTAG_Int(@@@)]"
+ s = "((Nit_NativeArray)@@@)->val[UNTAG_Int(@@@)]"
else if n == once "[]=".to_symbol then
- s = "UNBOX_NativeArray(@@@)[UNTAG_Int(@@@)]=@@@;"
+ s = "((Nit_NativeArray)@@@)->val[UNTAG_Int(@@@)]=@@@"
else if n == once "copy_to".to_symbol then
var t = p[0]
p[0] = p[1]
p[1] = t
- s = "(void)memcpy(UNBOX_NativeArray(@@@), UNBOX_NativeArray(@@@), UNTAG_Int(@@@)*sizeof(val_t));"
+ s = "(void)memcpy(((Nit_NativeArray )@@@)->val, ((Nit_NativeArray)@@@)->val, UNTAG_Int(@@@)*sizeof(val_t))"
end
else if c == once "NativeString".to_symbol then
if n == once "object_id".to_symbol then
s = "(void)memcpy(UNBOX_NativeString(@@@)+UNTAG_Int(@@@), UNBOX_NativeString(@@@)+UNTAG_Int(@@@), UNTAG_Int(@@@));"
end
else if n == once "object_id".to_symbol then
- s = "TAG_Int((bigint)@@@)"
+ s = "TAG_Int((bigint)((obj_t)@@@)[1].object_id)"
else if n == once "sys".to_symbol then
s = "(G_sys)"
else if n == once "is_same_type".to_symbol then
s = "exit(UNTAG_Int(@@@));"
else if n == once "calloc_array".to_symbol then
p[0] = p[1]
- s = "BOX_NativeArray((val_t*)malloc((UNTAG_Int(@@@) * sizeof(val_t))))"
+ s = "NEW_NativeArray(UNTAG_Int(@@@), sizeof(val_t))"
else if n == once "calloc_string".to_symbol then
p[0] = p[1]
- s = "BOX_NativeString((char*)malloc((UNTAG_Int(@@@) * sizeof(char))))"
+ s = "BOX_NativeString((char*)raw_alloc((UNTAG_Int(@@@) * sizeof(char))))"
end
if s == null then
v.visitor.error(self, "Fatal error: unknown intern method {method.full_name}.")
if ne != null then
v.add_assignment(v.return_value.as(not null), v.generate_expr(ne))
end
- v.stmt(new IEscape(v.return_seq.as(not null)))
+ v.add_escape(v.return_seq.as(not null))
return null
end
end
if ne != null then
v.add_assignment(escapable.break_value.as(not null), v.generate_expr(ne))
end
- v.stmt(new IEscape(escapable.break_seq.as(not null)))
+ v.add_escape(escapable.break_seq.as(not null))
return null
end
end
if ne != null then
v.add_assignment(escapable.continue_value.as(not null), v.generate_expr(ne))
end
- v.stmt(new IEscape(escapable.continue_seq.as(not null)))
+ v.add_escape(escapable.continue_seq.as(not null))
return null
end
end
# Process escape (condition is false)
v.seq = iif.else_seq
- v.stmt(new IEscape(iloop))
+ v.add_escape(iloop)
v.seq = seq_old
return null
do
var expr_type = n_expr.stype
- # Get iterator
- var meth_iterator = v.visitor.get_method(expr_type, once "iterator".to_symbol)
-
- var iter_type = meth_iterator.signature_for(expr_type).return_type.as(not null)
- var ireg_iter = v.expr(new ICall(meth_iterator, [v.generate_expr(n_expr)]), iter_type)
-
- # Enter loop
- var seq_old = v.seq
- var iloop = new ILoop
- v.stmt(iloop)
- escapable.break_seq = iloop
- v.seq = iloop
-
- # Condition evaluation
- var meth_is_ok = v.visitor.get_method(iter_type, once ("is_ok".to_symbol))
- var ireg_isok = v.expr(new ICall(meth_is_ok, [ireg_iter]), v.visitor.type_bool)
- var iif = new IIf(ireg_isok)
+ # Get iterate
+ var meth_iterate = v.visitor.get_method(expr_type, once "iterate".to_symbol)
- # Process insite the loop (condition is true)
- v.stmt(iif)
- v.seq = iif.then_seq
- escapable.continue_seq = iif.then_seq
+ # Build closure
+ var iclos = meth_iterate.signature.closures.first.signature.generate_empty_iclosuredef(v)
+ var old_seq = v.seq
- # Automatic variable assignment
- var meth_item = v.visitor.get_method(iter_type, once ("item".to_symbol))
- var va_stype = variable.stype.as(not null)
- var ireg_item = v.expr(new ICall(meth_item, [ireg_iter]), va_stype)
- var ireg_va = v.variable(variable)
- v.add_assignment(ireg_va, ireg_item)
+ var seq = new ISeq
+ v.stmt(seq)
+ v.seq = seq
+ escapable.break_seq = seq
+ escapable.break_value = null
- # Body evaluation
+ v.seq = iclos.body
+ escapable.continue_seq = iclos.body
+ escapable.continue_value = null
+ v.stmt(new IMove(v.variable(variable), iclos.params.first))
v.generate_stmt(n_block)
- # Exit contition (condition is false)
- v.seq = iif.else_seq
- v.stmt(new IEscape(iloop))
-
- # Next step
- var meth_next = v.visitor.get_method(iter_type, once ("next".to_symbol))
- v.seq = iloop
- v.stmt(new ICall(meth_next, [ireg_iter]))
+ # Call closure
+ v.seq = seq
+ v.add_call(meth_iterate, [v.generate_expr(n_expr)], [iclos])
- v.seq = seq_old
+ v.seq = old_seq
return null
end
end
v.stmt(iif)
var seq_old = v.seq
v.seq = iif.else_seq
+ v.generate_stmt(n_else)
var id = n_id
if id == null then
v.add_abort("Assert failed")
v.generate_stmt(n_expr)
+ # Add a final break in case of break block witout value
+ if closure.is_break and escapable.break_value == null then
+ v.add_escape(escapable.break_seq.as(not null))
+ end
+
v.seq = seq_old
_iclosure_def = iclos
return iclos
v.add_assignment(r, r2)
end
v.seq = iif.else_seq
- var r3 = v.inline_routine(closdecl_default, args)
+ var r3 = v.inline_routine(closdecl_default, args, null)
if r != null then
assert r3 != null
v.add_assignment(r, r3)
nitlanguage / nit.git / blobdiff