From 2c00699d217e0a54d44678529fa3d87936071fec Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 27 Feb 2019 20:39:29 +0100 Subject: Add Natural/Show builtin --- src/core.rs | 3 +++ src/lexer.rs | 1 + 2 files changed, 4 insertions(+) (limited to 'src') diff --git a/src/core.rs b/src/core.rs index 67a7492..473a6a6 100644 --- a/src/core.rs +++ b/src/core.rs @@ -213,6 +213,7 @@ pub enum BuiltinValue { NaturalEven, /// `NaturalOdd ~ Natural/odd` NaturalOdd, + NaturalShow, /// `ListBuild ~ List/build` ListBuild, /// `ListFold ~ List/fold` @@ -478,6 +479,7 @@ impl Display for BuiltinValue { NaturalFold => "Natural/fold", NaturalIsZero => "Natural/isZero", NaturalOdd => "Natural/odd", + NaturalShow => "Natural/show", OptionalFold => "Optional/fold", }) } @@ -882,6 +884,7 @@ pub fn normalize<'i, S, T, A>(e: &Expr<'i, S, A>) -> Expr<'i, T, A> (BuiltinValue(NaturalIsZero), NaturalLit(n)) => BoolLit(n == 0), (BuiltinValue(NaturalEven), NaturalLit(n)) => BoolLit(n % 2 == 0), (BuiltinValue(NaturalOdd), NaturalLit(n)) => BoolLit(n % 2 != 0), + (BuiltinValue(NaturalShow), NaturalLit(n)) => TextLit(n.to_string()), (App(f@box BuiltinValue(ListBuild), box t), k) => { let labeled = normalize::<_, T, _>(&app(app(app(k.clone(), app( diff --git a/src/lexer.rs b/src/lexer.rs index 32e6abe..5b4dcaa 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -214,6 +214,7 @@ named!(builtin<&str, Builtin>, alt!( value!(Builtin::Value(NaturalIsZero), ident_tag!("Natural/isZero")) | value!(Builtin::Value(NaturalEven), ident_tag!("Natural/even")) | value!(Builtin::Value(NaturalOdd), ident_tag!("Natural/odd")) | + value!(Builtin::Value(NaturalShow), ident_tag!("Natural/show")) | value!(Builtin::Type(Natural), ident_tag!("Natural")) | value!(Builtin::Type(Integer), ident_tag!("Integer")) | value!(Builtin::Type(Double), ident_tag!("Double")) | -- cgit v1.2.3