Skip to content

Commit

Permalink
rename ir.Pointer -> ir.Ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
@StunxFS
StunxFS committed Jan 21, 2024
1 parent 89e7ba9 commit 0bf195f
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 52 deletions.
80 changes: 38 additions & 42 deletions rivetc/src/codegen/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ def __init__(self, comp):
self.loop_scope = None
self.while_continue_expr = None

self.throwable_t = None

def gen_source_files(self, source_files):
self.throwable_t = self.ir_type(self.comp.throwable_t)

for mod in self.comp.universe.syms:
if isinstance(mod, sym.Mod):
self.gen_mod_attributes(mod.name, mod.attributes)
Expand Down Expand Up @@ -303,7 +299,7 @@ def gen_decl(self, decl):
if decl.is_method:
self_typ = self.ir_type(decl.self_typ)
if (decl.self_is_ptr or decl.self_is_boxed
) and not isinstance(self_typ, ir.Pointer):
) and not isinstance(self_typ, ir.Ptr):
self_typ = self_typ.ptr(decl.self_is_boxed)
args.append(ir.Ident(self_typ, "self"))
for i, arg in enumerate(decl.args):
Expand Down Expand Up @@ -424,7 +420,7 @@ def gen_stmt(self, stmt):
self.cur_func.add_label(body_label)
value_t_ir = self.ir_type(iterable_sym.info.elem_typ)
value_t_is_boxed = isinstance(
value_t_ir, ir.Pointer
value_t_ir, ir.Ptr
) and value_t_ir.is_managed
if iterable_sym.kind == TypeKind.Array:
value = ir.Inst(
Expand All @@ -440,10 +436,10 @@ def gen_stmt(self, stmt):
), idx
]
)
if stmt.value.is_ref and not isinstance(value_t_ir, ir.Pointer):
value_t_ir = ir.Pointer(value_t_ir)
if stmt.value.is_ref and not isinstance(value_t_ir, ir.Ptr):
value_t_ir = ir.Ptr(value_t_ir)
if not stmt.value.is_ref or (
isinstance(value_t_ir, ir.Pointer) and value_t_ir.is_managed
isinstance(value_t_ir, ir.Ptr) and value_t_ir.is_managed
):
value = ir.Inst(ir.InstKind.LoadPtr, [value], value_t_ir)
unique_ir_name = self.cur_func.unique_name(stmt.value.name)
Expand Down Expand Up @@ -585,8 +581,8 @@ def gen_expr_with_cast(self, expected_typ_, expr, custom_tmp = None):
) and self.comp.is_number(expected_typ_) and expr.typ != expected_typ_:
res_expr = ir.Inst(ir.InstKind.Cast, [res_expr, expected_typ])

