Changeset 2645 for src/Pugs/Junc.hs

Timestamp:

05/03/05 13:26:16 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4152

Message:

* rename Junc constructor to MkJunc for greater consistency.

Files:

• src/Pugs/Junc.hs (modified) (4 diffs)

src/Pugs/Junc.hs

@@ -30 +30 @@
 -- Handled differently!
 opJuncOne :: [Val] -> Val
-opJuncOne args = VJunc (Junc JOne dups vals)
+opJuncOne args = VJunc (MkJunc JOne dups vals)
     where
     vals = Set.fromList [ v | [v] <- groups ]
@@ -39 +39 @@
 -- values in the list.
 opJunc :: JuncType -> [Val] -> Val
-opJunc t vals = VJunc $ Junc t Set.empty (joined `Set.union` Set.fromList vs)
+opJunc t vals = VJunc $ MkJunc t Set.empty (joined `Set.union` Set.fromList vs)
     where
     joined = Set.unions $ map (\(VJunc s) -> juncSet s) js
     (js, vs) = partition sameType vals
-    sameType (VJunc (Junc t' _ _))  = t == t'
+    sameType (VJunc (MkJunc t' _ _))  = t == t'
     sameType _                      = False
 
@@ -60 +60 @@
 mergeJunc j ds vs
     = case j of
-       JAny -> Junc j (Set.fromList ds) (Set.fromList vs)
-       JOne -> Junc j dups vals
+       JAny -> MkJunc j (Set.fromList ds) (Set.fromList vs)
+       JOne -> MkJunc j dups vals
        x    -> internalError $ "mergeJunc pattern failure: " ++ (show x)
     where
@@ -70 +70 @@
 juncApply f args
     | this@(_, (pivot:_)) <- break isTotalJunc args
-    , VJunc (Junc j dups vals) <- argValue pivot
+    , VJunc (MkJunc j dups vals) <- argValue pivot
     = do
         vals' <- appSet this vals
-        return $ VJunc (Junc j dups vals')
+        return $ VJunc (MkJunc j dups vals')
     | this@(_, (pivot:_)) <- break isPartialJunc args
-    , VJunc (Junc j dups vals) <- argValue pivot
+    , VJunc (MkJunc j dups vals) <- argValue pivot
     = do
         dups' <- appList this dups