mrdomino/hsnock
1
1
Fork 0
mirror of https://github.com/mrdomino/hsnock.git synced 2024-07-07 10:26:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Collapse the fas recursive cases together

Browse Source 
This "obviously" works. Just in case, I've added a check.
This commit is contained in:
Steven Dee 2013-10-26 17:58:05 -04:00
parent f070f57a9b
commit 2c33b12f83
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Language/Nock5K/Spec.hs
View File

@ -57,14 +57,12 @@ tis a = Left "=a"
\/[(a + a + 1) b] \/[3 \/[a b]]
\/a \/a
@-}
fas (Atom 1 :- a) = return a
fas (Atom 2 :- a :- b) = return a
fas (Atom 3 :- a :- b) = return b
fas (Atom a :- b) | a > 2 && a `mod` 2 == 0 = do x <- fas $ Atom (a `div` 2) :- b
fas $ Atom 2 :- x
fas (Atom a :- b) | a > 3 && a `mod` 2 == 1 = do x <- fas $ Atom (a `div` 2) :- b
fas $ Atom 3 :- x
fas a = Left "/a"
fas (Atom 1 :- a) = return a
fas (Atom 2 :- a :- b) = return a
fas (Atom 3 :- a :- b) = return b
fas (Atom a :- b) | a > 3 = do x <- fas $ Atom (a `div` 2) :- b
fas $ Atom (2 + (a `mod` 2)) :- x
fas a = Left "/a"
{-|@
\*[a [b c] d] [\*[a b c] \*[a d]]

7
test.hs
View File

@ -34,6 +34,12 @@ prop_6_is_if a' b = nock (ifs $ Atom 0) == Right (Atom (a + 1)) && nock (ifs $ A
ifs c = Atom a :- Atom 6 :- (Atom 1 :- c) :- (Atom 4 :- Atom 0 :- Atom 1) :- (Atom 1 :- b)
a = abs a'
prop_fas_induct a' b = fas (a + a) b == fasmn 2 a b && fas (a + a + 1) b == fasmn 3 a b
where fas c d = nock $ d :- Atom c
fasmn m n c = do x <- fas n c
fas m x
a = abs a'
test_hint_crash = assert $ nock bad == Left "/a"
where bad = pn "[42 10 [0 0 2] 0 1]"
@ -43,6 +49,7 @@ test_eval_strict = assert $ nock bad == Left "/a"
tests = [ testProperty "parse.show" prop_parse_show
, testProperty "decrement" prop_dec
, testProperty "6_is_if" prop_6_is_if
, testProperty "fas_induct" prop_fas_induct
, testCase "10_hint_crash" test_hint_crash
, testCase "eval_strict" test_eval_strict
]