# Compile a statment node
meth compile_stmt(n: PExpr)
do
- add_instr("/* Compile stmt {n.locate} */")
+ if n == null then return
+ #add_instr("/* Compile stmt {n.locate} */")
n.prepare_compile_stmt(self)
var i = cfc._variable_index
n.compile_stmt(self)
# Compile is expression node
meth compile_expr(n: PExpr): String
do
- add_instr("/* Compile expr {n.locate} */")
+ #add_instr("/* Compile expr {n.locate} */")
var i = cfc._variable_index
var s = n.compile_expr(self)
cfc._variable_index = i
- if s[0] == ' ' then
+ if s[0] == ' ' or cfc.is_valid_variable(s) then
return s
end
- var v = cfc.get_var("Result for expr {n.locate}")
+ var v = cfc.get_var("Result")
add_assignment(v, s)
return v
end
# Ensure that a c expression is a var
meth ensure_var(s: String, comment: String): String
do
- if s.substring(0,3) == "variable" then
+ if cfc.is_valid_variable(s) then
+ add_instr("/* Ensure var {s}: {comment}*/")
return s
end
var v = cfc.get_var(null)
return s.to_s
end
- redef init(module: MMSrcModule)
- do
- super
- end
-
meth invoke_super_init_calls_after(start_prop: MMMethod)
do
var n = nmc.method.node
end
end
#s.append(" {p}")
- p.compile_call(self, cargs)
+ p.compile_stmt_call(self, cargs)
i += 1
end
#s.append(" ]")
# Total number of variable
attr _variable_index_max: Int = 0
- # Association between nit variable and the corrsponding c variable
- attr _varnames: Map[Variable, String] = new HashMap[Variable, String]
+ # Association between nit variable and the corrsponding c variable index
+ attr _varindexes: Map[Variable, Int] = new HashMap[Variable, Int]
# Are we currenlty in a closure definition?
readable writable attr _closure: NitMethodContext = null
+ # Return the cvariable of a Nit variable
meth varname(v: Variable): String
do
- if _closure != null then
- return "closctx->{_varnames[v]}"
+ if v isa ClosureVariable then
+ return closure_variable(_varindexes[v])
else
- return _varnames[v]
+ return variable(_varindexes[v])
end
end
var v = variable(_variable_index)
_variable_index = _variable_index + 1
if _variable_index > _variable_index_max then
- #visitor.add_decl("val_t {v};")
_variable_index_max = _variable_index
end
if comment != null then
meth register_variable(v: Variable): String
do
+ _varindexes[v] = _variable_index
var s = get_var("Local variable")
- _varnames[v] = "variable[{_variable_index-1}]"
return s
end
meth register_closurevariable(v: ClosureVariable): String
do
var s = "closurevariable[{_closurevariable_index}]"
+ _varindexes[v] = _closurevariable_index
_closurevariable_index += 1
- _varnames[v] = s
if _closure != null then
return "(closctx->{s})"
else
end
end
- # Return the ith variable
+ # Return the ith cvariable
protected meth variable(i: Int): String
do
- if _closure != null then
- return "(closctx->variable[{i}])"
+ if closure != null then
+ var vn = once new Array[String]
+ if vn.length <= i then
+ for j in [vn.length..i] do
+ vn[j] = "(closctx->variable[{j}])"
+ end
+ end
+ return vn[i]
+ else
+ var vn = once new Array[String]
+ if vn.length <= i then
+ for j in [vn.length..i] do
+ vn[j] = "variable[{j}]"
+ end
+ end
+ return vn[i]
+ end
+ end
+
+ # Return the ith closurevariable
+ protected meth closure_variable(i: Int): String
+ do
+ if closure != null then
+ return "(closctx->closurevariable[{i}])"
else
- return "variable[{i}]"
+ return "closurevariable[{i}]"
+ end
+ end
+
+ # Is s a valid variable
+ protected meth is_valid_variable(s: String): Bool
+ do
+ for i in [0.._variable_index[ do
+ if s == variable(i) then return true
end
+ return false
end
# Mark the variable available
end
redef class MMMethod
+ # Compile as an expression.
+ # require that signature.return_type != null
+ meth compile_expr_call(v: CompilerVisitor, cargs: Array[String]): String
+ do
+ assert signature.return_type != null
+ var s = intern_compile_call(v, cargs)
+ assert s != null
+ return s
+ end
+
+ # Compile as a statement.
+ # require that signature.return_type == null
+ meth compile_stmt_call(v: CompilerVisitor, cargs: Array[String])
+ do
+ assert signature.return_type == null
+ var s = intern_compile_call(v, cargs)
+ assert s == null
+ end
+
# Compile a call on self for given arguments
# Most calls are compiled with a table access,
# primitive calles are inlined
# == and != are guarded and possibly inlined
- meth compile_call(v: CompilerVisitor, cargs: Array[String]): String
+ private meth intern_compile_call(v: CompilerVisitor, cargs: Array[String]): String
do
var i = self
if i isa MMSrcMethod then
var ne = once "!=".to_symbol
if name == ne then
var eqp = signature.recv.local_class.select_method(ee)
- var eqcall = eqp.compile_call(v, cargs)
+ var eqcall = eqp.compile_expr_call(v, cargs)
return "TAG_Bool(!UNTAG_Bool({eqcall}))"
end
if global.is_init then
v.nmc.break_value = old_bv
# Call
- var e = compile_call(v, realcargs)
+ var e = intern_compile_call(v, realcargs)
if e != null then
v.add_assignment(ve, e)
e = ve
for i in [1..f[ do
args.add(params[i])
end
- sp.compile_call(v, args)
+ sp.compile_stmt_call(v, args)
else
- sp.compile_call(v, args_recv)
+ sp.compile_stmt_call(v, args_recv)
end
end
for i in [f..params.length[ do
redef class MMType
# Compile a subtype check to self
# Return a NIT Bool
- meth compile_cast(v: CompilerVisitor, recv: String): String
+ meth compile_cast(v: CompilerVisitor, recv: String, fromtype: MMType): String
do
# Fixme: handle formaltypes
var g = local_class.global
- return "TAG_Bool(({recv}==NIT_NULL) || VAL_ISA({recv}, {g.color_id}, {g.id_id})) /*cast {self}*/"
+ var s = ""
+ if fromtype.is_nullable then
+ if self.is_nullable then
+ s = "({recv}==NIT_NULL) || "
+ else
+ s = "({recv}!=NIT_NULL) && "
+ end
+ else
+ # FIXME This is used to not break code without the nullable KW
+ s = "({recv}==NIT_NULL) || "
+ end
+ return "TAG_Bool({s}VAL_ISA({recv}, {g.color_id}, {g.id_id})) /*cast {self}*/"
end
# Compile a cast assertion
- meth compile_type_check(v: CompilerVisitor, recv: String, n: PNode)
+ meth compile_type_check(v: CompilerVisitor, recv: String, n: PNode, fromtype: MMType)
do
# Fixme: handle formaltypes
var g = local_class.global
- v.add_instr("if (({recv}!=NIT_NULL) && !VAL_ISA({recv}, {g.color_id}, {g.id_id})) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;")
+ var s = ""
+ if fromtype.is_nullable then
+ if self.is_nullable then
+ s = "({recv}!=NIT_NULL) && "
+ else
+ s = "({recv}==NIT_NULL) || "
+ end
+ else
+ # FIXME This is used to not break code without the nullable KW
+ s = "({recv}!=NIT_NULL) && "
+ end
+ v.add_instr("if ({s}!VAL_ISA({recv}, {g.color_id}, {g.id_id})) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;")
+ end
+
+ # Compile a notnull cast assertion
+ meth compile_notnull_check(v: CompilerVisitor, recv: String, n: PNode)
+ do
+ if is_nullable then
+ v.add_instr("if (({recv}==NIT_NULL)) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;")
+ end
end
end
# FIXME: do not test always
# FIXME: handle formal types
v.add_instr("/* check if p<{ap.variable.stype} with p:{orig_type} */")
- ap.variable.stype.compile_type_check(v, params[ap.position], ap)
+ ap.variable.stype.compile_type_check(v, params[ap.position], ap, orig_type)
end
v.add_assignment(cname, params[ap.position])
end
if self isa AConcreteInitPropdef then
v.invoke_super_init_calls_after(null)
end
- if n_block != null then
- v.compile_stmt(n_block)
- end
+ v.compile_stmt(n_block)
v.add_instr("{v.nmc.return_label}: while(false);")
if self isa AConcreteInitPropdef then
v.add_instr("init_table[{itpos}] = 1;")
redef class ADoExpr
redef meth compile_stmt(v)
do
- if n_block != null then
- v.compile_stmt(n_block)
- end
+ v.compile_stmt(n_block)
end
end
end
end
-redef class AControlableBlock
+class AControlableBlock
+special PExpr
meth compile_inside_block(v: CompilerVisitor) is abstract
redef meth compile_stmt(v)
do
end
redef class AWhileExpr
+special AControlableBlock
redef meth compile_inside_block(v)
do
v.add_instr("while (true) \{ /*while*/")
var e = v.compile_expr(n_expr)
v.add_instr("if (!UNTAG_Bool({e})) break; /* while*/")
v.cfc.free_var(e)
- if n_block != null then
- v.compile_stmt(n_block)
- end
+ v.compile_stmt(n_block)
v.add_instr("{v.nmc.continue_label}: while(0);")
v.unindent
v.add_instr("}")
end
redef class AForExpr
+special AControlableBlock
redef meth compile_inside_block(v)
do
var e = v.compile_expr(n_expr)
var ittype = meth_iterator.signature.return_type
v.cfc.free_var(e)
var iter = v.cfc.get_var("For iterator")
- v.add_assignment(iter, meth_iterator.compile_call(v, [e]))
+ v.add_assignment(iter, meth_iterator.compile_expr_call(v, [e]))
v.add_instr("while (true) \{ /*for*/")
v.indent
var ok = v.cfc.get_var("For 'is_ok' result")
- v.add_assignment(ok, meth_is_ok.compile_call(v, [iter]))
+ v.add_assignment(ok, meth_is_ok.compile_expr_call(v, [iter]))
v.add_instr("if (!UNTAG_Bool({ok})) break; /*for*/")
v.cfc.free_var(ok)
- var e = meth_item.compile_call(v, [iter])
+ var e = meth_item.compile_expr_call(v, [iter])
e = v.ensure_var(e, "For item")
var cname = v.cfc.register_variable(variable)
v.add_assignment(cname, e)
- var n_block = n_block
- if n_block != null then
- v.compile_stmt(n_block)
- end
+ v.compile_stmt(n_block)
v.add_instr("{v.nmc.continue_label}: while(0);")
- e = meth_next.compile_call(v, [iter])
- assert e == null
+ meth_next.compile_stmt_call(v, [iter])
v.unindent
v.add_instr("}")
v.add_instr("{v.nmc.break_label}: while(0);")
do
var e1 = v.cfc.varname(variable)
var e2 = v.compile_expr(n_value)
- var e3 = assign_method.compile_call(v, [e1, e2])
+ var e3 = assign_method.compile_expr_call(v, [e1, e2])
v.add_assignment(v.cfc.varname(variable), "{e3} /*{variable.name}*/")
end
end
redef meth compile_expr(v)
do
var e = v.compile_expr(n_expr)
- return n_type.stype.compile_cast(v, e)
+ return n_type.stype.compile_cast(v, e, n_expr.stype)
end
end
redef meth compile_expr(v)
do
var e = v.compile_expr(n_expr)
- n_type.stype.compile_type_check(v, e, self)
+ n_type.stype.compile_type_check(v, e, self, n_expr.stype)
+ return e
+ end
+end
+
+redef class AAsNotnullExpr
+ redef meth compile_expr(v)
+ do
+ var e = v.compile_expr(n_expr)
+ n_expr.stype.compile_notnull_check(v, e, self)
return e
end
end
for ne in n_exprs do
var e = v.ensure_var(v.compile_expr(ne), "super-string element")
if ne.stype != stype then
- v.add_assignment(e, meth_to_s.compile_call(v, [e]))
+ v.cfc.free_var(e)
+ e = meth_to_s.compile_expr_call(v, [e])
end
- meth_add.compile_call(v, [array, e])
+ v.cfc.free_var(e)
+ meth_add.compile_stmt_call(v, [array, e])
end
- return meth_to_s.compile_call(v, [array])
+ return meth_to_s.compile_expr_call(v, [array])
end
end
for ne in n_exprs do
var e = v.compile_expr(ne)
- meth_add.compile_call(v, [recv, e])
+ meth_add.compile_stmt_call(v, [recv, e])
end
return recv
end
redef class ASuperExpr
redef meth compile_stmt(v)
do
- var e = compile_expr(v)
- if e != null then v.add_instr("{e};")
+ var e = intern_compile_call(v)
+ if e != null then
+ v.add_instr(e + ";")
+ end
end
redef meth compile_expr(v)
do
+ var e = intern_compile_call(v)
+ assert e != null
+ return e
+ end
+
+ private meth intern_compile_call(v: CompilerVisitor): String
+ do
var arity = v.nmc.method_params.length - 1
if init_in_superclass != null then
arity = init_in_superclass.signature.arity
end
#return "{prop.cname}({args.join(", ")}) /*super {prop.local_class}::{prop.name}*/"
if init_in_superclass != null then
- return init_in_superclass.compile_call(v, args)
+ return init_in_superclass.intern_compile_call(v, args)
else
if prop.global.is_init then args.add("init_table")
return prop.compile_super_call(v, args)
var e1 = v.compile_expr(n_expr)
var e2 = prop.compile_access(v, e1)
var e3 = v.compile_expr(n_value)
- var e4 = assign_method.compile_call(v, [e2, e3])
+ var e4 = assign_method.compile_expr_call(v, [e2, e3])
v.add_assignment(e2, e4)
end
end
+redef class AAbsAbsSendExpr
+ # Compile each argument and add them to the array
+ meth compile_arguments_in(v: CompilerVisitor, cargs: Array[String])
+ do
+ for a in arguments do
+ cargs.add(v.compile_expr(a))
+ end
+ end
+
+end
+
redef class ASendExpr
- redef meth compile_expr(v)
+ private meth intern_compile_call(v: CompilerVisitor): String
do
var recv = v.compile_expr(n_expr)
var cargs = new Array[String]
cargs.add(recv)
- for a in arguments do
- cargs.add(v.compile_expr(a))
- end
+ compile_arguments_in(v, cargs)
var e: String
if prop_signature.closures.is_empty then
- e = prop.compile_call(v, cargs)
+ e = prop.intern_compile_call(v, cargs)
else
e = prop.compile_call_and_closures(v, cargs, closure_defs)
end
return e
end
+ redef meth compile_expr(v)
+ do
+ var e = intern_compile_call(v)
+ assert e != null
+ return e
+ end
+
redef meth compile_stmt(v)
do
- var e = compile_expr(v)
+ var e = intern_compile_call(v)
if e != null then
v.add_instr(e + ";")
end
end
redef class ASendReassignExpr
- redef meth compile_expr(v)
+ redef meth compile_expr(v) do abort
+
+ redef meth compile_stmt(v)
do
var recv = v.compile_expr(n_expr)
var cargs = new Array[String]
cargs.add(recv)
- for a in arguments do
- cargs.add(v.compile_expr(a))
- end
+ compile_arguments_in(v, cargs)
- var e2 = read_prop.compile_call(v, cargs)
+ var e2 = read_prop.compile_expr_call(v, cargs)
var e3 = v.compile_expr(n_value)
- var e4 = assign_method.compile_call(v, [e2, e3])
+ var e4 = assign_method.compile_expr_call(v, [e2, e3])
cargs.add(e4)
- return prop.compile_call(v, cargs)
+ prop.compile_stmt_call(v, cargs)
end
end
redef meth compile_expr(v)
do
var cargs = new Array[String]
- for a in arguments do
- cargs.add(v.compile_expr(a))
- end
+ compile_arguments_in(v, cargs)
return prop.compile_constructor_call(v, stype, cargs)
end
+
+ redef meth compile_stmt(v) do abort
end
redef class PClosureDef
v.nmc.continue_label = "continue_label{v.new_number}"
v.nmc.break_label = v.nmc.return_label
- if n_expr != null then v.compile_stmt(n_expr)
+ v.compile_stmt(n_expr)
v.add_instr("{v.nmc.continue_label}: while(false);")
v.nmc.continue_label = "continue_label{v.new_number}"
v.nmc.break_label = v.nmc.return_label
- if n_expr != null then v.compile_stmt(n_expr)
+ v.compile_stmt(n_expr)
v.add_instr("{v.nmc.continue_label}: while(false);")
end
redef class AClosureCallExpr
- redef meth compile_expr(v)
+ meth intern_compile_call(v: CompilerVisitor): String
do
var cargs = new Array[String]
- for a in arguments do cargs.add(v.compile_expr(a))
+ compile_arguments_in(v, cargs)
var va: String = null
if variable.closure.signature.return_type != null then va = v.cfc.get_var("Closure call result value")
end
return va
end
+
+ redef meth compile_expr(v)
+ do
+ var e = intern_compile_call(v)
+ assert e != null
+ return e
+ end
+
+ redef meth compile_stmt(v)
+ do
+ var e = intern_compile_call(v)
+ if e != null then
+ v.add_instr(e + ";")
+ end
+ end
end
redef class AProxyExpr
nitlanguage / nit.git / blobdiff