X-Git-Url: http://nitlanguage.org diff --git a/src/syntax/icode_generation.nit b/src/syntax/icode_generation.nit index 15255a7..afb15b7 100644 --- a/src/syntax/icode_generation.nit +++ b/src/syntax/icode_generation.nit @@ -24,7 +24,7 @@ private import primitive_info # An AST2ICode context stores the currently built icode informations class A2IContext -special ICodeBuilder + super ICodeBuilder redef fun stmt(s: ICode) do if _current_node != null then @@ -39,7 +39,7 @@ special ICodeBuilder fun add_new_array(stype: MMType, length: Int): IRegister do var prop = visitor.get_method(stype, once "with_capacity".to_symbol) - var ni = expr(new INative("TAG_Int({length})", null), visitor.type_int) + var ni = expr(new IIntValue(length.to_s), visitor.type_int) return expr(new INew(stype, prop, [ni]), stype) end @@ -84,7 +84,7 @@ special ICodeBuilder init(visitor: AbsSyntaxVisitor, r: IRoutine, m: nullable MMMethod) do - super(visitor.module, r) + super(visitor.mmmodule, r) _visitor = visitor _return_seq = r.body _return_value = r.result @@ -279,7 +279,7 @@ redef class MMImplicitInit end class A2IVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor writable var _icode_ctx: nullable A2IContext fun icode_ctx: A2IContext do return _icode_ctx.as(not null) redef fun visit(n) do n.accept_icode_generation(self) @@ -397,25 +397,11 @@ redef class AExternMethPropdef redef fun fill_iroutine(v, method) do var params = v.iroutine.params - var ename = "{method.module.name}_{method.local_class.name}_{method.local_class.name}_{method.name}_{method.signature.arity}" - if n_extern != null then - ename = n_extern.text - ename = ename.substring(1, ename.length-2) - end - var sig = method.signature - assert params.length == sig.arity + 1 - var args = new Array[String] - args.add(sig.recv.unboxtype("@@@")) - for i in [0..sig.arity[ do - args.add(sig[i].unboxtype("@@@")) - end - var s = "{ename}({args.join(", ")})" - var rtype = sig.return_type + var rtype = method.signature.return_type if rtype != null then - s = rtype.boxtype(s) - v.add_return_value(v.expr(new INative(s, params), rtype)) + v.add_return_value(v.expr(new INative(method, params), rtype)) else - v.stmt(new INative(s, params)) + v.stmt(new INative(method, params)) end end end @@ -423,187 +409,12 @@ end redef class AInternMethPropdef redef fun fill_iroutine(v, method) do - var p = v.iroutine.params.to_a - var c = method.local_class.name - var n = method.name - var s: nullable String = null - if c == once "Int".to_symbol then - if n == once "object_id".to_symbol then - s = "@@@" - else if n == once "unary -".to_symbol then - s = "TAG_Int(-UNTAG_Int(@@@))" - else if n == once "output".to_symbol then - s = "printf(\"%ld\\n\", UNTAG_Int(@@@));" - else if n == once "ascii".to_symbol then - s = "TAG_Char(UNTAG_Int(@@@))" - else if n == once "succ".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)+1)" - else if n == once "prec".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)-1)" - else if n == once "to_f".to_symbol then - s = "BOX_Float((float)UNTAG_Int(@@@))" - else if n == once "+".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)+UNTAG_Int(@@@))" - else if n == once "-".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)-UNTAG_Int(@@@))" - else if n == once "*".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)*UNTAG_Int(@@@))" - else if n == once "/".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)/UNTAG_Int(@@@))" - else if n == once "%".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)%UNTAG_Int(@@@))" - else if n == once "<".to_symbol then - s = "TAG_Bool(UNTAG_Int(@@@)".to_symbol then - s = "TAG_Bool(UNTAG_Int(@@@)>UNTAG_Int(@@@))" - else if n == once "<=".to_symbol then - s = "TAG_Bool(UNTAG_Int(@@@)<=UNTAG_Int(@@@))" - else if n == once ">=".to_symbol then - s = "TAG_Bool(UNTAG_Int(@@@)>=UNTAG_Int(@@@))" - else if n == once "lshift".to_symbol then - s = "TAG_Int(UNTAG_Int(@@@)<".to_symbol then - s = "TAG_Bool(UNBOX_Float(@@@)>UNBOX_Float(@@@))" - else if n == once "<=".to_symbol then - s = "TAG_Bool(UNBOX_Float(@@@)<=UNBOX_Float(@@@))" - else if n == once ">=".to_symbol then - s = "TAG_Bool(UNBOX_Float(@@@)>=UNBOX_Float(@@@))" - end - else if c == once "Char".to_symbol then - if n == once "object_id".to_symbol then - s = "TAG_Int(UNTAG_Char(@@@))" - else if n == once "unary -".to_symbol then - s = "TAG_Char(-UNTAG_Char(@@@))" - else if n == once "output".to_symbol then - s = "printf(\"%c\", (unsigned char)UNTAG_Char(@@@));" - else if n == once "ascii".to_symbol then - s = "TAG_Int((unsigned char)UNTAG_Char(@@@))" - else if n == once "succ".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)+1)" - else if n == once "prec".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)-1)" - else if n == once "to_i".to_symbol then - s = "TAG_Int(UNTAG_Char(@@@)-'0')" - else if n == once "+".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)+UNTAG_Char(@@@))" - else if n == once "-".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)-UNTAG_Char(@@@))" - else if n == once "*".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)*UNTAG_Char(@@@))" - else if n == once "/".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)/UNTAG_Char(@@@))" - else if n == once "%".to_symbol then - s = "TAG_Char(UNTAG_Char(@@@)%UNTAG_Char(@@@))" - else if n == once "<".to_symbol then - s = "TAG_Bool(UNTAG_Char(@@@)".to_symbol then - s = "TAG_Bool(UNTAG_Char(@@@)>UNTAG_Char(@@@))" - else if n == once "<=".to_symbol then - s = "TAG_Bool(UNTAG_Char(@@@)<=UNTAG_Char(@@@))" - else if n == once ">=".to_symbol then - s = "TAG_Bool(UNTAG_Char(@@@)>=UNTAG_Char(@@@))" - else if n == once "==".to_symbol then - s = "TAG_Bool((@@@)==(@@@))" - else if n == once "!=".to_symbol then - s = "TAG_Bool((@@@)!=(@@@))" - end - else if c == once "Bool".to_symbol then - if n == once "object_id".to_symbol then - s = "TAG_Int(UNTAG_Bool(@@@))" - else if n == once "unary -".to_symbol then - s = "TAG_Bool(-UNTAG_Bool(@@@))" - else if n == once "output".to_symbol then - s = "(void)printf(UNTAG_Bool(@@@)?\"true\\n\":\"false\\n\");" - else if n == once "ascii".to_symbol then - s = "TAG_Bool(UNTAG_Bool(@@@))" - else if n == once "to_i".to_symbol then - s = "TAG_Int(UNTAG_Bool(@@@))" - else if n == once "==".to_symbol then - s = "TAG_Bool((@@@)==(@@@))" - else if n == once "!=".to_symbol then - s = "TAG_Bool((@@@)!=(@@@))" - end - else if c == once "NativeArray".to_symbol then - if n == once "object_id".to_symbol then - s = "TAG_Int(((Nit_NativeArray)@@@)->object_id)" - else if n == once "[]".to_symbol then - s = "((Nit_NativeArray)@@@)->val[UNTAG_Int(@@@)]" - else if n == once "[]=".to_symbol then - 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(((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 = "TAG_Int(UNBOX_NativeString(@@@))" - else if n == once "atoi".to_symbol then - s = "TAG_Int(atoi(UNBOX_NativeString(@@@)))" - else if n == once "[]".to_symbol then - s = "TAG_Char(UNBOX_NativeString(@@@)[UNTAG_Int(@@@)])" - else if n == once "[]=".to_symbol then - s = "UNBOX_NativeString(@@@)[UNTAG_Int(@@@)]=UNTAG_Char(@@@);" - else if n == once "copy_to".to_symbol then - var t = p[0] - p[0] = p[1] - p[1] = p[4] - p[4] = p[2] - p[2] = t - 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)((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 = "TAG_Bool((VAL2VFT(@@@)==VAL2VFT(@@@)))" - else if n == once "exit".to_symbol then - p[0] = p[1] - s = "exit(UNTAG_Int(@@@));" - else if n == once "calloc_array".to_symbol then - p[0] = p[1] - 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*)raw_alloc((UNTAG_Int(@@@) * sizeof(char))))" - end - if s == null then - v.visitor.error(self, "Fatal error: unknown intern method {method.full_name}.") - s = "NIT_NULL" - end + var params = v.iroutine.params var rtype = method.signature.return_type if rtype != null then - v.add_return_value(v.expr(new INative(s, p), rtype)) + v.add_return_value(v.expr(new INative(method, params), rtype)) else - v.stmt(new INative(s, p)) + v.stmt(new INative(method, params)) end end end @@ -965,6 +776,36 @@ redef class ANotExpr end end +redef class AOrElseExpr + redef fun generate_icode(v) + do + # Compute left operand + var e = v.generate_expr(n_expr) + + # Prepare result + var reg = v.new_register(stype) + + # Compare left and null + var n = v.lit_null_reg + var c = v.expr(new IIs(e, n), v.mmmodule.type_bool) + var iif = new IIf(c) + v.stmt(iif) + var old_seq = v.seq + + # if equal, result = right opr + v.seq = iif.then_seq + v.add_assignment(reg, v.generate_expr(n_expr2)) + + # else, result = left operand + v.seq = iif.else_seq + v.add_assignment(reg, e) + + v.seq = old_seq + + return reg + end +end + redef class AIsaExpr redef fun generate_icode(v) do @@ -1008,21 +849,21 @@ end redef class AIntExpr redef fun generate_icode(v) do - return v.expr(new INative("TAG_Int({n_number.text})", null), stype) + return v.expr(new IIntValue(n_number.text), stype) end end redef class AFloatExpr redef fun generate_icode(v) do - return v.expr(new INative("BOX_Float({n_float.text})", null), stype) + return v.expr(new IFloatValue(n_float.text), stype) end end redef class ACharExpr redef fun generate_icode(v) do - return v.expr(new INative("TAG_Char({n_char.text})", null), stype) + return v.expr(new ICharValue(n_char.text), stype) end end @@ -1034,8 +875,8 @@ redef class AStringFormExpr var ionce = new IOnce var reg = v.expr(ionce, stype) v.seq = ionce.body - var ns = v.expr(new INative("BOX_NativeString(\"{_cstring}\")", null), v.visitor.type_nativestring) - var ni = v.expr(new INative("TAG_Int({_cstring_length})", null), v.visitor.type_int) + var ns = v.expr(new IStringValue(_cstring.as(not null)), v.visitor.type_nativestring) + var ni = v.expr(new IIntValue(_cstring_length.to_s), v.visitor.type_int) var prop = v.visitor.get_method(stype, once "with_native".to_symbol) var e = v.expr(new INew(stype, prop, [ns, ni]), stype) v.add_assignment(reg, e)