From 8bc8929c59d2bd6f28d5dab9c7a9ca8a1c23609e Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Tue, 16 Jun 2009 11:56:08 +0000
Subject: completely phrase based parser and support for pre {} in PMCFG

---
 src/PGF/PMCFG.hs | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/PGF/PMCFG.hs')

diff --git a/src/PGF/PMCFG.hs b/src/PGF/PMCFG.hs
index 9a0dfa98e..6a83baad3 100644
--- a/src/PGF/PMCFG.hs
+++ b/src/PGF/PMCFG.hs
@@ -16,24 +16,20 @@ type FPointPos = Int
 data FSymbol
   = FSymCat {-# UNPACK #-} !Int {-# UNPACK #-} !FIndex
   | FSymLit {-# UNPACK #-} !Int {-# UNPACK #-} !FIndex
-  | FSymTok Tokn
+  | FSymKS [String]
+  | FSymKP [String] [Alternative]
   deriving (Eq,Ord,Show)
 type Profile = [Int]
 data Production
   = FApply  {-# UNPACK #-} !FunId [FCat]
   | FCoerce {-# UNPACK #-} !FCat
-  | FConst  Tree String
+  | FConst  Tree [String]
   deriving (Eq,Ord,Show)
 data FFun  = FFun CId [Profile] {-# UNPACK #-} !(UArray FIndex SeqId) deriving (Eq,Ord,Show)
 type FSeq  = Array FPointPos FSymbol
 type FunId = Int
 type SeqId = Int
 
-data Tokn =
-   KS String
- | KP [String] [Alternative]
-  deriving (Eq,Ord,Show)
-
 data Alternative =
    Alt [String] [String]
   deriving (Eq,Ord,Show)
@@ -70,8 +66,8 @@ ppProduction (fcat,FApply funid args) =
   ppFCat fcat <+> text "->" <+> ppFunId funid <> brackets (hcat (punctuate comma (map ppFCat args)))
 ppProduction (fcat,FCoerce arg) =
   ppFCat fcat <+> text "->" <+> char '_' <> brackets (ppFCat arg)
-ppProduction (fcat,FConst _ s) =
-  ppFCat fcat <+> text "->" <+> ppStr s
+ppProduction (fcat,FConst _ ss) =
+  ppFCat fcat <+> text "->" <+> ppStrs ss
 
 ppFun (funid,FFun fun _ arr) =
   ppFunId funid <+> text ":=" <+> parens (hcat (punctuate comma (map ppSeqId (elems arr)))) <+> brackets (text (prCId fun))
@@ -84,14 +80,12 @@ ppStartCat (id,fcats) =
 
 ppSymbol (FSymCat d r) = char '<' <> int d <> comma <> int r <> char '>'
 ppSymbol (FSymLit d r) = char '<' <> int d <> comma <> int r <> char '>'
-ppSymbol (FSymTok t)   = ppTokn t
-
-ppTokn (KS t)       = ppStr t
-ppTokn (KP ts alts) = text "pre" <+> braces (hsep (punctuate semi (hsep (map ppStr ts) : map ppAlt alts)))
+ppSymbol (FSymKS ts)   = ppStrs ts
+ppSymbol (FSymKP ts alts) = text "pre" <+> braces (hsep (punctuate semi (ppStrs ts : map ppAlt alts)))
 
-ppAlt (Alt ts ps) = hsep (map ppStr ts) <+> char '/' <+> hsep (map ppStr ps)
+ppAlt (Alt ts ps) = ppStrs ts <+> char '/' <+> hsep (map (doubleQuotes . text) ps)
 
-ppStr s = doubleQuotes (text s)
+ppStrs ss = doubleQuotes (hsep (map text ss))
 
 ppFCat  fcat
   | fcat == fcatString = text "String"
-- 
cgit v1.2.3