if isinstance(res_expr.typ, ir.Pointer) and res_expr.typ != ir.RAWPTR_T:
if isinstance(expected_typ, ir.Pointer):
if isinstance(res_expr.typ, ir.Ptr) and res_expr.typ != ir.RAWPTR_T:
if isinstance(expected_typ, ir.Ptr):
nr_level_expected = expected_typ.nr_level()
nr_level = res_expr.typ.nr_level()
if nr_level > nr_level_expected and expected_typ != ir.RAWPTR_T:
Expand All @@ -605,11 +601,11 @@ def gen_expr_with_cast(self, expected_typ_, expr, custom_tmp = None):
res_expr = ir.Inst(
ir.InstKind.LoadPtr, [res_expr], res_expr.typ.typ
)
elif isinstance(expected_typ, ir.Pointer
elif isinstance(expected_typ, ir.Ptr
) and res_expr.typ not in (ir.VOID_T, ir.RAWPTR_T):
nr_level_expected = expected_typ.nr_level()
nr_level = res_expr.typ.nr_level(
) if isinstance(res_expr.typ, ir.Pointer) else 0
) if isinstance(res_expr.typ, ir.Ptr) else 0
while nr_level < nr_level_expected:
res_expr = ir.Inst(
ir.InstKind.GetPtr, [res_expr], res_expr.typ.ptr()
Expand Down Expand Up @@ -829,7 +825,7 @@ def gen_expr(self, expr, custom_tmp = None):
self.ir_type(expr.typ), obj_f,
ir.Name(f"v{variant_idx}")
)
if isinstance(tmp_t, ir.Pointer):
if isinstance(tmp_t, ir.Ptr):
value = ir.Inst(ir.InstKind.GetPtr, [value], tmp_t)
self.cur_func.inline_alloca(tmp_t, tmp, value)
return ir.Ident(tmp_t, tmp)
Expand Down Expand Up @@ -956,7 +952,7 @@ def gen_expr(self, expr, custom_tmp = None):
ov_m = OVERLOADABLE_OPERATORS_STR[str(single_op)]
left_operand = left
right_operand = right
if not isinstance(expr_left_typ_ir, ir.Pointer):
if not isinstance(expr_left_typ_ir, ir.Ptr):
left_operand = ir.Inst(
ir.InstKind.GetPtr, [left_operand]
)
Expand Down Expand Up @@ -1126,7 +1122,7 @@ def gen_expr(self, expr, custom_tmp = None):
expr.left.left.typ, expr.left.left
)
is_vtable_call = True
if isinstance(self_expr.typ, ir.Pointer):
if isinstance(self_expr.typ, ir.Ptr):
self_expr = ir.Inst(ir.InstKind.LoadPtr, [self_expr], self_expr.typ.typ)
if left_sym.kind == TypeKind.Trait:
if left2_sym.kind == TypeKind.Trait and left_sym != left2_sym:
Expand Down Expand Up @@ -1213,7 +1209,7 @@ def gen_expr(self, expr, custom_tmp = None):
else:
self_expr = self.gen_expr(receiver)
if expr.sym.self_is_ptr and not isinstance(
self_expr.typ, ir.Pointer
self_expr.typ, ir.Ptr
):
self_expr = ir.Inst(ir.InstKind.GetPtr, [self_expr])
elif isinstance(
Expand Down Expand Up @@ -1343,7 +1339,7 @@ def gen_expr(self, expr, custom_tmp = None):
self.cur_func.add_call(
"_R4core15uncatched_errorF", [
ir.Selector(
self.throwable_t,
ir.THROWABLE_T,
res_value, ir.Name("err")
)
]
Expand All @@ -1353,7 +1349,7 @@ def gen_expr(self, expr, custom_tmp = None):
self.cur_func.add_call(
"_R4core18test_error_throwedF", [
ir.Selector(
self.throwable_t,
ir.THROWABLE_T,
res_value, ir.Name("err")
),
self.gen_string_literal(pos),
Expand All @@ -1371,11 +1367,11 @@ def gen_expr(self, expr, custom_tmp = None):
)
self.cur_func.store(
ir.Selector(
self.throwable_t, tmp2,
ir.THROWABLE_T, tmp2,
ir.Name("err")
),
ir.Selector(
self.throwable_t,
ir.THROWABLE_T,
res_value, ir.Name("err")
)
)
Expand All @@ -1397,10 +1393,10 @@ def gen_expr(self, expr, custom_tmp = None):
expr.err_handler.varname, err_ir_name
)
self.cur_func.inline_alloca(
self.throwable_t,
ir.THROWABLE_T,
err_ir_name,
ir.Selector(
self.throwable_t,
ir.THROWABLE_T,
res_value, ir.Name("err")
)
)
Expand Down Expand Up @@ -1706,7 +1702,7 @@ def gen_expr(self, expr, custom_tmp = None):
elif isinstance(expr, ast.UnaryExpr):
if expr.op == Kind.Xor:
right = self.gen_expr(expr.right)
if isinstance(right.typ, ir.Pointer):
if isinstance(right.typ, ir.Ptr):
return right
size, _ = self.comp.type_size(expr.right_typ, True)
res = self.boxed_instance(self.ir_type(expr.right_typ), size)
Expand Down Expand Up @@ -1858,7 +1854,7 @@ def gen_expr(self, expr, custom_tmp = None):
)
var_t = self.ir_type(expr.var.typ)
var_t2 = var_t if isinstance(var_t,
ir.Pointer) else var_t.ptr()
ir.Ptr) else var_t.ptr()
if left_sym.kind == TypeKind.Enum:
union_name = f"{cg_utils.mangle_symbol(left_sym)}6_Union"
union_type = ir.Type(union_name)
Expand All @@ -1877,7 +1873,7 @@ def gen_expr(self, expr, custom_tmp = None):
]
)
if not ((
isinstance(var_t2, ir.Pointer) and var_t2.is_managed
isinstance(var_t2, ir.Ptr) and var_t2.is_managed
) or expr.var.is_ref):
val = ir.Inst(ir.InstKind.LoadPtr, [val], var_t2.typ)
unique_name = self.cur_func.unique_name(expr.var.name)
Expand Down Expand Up @@ -2129,7 +2125,7 @@ def gen_expr(self, expr, custom_tmp = None):
if b.has_var:
var_t = self.ir_type(b.var_typ)
var_t2 = var_t.ptr(
) if not isinstance(var_t, ir.Pointer) else var_t
) if not isinstance(var_t, ir.Ptr) else var_t
e_expr_typ_sym = expr.expr.typ.symbol()
if e_expr_typ_sym.kind == TypeKind.Enum:
obj_f = ir.Selector(
Expand All @@ -2152,7 +2148,7 @@ def gen_expr(self, expr, custom_tmp = None):
]
)
if not (
isinstance(var_t, ir.Pointer)
isinstance(var_t, ir.Ptr)
and var_t.is_managed
):
val = ir.Inst(ir.InstKind.LoadPtr, [val], var_t.typ)
Expand Down Expand Up @@ -2191,12 +2187,12 @@ def gen_expr(self, expr, custom_tmp = None):
)
else:
lhs = match_expr if isinstance(
match_expr.typ, ir.Pointer
match_expr.typ, ir.Ptr
) else ir.Inst(
ir.InstKind.GetPtr, [match_expr]
)
rhs = p_conv if isinstance(
p_conv.typ, ir.Pointer
p_conv.typ, ir.Ptr
) else ir.Inst(ir.InstKind.GetPtr, [p_conv])
inst = ir.Inst(
ir.InstKind.Call, [
Expand Down Expand Up @@ -2356,7 +2352,7 @@ def gen_left_assign(self, expr, right, assign_op):
TypeKind.DynArray, TypeKind.Slice
) and assign_op == Kind.Assign:
rec = self.gen_expr_with_cast(expr.left_typ, expr.left)
if not isinstance(left_ir_typ, ir.Pointer):
if not isinstance(left_ir_typ, ir.Ptr):
rec = ir.Inst(ir.InstKind.GetPtr, [rec])
expr_right = self.gen_expr_with_cast(right.typ, right)
val_sym = right.typ.symbol()
Expand All @@ -2370,10 +2366,10 @@ def gen_left_assign(self, expr, right, assign_op):
)
self.inside_lhs_assign = old_inside_lhs_assign
return None, require_store_ptr
if isinstance(left_ir_typ, (ir.Pointer, ir.Array)):
if isinstance(left_ir_typ, (ir.Ptr, ir.Array)):
expr.is_ref = True
left = self.gen_expr_with_cast(expr.typ, expr)
if isinstance(left.typ, ir.Pointer):
if isinstance(left.typ, ir.Ptr):
require_store_ptr = left.typ.nr_level() > 1
self.inside_lhs_assign = old_inside_lhs_assign
return left, require_store_ptr
Expand Down Expand Up @@ -2468,7 +2464,7 @@ def result_error(self, typ, expr_t, expr):
)
self.cur_func.store(
ir.Selector(
self.throwable_t, tmp, ir.Name("err")
ir.THROWABLE_T, tmp, ir.Name("err")
), self.trait_value(expr, expr_t, self.comp.throwable_t)
)
return tmp
Expand Down Expand Up @@ -2643,7 +2639,7 @@ def stacked_instance(self, typ, init_value = None, custom_name = None):

