Changeset 12422 for src/Pugs/Prim/List.hs

Timestamp:

08/18/06 20:47:21 (2 years ago)

Author:

audreyt

Message:

* Glorious refactoring of the SubAssoc? type.

Instead of using a string such as "left" "right" "non", we now
use the SubAssoc? type, which simplified the logic in many places.

Files:

• src/Pugs/Prim/List.hs (modified) (3 diffs)

src/Pugs/Prim/List.hs

@@ -160 +160 @@
 op2ReduceL keep list sub = do
     code <- fromVal sub
-    op2Reduce keep list $ VCode code{ subAssoc = "left" }
+    op2Reduce keep list $ VCode code{ subAssoc = A_left }
 
 op2Reduce :: Bool -> Val -> Val -> Eval Val
@@ -182 +182 @@
             evl (App (Val sub) Nothing (map Val xs))
     case subAssoc code of
-        "right" -> do
+        A_right -> do
             let args' = reverse args
             reduceMn args' n (doFold . reverse)
-        "chain" -> if arity /= 2            -- FIXME: incorrect for scans
+        A_chain -> if arity /= 2            -- FIXME: incorrect for scans
             then fail
                 "When reducing using a chain-associative sub,\nthe sub must take exactly two arguments."
@@ -196 +196 @@
                 reduceM doFold' (head args) (tail args)
                 return $ VBool True
-        "non"   -> fail $ "Cannot reduce over non-associativity"
+        A_non   -> fail $ "Cannot reduce over non-associativity"
         _       -> reduceMn args n doFold -- "left", "pre"
     where