better and faster

This commit is contained in:
Erik Osheim 2024-04-12 13:25:03 -04:00
parent 797a318843
commit f166481ccb
1 changed files with 16 additions and 24 deletions

View File

@ -35,15 +35,6 @@
<> (reverse' ?a ()) (?a) <> (reverse' ?a ()) (?a)
<> (reverse' ?a (?h ?t)) (reverse' (?h ?a) ?t) <> (reverse' ?a (?h ?t)) (reverse' (?h ?a) ?t)
-- ( normalize, remove trailing zeros )
-- ( currently zero is (0 ()) though arguably it could be () )
-- ( that change would require auditing our rules )
<> (normalize (?h ?t)) ((?h normalize' () ?t))
<> (normalize' ?s ()) (())
<> (normalize' ?s (0 ?t)) (normalize' (0 ?s) ?t)
<> (normalize' () (1 ?t)) ((1 normalize' () ?t))
<> (normalize' (0 ?s) (1 ?t)) ((0 normalize' ?s (1 ?t)))
-- ( to integer ) -- ( to integer )
<> ((int ?*)) ((sum f (one) g reverse (?*))) <> ((int ?*)) ((sum f (one) g reverse (?*)))
<> (g ()) (()) <> (g ()) (())
@ -123,20 +114,21 @@
<> (mulc ?t (1 ?x) ?y) (mulc (?y ?t) ?x (0 ?y)) <> (mulc ?t (1 ?x) ?y) (mulc (?y ?t) ?x (0 ?y))
-- ( subtraction ) -- ( subtraction )
<> ((sub ?x ?y)) (normalize subc 0 ?x ?y) <> ((sub ?x ?y)) (sub1 0 ?x ?y ())
<> (subc 0 () ()) (()) <> (sub1 0 () () ?s) (())
<> (subc 1 () ()) (#err) <> (sub1 1 () () ?s) (#err)
<> (subc 0 ?x ()) (?x) <> (sub1 ?c ?x () ?s) (sub1 ?c ?x (0 ()) ?s)
<> (subc 1 ?x ()) (subc 1 ?x (0 ())) <> (sub1 ?c () ?y ?s) (sub1 ?c (0 ()) ?y ?s)
<> (subc ?c () ?y) (subc ?c (0 ()) ?y) <> (sub1 0 (0 ?x) (0 ?y) ?s) (sub1 0 ?x ?y (0 ?s))
<> (subc 0 (0 ?x) (0 ?y)) ((0 subc 0 ?x ?y)) <> (sub1 0 (0 ?x) (1 ?y) ?s) (sub2 1 ?x ?y ?s)
<> (subc 0 (0 ?x) (1 ?y)) ((1 subc 1 ?x ?y)) <> (sub1 0 (1 ?x) (0 ?y) ?s) (sub2 0 ?x ?y ?s)
<> (subc 0 (1 ?x) (0 ?y)) ((1 subc 0 ?x ?y)) <> (sub1 0 (1 ?x) (1 ?y) ?s) (sub1 0 ?x ?y (0 ?s))
<> (subc 0 (1 ?x) (1 ?y)) ((0 subc 0 ?x ?y)) <> (sub1 1 (0 ?x) (0 ?y) ?s) (sub2 1 ?x ?y ?s)
<> (subc 1 (0 ?x) (0 ?y)) ((1 subc 1 ?x ?y)) <> (sub1 1 (0 ?x) (1 ?y) ?s) (sub1 1 ?x ?y (0 ?s))
<> (subc 1 (0 ?x) (1 ?y)) ((0 subc 1 ?x ?y)) <> (sub1 1 (1 ?x) (0 ?y) ?s) (sub1 0 ?x ?y (0 ?s))
<> (subc 1 (1 ?x) (0 ?y)) ((0 subc 0 ?x ?y)) <> (sub1 1 (1 ?x) (1 ?y) ?s) (sub2 1 ?x ?y ?s)
<> (subc 1 (1 ?x) (1 ?y)) ((1 subc 1 ?x ?y)) <> (sub2 ?c ?x ?y ()) ((1 sub1 ?c ?x ?y ()))
<> (sub2 ?c ?x ?y (?h ?t)) ((0 sub2 ?c ?x ?y ?t))
<> (dec (0 ())) (#err) <> (dec (0 ())) (#err)
<> (dec (1 ())) ((0 ())) <> (dec (1 ())) ((0 ()))
@ -197,4 +189,4 @@
<> ((mod' (?q ?r))) (?r) <> ((mod' (?q ?r))) (?r)
-- (bstr (mul (int 2399) (int 3499))) -- (bstr (mul (int 2399) (int 3499)))
(str (int 1234567890)) (str (int 1234567))