def boxed_instance(self, typ, size, custom_name = None):
tmp = ir.Ident(
typ if isinstance(typ, ir.Pointer) else typ.ptr(True), custom_name
typ if isinstance(typ, ir.Ptr) else typ.ptr(True), custom_name
or self.cur_func.local_name()
)
inst = ir.Inst(
Expand All @@ -2667,11 +2663,11 @@ def trait_value(self, value, value_typ, trait_typ):
size, _ = self.comp.type_size(value_typ)
trait_size, _ = self.comp.type_symbol_size(trait_sym, True)
tmp = self.boxed_instance(self.ir_type(trait_typ), str(trait_size))
is_ptr = isinstance(value.typ, ir.Pointer)
is_ptr = isinstance(value.typ, ir.Ptr)
for f in trait_sym.fields:
f_typ = self.ir_type(f.typ)
value_f = ir.Selector(f_typ, value, ir.Name(f.name))
if not isinstance(f_typ, ir.Pointer):
if not isinstance(f_typ, ir.Ptr):
f_typ = f_typ.ptr(True)
value_f = ir.Inst(ir.InstKind.GetPtr, [value_f], f_typ)
self.cur_func.store(
Expand Down Expand Up @@ -2866,7 +2862,7 @@ def ir_type(self, typ, gen_self_arg = False):
),
ir.Field("is_err", ir.BOOL_T),
ir.Field(
"err", self.throwable_t
"err", ir.THROWABLE_T
)
]
)
Expand Down Expand Up @@ -2907,9 +2903,9 @@ def ir_type(self, typ, gen_self_arg = False):
return ir.DYN_ARRAY_T
elif isinstance(typ, type.Ptr):
inner_t = self.ir_type(typ.typ)
if isinstance(inner_t, ir.Pointer) and inner_t.is_managed:
if isinstance(inner_t, ir.Ptr) and inner_t.is_managed:
return inner_t
return ir.Pointer(inner_t)
return ir.Ptr(inner_t)
elif isinstance(typ, type.Boxedptr):
return ir.RAWPTR_T
typ_sym = typ.symbol()
Expand Down Expand Up @@ -2994,7 +2990,7 @@ def gen_types(self):
]
for f in ts.fields:
f_typ = self.ir_type(f.typ)
if not isinstance(f_typ, ir.Pointer):
if not isinstance(f_typ, ir.Ptr):
f_typ = f_typ.ptr()
fields.append(ir.Field(f.name, f_typ))
self.out_rir.types.append(ir.Struct(False, ts_name, fields))
Expand Down Expand Up @@ -3258,7 +3254,7 @@ def generate_contains_method(
ir.InstKind.Cmp, [ir.Name("=="), cur_elem, elem_idx_]
)
else:
if not isinstance(elem_idx_.typ, ir.Pointer):
if not isinstance(elem_idx_.typ, ir.Ptr):
elem_idx_ = ir.Inst(ir.InstKind.GetPtr, [elem_idx_])
cond = ir.Inst(
ir.InstKind.Call, [
Expand Down
4 changes: 2 additions & 2 deletions rivetc/src/codegen/c.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ def gen_expr(self, expr):
self.write(c_escape(expr.name))
elif isinstance(expr, ir.Selector):
self.gen_expr(expr.left)
if isinstance(expr.left.typ, ir.Pointer):
if isinstance(expr.left.typ, ir.Ptr):
self.write("->")
else:
self.write(".")
Expand All @@ -438,7 +438,7 @@ def write_type(self, typ, wrap = ""):
self.write(self.gen_type(typ, wrap))

def gen_type(self, typ, wrap = ""):
if isinstance(typ, ir.Pointer):
if isinstance(typ, ir.Ptr):
return f"{self.gen_type(typ.typ, wrap)}*"
elif isinstance(typ, ir.Array):
sizes = []
Expand Down
17 changes: 9 additions & 8 deletions rivetc/src/codegen/ir.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self, name):
self.name = name

def ptr(self, is_managed = False):
return Pointer(self, is_managed)
return Ptr(self, is_managed)

def __repr__(self):
return str(self)
Expand All @@ -48,18 +48,18 @@ def __str__(self):
def __eq__(self, other):
return str(self) == str(other)

class Pointer:
class Ptr:
def __init__(self, typ, is_managed = False):
self.typ = typ
self.is_managed = is_managed

def ptr(self, is_managed = False):
return Pointer(self, is_managed)
return Ptr(self, is_managed)

def nr_level(self):
nr = 0
ptr = self
while isinstance(ptr, Pointer):
while isinstance(ptr, Ptr):
ptr = ptr.typ
nr += 1
return nr
Expand All @@ -69,7 +69,7 @@ def __repr__(self):

def __str__(self):
if self.is_managed:
return f"+{self.typ}"
return f"^{self.typ}"
return f"*{self.typ}"

def __eq__(self, other):
Expand All @@ -91,14 +91,15 @@ def __eq__(self, other):
STRING_T = Type("_R4core6string")
TEST_T = Type("_R4core4Test")
TEST_RUNNER_T = Type("_R4core10TestRunner")
THROWABLE_T = Type("_R4core9Throwable").ptr(True)

class Array:
def __init__(self, typ, size):
self.typ = typ
self.size = size

def ptr(self):
return Pointer(self)
return Ptr(self)

def __repr__(self):
return str(self)
Expand All @@ -115,13 +116,13 @@ def __init__(self, args, ret_typ):
self.ret_typ = ret_typ

def ptr(self):
return Pointer(self)
return Ptr(self)

def __repr__(self):
return str(self)

def __str__(self):
return f"*func({', '.join([str(arg) for arg in self.args])}) {self.ret_typ}"
return f"func({', '.join([str(arg) for arg in self.args])}) {self.ret_typ}"

def __eq__(self, other):
return str(self) == str(other)
Expand Down

0 comments on commit 0bf195f

Please sign in to comment.