diff --git a/lib/rivet/src/ast/Table.ri b/lib/rivet/src/ast/Table.ri index 173bb40a0..2cd8a3e40 100644 --- a/lib/rivet/src/ast/Table.ri +++ b/lib/rivet/src/ast/Table.ri @@ -496,15 +496,15 @@ public func universe() -> Module { scope: Scope(syms: [ TypeSym(name: "bool", info: .Bool()), TypeSym(name: "rune", info: .Rune()), - TypeSym(name: "int8", info: .Int(8)), - TypeSym(name: "int16", info: .Int(16)), - TypeSym(name: "int32", info: .Int(32)), - TypeSym(name: "int64", info: .Int(64)), + TypeSym(name: "int8", info: .SizedInt(8)), + TypeSym(name: "int16", info: .SizedInt(16)), + TypeSym(name: "int32", info: .SizedInt(32)), + TypeSym(name: "int64", info: .SizedInt(64)), TypeSym(name: "int", info: .Isize()), - TypeSym(name: "uint8", info: .Uint(8)), - TypeSym(name: "uint16", info: .Uint(16)), - TypeSym(name: "uint32", info: .Uint(32)), - TypeSym(name: "uint64", info: .Uint(64)), + TypeSym(name: "uint8", info: .SizedUint(8)), + TypeSym(name: "uint16", info: .SizedUint(16)), + TypeSym(name: "uint32", info: .SizedUint(32)), + TypeSym(name: "uint64", info: .SizedUint(64)), TypeSym(name: "uint", info: .Usize()), TypeSym(name: "comptime_int", info: .ComptimeInt()), TypeSym(name: "comptime_float", info: .ComptimeFloat()), diff --git a/lib/rivet/src/ast/TypeInfo.ri b/lib/rivet/src/ast/TypeInfo.ri index d22f51461..24210ed01 100644 --- a/lib/rivet/src/ast/TypeInfo.ri +++ b/lib/rivet/src/ast/TypeInfo.ri @@ -150,7 +150,7 @@ public enum TypeInfo < traits.Stringable { #[inline] public func is_primitive(self) -> bool { - return self is .Bool or self is .Rune or self is .SizedInt or self is .Uint + return self is .Bool or self is .Rune or self is .SizedInt or self is .SizedUint or self is .Usize or self is .Isize or self is .ComptimeInt or self is .ComptimeFloat or self is .ComptimeFloat or self is .Float; } diff --git a/lib/rivet/src/codegen/types.ri b/lib/rivet/src/codegen/types.ri index 73a61f79f..349672574 100644 --- a/lib/rivet/src/codegen/types.ri +++ b/lib/rivet/src/codegen/types.ri @@ -156,9 +156,9 @@ extend Codegen { if self.table.is_int(type) { bits := self.table.int_bits(type); if self.table.is_signed_int(type) { - .Int(bits, size) + .SizedInt(bits, size) } else { - .Uint(bits, size) + .SizedUint(bits, size) } } else if mut type_sym := type.symbol() { if type_sym.is_primitive() {