greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename Order -> Ordering

Browse Source
This commit is contained in:
greg 2019-02-10 07:06:30 -08:00
parent a80e1bd706
commit 42a801d346
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
schala-lang/language/src/builtin.rs
View File

@ -127,6 +127,6 @@ lazy_static! {
"<=" => (mk_type!(Nat -> Nat -> Bool), (), 20), "<=" => (mk_type!(Nat -> Nat -> Bool), (), 20),
"==" => (mk_type!(Nat -> Nat -> Bool), (), 20), "==" => (mk_type!(Nat -> Nat -> Bool), (), 20),
"=" => (mk_type!(Unit), (), 20), //TODO not sure what the type of this should be b/c special fmr "=" => (mk_type!(Unit), (), 20), //TODO not sure what the type of this should be b/c special fmr
"<=>" => (mk_type!(Nat -> Nat -> Order), (), 20), //TODO figure out how to treat Order "<=>" => (mk_type!(Nat -> Nat -> Ordering), (), 20), //TODO figure out how to treat Order
}; };
} }

6
schala-lang/language/src/typechecking.rs
View File

@ -36,7 +36,7 @@ pub enum TypeConst {
Float, Float,
StringT, StringT,
Bool, Bool,
Order, Ordering,
UserDefined UserDefined
} }
@ -52,7 +52,7 @@ impl Type {
Const(Float) => format!("Float"), Const(Float) => format!("Float"),
Const(StringT) => format!("String"), Const(StringT) => format!("String"),
Const(Bool) => format!("Bool"), Const(Bool) => format!("Bool"),
Const(Order) => format!("Order"), Const(Ordering) => format!("Ordering"),
_ => format!("UNKNOWN TYPE"), _ => format!("UNKNOWN TYPE"),
} }
} }
@ -67,7 +67,7 @@ impl Type {
"Float" => Const(Float), "Float" => Const(Float),
"String" => Const(StringT), "String" => Const(StringT),
"Bool" => Const(Bool), "Bool" => Const(Bool),
"Order" => Const(Order), "Ordering" => Const(Ordering),
_ => return None _ => return None
}) })
} }