From 26367d6a1eb0230d3f2a3f3f05af235221810a23 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Tue, 7 Jul 2009 22:22:05 +0000
Subject: [PATCH] bugfixes in the parser for PGF.Type.Type

---
 src/PGF/CId.hs  |  5 ++++-
 src/PGF/Type.hs | 26 ++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/PGF/CId.hs b/src/PGF/CId.hs
index 99325975e..0d1a2f5c6 100644
--- a/src/PGF/CId.hs
+++ b/src/PGF/CId.hs
@@ -36,7 +36,10 @@ instance Read CId where
     readsPrec _ = RP.readP_to_S pCId
 
 pCId :: RP.ReadP CId
-pCId = fmap mkCId pIdent
+pCId = do s <- pIdent
+          if s == "_"
+            then RP.pfail
+            else return (mkCId s)
 
 pIdent :: RP.ReadP String
 pIdent = liftM2 (:) (RP.satisfy isIdentFirst) (RP.munch isIdentRest)
diff --git a/src/PGF/Type.hs b/src/PGF/Type.hs
index f8b25202c..a899e84c2 100644
--- a/src/PGF/Type.hs
+++ b/src/PGF/Type.hs
@@ -41,32 +41,30 @@ showType = PP.render . ppType 0
 pType :: RP.ReadP Type
 pType = do
   RP.skipSpaces
-  hyps <- RP.sepBy (pHypo >>= \h -> RP.string "->" >> return h) RP.skipSpaces
+  hyps <- RP.sepBy (pHypo >>= \h -> RP.skipSpaces >> RP.string "->" >> return h) RP.skipSpaces
   RP.skipSpaces
   (cat,args) <- pAtom
-  return (DTyp hyps cat args)
+  return (DTyp (concat hyps) cat args)
   where
     pHypo =
       do (cat,args) <- pAtom
-         return (Hyp (DTyp [] cat args))
+         return [Hyp (DTyp [] cat args)]
       RP.<++
       (RP.between (RP.char '(') (RP.char ')') $ do
-         var <- RP.option wildCId $ do
-                     v <- pCId
+         hyp <- RP.option (\ty -> [Hyp ty]) $ do
+                     vs <- RP.sepBy (RP.skipSpaces >> pCId) (RP.skipSpaces >> RP.char ',')
                      RP.skipSpaces
-                     RP.string ":"
-                     return v
+                     RP.char ':'
+                     return (\ty -> [HypV v ty | v <- vs])
          ty <- pType
-         return (HypV var ty))
+         return (hyp ty))
       RP.<++
       (RP.between (RP.char '{') (RP.char '}') $ do
-         var <- RP.option wildCId $ do
-                     v <- pCId
-                     RP.skipSpaces
-                     RP.string ":"
-                     return v
+         vs <- RP.sepBy1 (RP.skipSpaces >> pCId) (RP.skipSpaces >> RP.char ',')
+         RP.skipSpaces
+         RP.char ':'
          ty <- pType
-         return (HypI var ty))
+         return [HypI v ty | v <- vs])
 
     pAtom = do
       cat <- pCId