From 42a801d346d589b2450a2855cad50491edf210df Mon Sep 17 00:00:00 2001 From: greg Date: Sun, 10 Feb 2019 07:06:30 -0800 Subject: [PATCH] Rename Order -> Ordering --- schala-lang/language/src/builtin.rs | 2 +- schala-lang/language/src/typechecking.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schala-lang/language/src/builtin.rs b/schala-lang/language/src/builtin.rs index dddcb2c..cb2c7d7 100644 --- a/schala-lang/language/src/builtin.rs +++ b/schala-lang/language/src/builtin.rs @@ -127,6 +127,6 @@ lazy_static! { "<=" => (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!(Nat -> Nat -> Order), (), 20), //TODO figure out how to treat Order + "<=>" => (mk_type!(Nat -> Nat -> Ordering), (), 20), //TODO figure out how to treat Order }; } diff --git a/schala-lang/language/src/typechecking.rs b/schala-lang/language/src/typechecking.rs index 19f3d84..0dad3c8 100644 --- a/schala-lang/language/src/typechecking.rs +++ b/schala-lang/language/src/typechecking.rs @@ -36,7 +36,7 @@ pub enum TypeConst { Float, StringT, Bool, - Order, + Ordering, UserDefined } @@ -52,7 +52,7 @@ impl Type { Const(Float) => format!("Float"), Const(StringT) => format!("String"), Const(Bool) => format!("Bool"), - Const(Order) => format!("Order"), + Const(Ordering) => format!("Ordering"), _ => format!("UNKNOWN TYPE"), } } @@ -67,7 +67,7 @@ impl Type { "Float" => Const(Float), "String" => Const(StringT), "Bool" => Const(Bool), - "Order" => Const(Order), + "Ordering" => Const(Ordering), _ => return None }) }