roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-10 10:02:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(aliases): add Nat, Natural, and @Natural

Browse Source
This commit is contained in:
rvcas 2020-12-29 14:55:20 -05:00
parent 75fdff4398
commit 58b9908c2f
2 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/module/src/symbol.rs
View File

@ -826,10 +826,11 @@ define_builtins! {
83 NUM_SUB_CHECKED: "subChecked"
84 NUM_MUL_WRAP: "mulWrap"
85 NUM_MUL_CHECKED: "mulChecked"
86 NUM_AT_INT: "@Int"
87 NUM_INT: "Int" imported
88 NUM_AT_FLOAT: "@Float"
89 NUM_FLOAT: "Float" imported
86 NUM_INT: "Int" imported
87 NUM_FLOAT: "Float" imported
88 NUM_AT_NATURAL: "@Natural"
89 NUM_NATURAL: "Natural" imported
90 NUM_NAT: "Nat" imported
}
2 BOOL: "Bool" => {
0 BOOL_BOOL: "Bool" imported // the Bool.Bool type alias

53
compiler/types/src/builtin_aliases.rs
View File

@ -68,6 +68,26 @@ pub fn aliases() -> MutMap<Symbol, BuiltinAlias> {
},
);
// Natural : [ @Natural ]
add_alias(
Symbol::NUM_NATURAL,
BuiltinAlias {
region: Region::zero(),
vars: vec![],
typ: natural_alias_content(),
},
);
// Nat : Int Natural
add_alias(
Symbol::NUM_NAT,
BuiltinAlias {
region: Region::zero(),
vars: Vec::new(),
typ: int_alias_content(natural_type()),
},
);
// Signed128 : [ @Signed128 ]
add_alias(
Symbol::NUM_SIGNED128,
@ -342,10 +362,19 @@ pub fn float_type(range: SolvedType) -> SolvedType {
#[inline(always)]
fn float_alias_content(range: SolvedType) -> SolvedType {
single_private_tag(
Symbol::NUM_AT_FLOAT,
vec![num_type(floatingpoint_type(range))],
)
num_type(floatingpoint_type(range))
}
// Nat
#[inline(always)]
pub fn nat_type() -> SolvedType {
SolvedType::Alias(Symbol::NUM_NAT, vec![], Box::new(nat_alias_content()))
}
#[inline(always)]
fn nat_alias_content() -> SolvedType {
int_alias_content(natural_type())
}
// INT
@ -361,7 +390,7 @@ pub fn int_type(range: SolvedType) -> SolvedType {
#[inline(always)]
fn int_alias_content(range: SolvedType) -> SolvedType {
single_private_tag(Symbol::NUM_AT_INT, vec![num_type(integer_type(range))])
num_type(integer_type(range))
}
// INTEGER
@ -408,6 +437,20 @@ fn binary32_alias_content() -> SolvedType {
single_private_tag(Symbol::NUM_AT_BINARY32, vec![])
}
#[inline(always)]
pub fn natural_type() -> SolvedType {
SolvedType::Alias(
Symbol::NUM_NATURAL,
vec![],
Box::new(natural_alias_content()),
)
}
#[inline(always)]
fn natural_alias_content() -> SolvedType {
single_private_tag(Symbol::NUM_AT_NATURAL, vec![])
}
#[inline(always)]
pub fn signed128_type() -> SolvedType {
SolvedType::Alias(