squash

Author: hhefesto

examples.tel

@@ -21,8 +21,22 @@ MyInt = let wrapper = \h -> ( \i -> if not i
                             )
         in wrapper (# wrapper)
 
-aux = \x -> if dEqual x 0 then "Success" else "Failure"
-main = \i -> (aux ((left MyInt) 0), 0)
+aux = \x -> if dEqual x 8 then "Success" else "Failure"
+main = \i -> (aux ((left MyInt) 8), 0)
+
+[Nat, toNat, nPlus, nMinus]
+  = let wrapper = \h ->
+        let N = \(hc, _) x -> assert (dEqual hc h) "not Natural"
+        in [ N
+           , \x -> (h, x)
+           , \((_, aa) : N) ((_, bb) : N) -> (h, d2c aa succ bb)
+           , \((_, aa) : N) ((_, bb) : N) ->
+               let sLeft = \x -> case x of
+                                   (l, _) -> l
+                                   y -> abort "can't subtract larger number from smaller one"
+               in (h, d2c bb sLeft aa)
+           ]
+    in wrapper (# wrapper)
 
 -- something
 -- main =

src/Telomare/Parser.hs

@@ -1,12 +1,13 @@
 {-# LANGUAGE LambdaCase          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TupleSections       #-}
 {-# LANGUAGE TypeFamilies        #-}
 
 module Telomare.Parser where
 
 import Control.Comonad.Cofree (Cofree (..), unwrap)
 import Control.Lens.Plated (Plated (..))
-import Control.Monad (void, join)
+import Control.Monad (join, void)
 import Control.Monad.State (State)
 import Data.Bifunctor (Bifunctor (first, second), bimap)
 import Data.Functor (($>))
@@ -354,7 +355,7 @@ parseImportQualified = do
 parseOneAssignmentOrBrand :: TelomareParser (String, AnnotatedUPT)
 parseOneAssignmentOrBrand =
   parseAssignment
-    <|> ((\exp -> ("8@$temp_label$@8", exp)) <$> parseBrand)
+    <|> (("8@$temp_label$@8",) <$> parseBrand)
 
 -- |Parse assignment or Brands, and add adding binding to ParserState.
 parseAssignmentsAndBrands :: TelomareParser [(String, AnnotatedUPT)]
@@ -363,7 +364,7 @@ parseAssignmentsAndBrands = do
   let removeBrands = \case
         ("8@$temp_label$@8", exp) -> expandBrand exp
         x -> [x]
-  pure . join $  removeBrands <$> tempBindingList
+  pure (removeBrands =<< tempBindingList)
 
 -- |Parse top level expressions.
 parseTopLevelWithExtraModuleBindings :: [(String, AnnotatedUPT)]