Merge pull request #590 from HigherOrderCO/update

Update Reduce and adjusting operator parsing
HigherOrderCO · Oct 7, 2024 · 5a7d727 · 5a7d727
2 parents 558ebed + 37280a4
commit 5a7d727
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Kind/Parse.hs b/src/Kind/Parse.hs
@@ -347,6 +347,8 @@ parseOper = P.choice
   , P.try (string "*") >> return MUL
   , P.try (string "/") >> return DIV
   , P.try (string "%") >> return MOD
+  , P.try (string "<<") >> return LSH
+  , P.try (string ">>") >> return RSH
   , P.try (string "<=") >> return LTE
   , P.try (string ">=") >> return GTE
   , P.try (string "<") >> return LT
@@ -356,8 +358,6 @@ parseOper = P.choice
   , P.try (string "&") >> return AND
   , P.try (string "|") >> return OR
   , P.try (string "^") >> return XOR
-  , P.try (string "<<") >> return LSH
-  , P.try (string ">>") >> return RSH
   ]
 
 parseBook :: Parser Book

diff --git a/src/Kind/Reduce.hs b/src/Kind/Reduce.hs
@@ -1,9 +1,9 @@
 module Kind.Reduce where
 
 import Prelude hiding (EQ, LT, GT)
+import Data.Bits ( (.&.), (.|.), xor, shiftL, shiftR )
 import Data.Char (ord)
 import Debug.Trace
-
 import Kind.Type
 import Kind.Show
 
@@ -67,6 +67,11 @@ reduce book fill lv term = red term where
   op2 GT  (Num fst) (Num snd) = Num (if fst > snd then 1 else 0)
   op2 LTE (Num fst) (Num snd) = Num (if fst <= snd then 1 else 0)
   op2 GTE (Num fst) (Num snd) = Num (if fst >= snd then 1 else 0)
+  op2 AND (Num fst) (Num snd) = Num (fst .&. snd)
+  op2 OR  (Num fst) (Num snd) = Num (fst .|. snd)
+  op2 XOR (Num fst) (Num snd) = Num (fst `xor` snd)
+  op2 LSH (Num fst) (Num snd) = Num (shiftL fst (fromIntegral snd))
+  op2 RSH (Num fst) (Num snd) = Num (shiftR fst (fromIntegral snd))
   op2 opr fst       snd       = Op2 opr fst snd
 
   ref nam | lv > 0 = case M.lookup nam book of