Changeset 22990 for src/Pugs/Parser

Timestamp:

11/12/08 10:01:29 (8 weeks ago)

Author:

audreyt

Message:

* GHC 6.10 support, part 3 of 3: Adjust for GADT's "rigid types" restriction.

Files:

• src/Pugs/Parser/Operator.hs (modified) (1 diff)

src/Pugs/Parser/Operator.hs

@@ -204 +204 @@
         Nothing -> do
             ref <- readPadEntry entry
-            case ref of
-                MkRef (ICode cv)
-                    | relevantToParsing (code_type cv) (code_assoc cv) -> do
-                        let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
-                            res = seq rv (Just rv)
-                        unsafeIOToSTM (H.insert _RefToFunction entry res)
-                        return res
-                MkRef (IScalar sv)
-                    | Just (VCode cv) <- scalar_const sv
-                    , relevantToParsing (code_type cv) (code_assoc cv) -> do
-                        let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
-                            res = seq rv (Just rv)
-                        unsafeIOToSTM (H.insert _RefToFunction entry res)
-                        return res
-                _ -> do
-                    unsafeIOToSTM (H.insert _RefToFunction entry Nothing)
-                    return Nothing
+            filterRef ref
+    where
+    filterRef :: VRef -> STM (Maybe CurrentFunction)
+    filterRef (MkRef (ICode cv))
+        | relevantToParsing (code_type cv) (code_assoc cv) = do
+            let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
+                res = seq rv (Just rv)
+            unsafeIOToSTM (H.insert _RefToFunction entry res)
+            return res
+    filterRef (MkRef (IScalar sv))
+        | Just (VCode cv) <- scalar_const sv
+        , relevantToParsing (code_type cv) (code_assoc cv) = do
+            let rv = MkCurrentFunction var (code_assoc cv) (code_params cv)
+                res = seq rv (Just rv)
+            unsafeIOToSTM (H.insert _RefToFunction entry res)
+            return res
+    filterRef _ = do
+        unsafeIOToSTM (H.insert _RefToFunction entry Nothing)
+        return Nothing
 
 inScope :: Pkg -> Var -> Bool