From 08d1751cd60250b8e63a5fbb527dc3009451093d Mon Sep 17 00:00:00 2001 From: bringert Date: Mon, 21 Mar 2005 13:27:04 +0000 Subject: [PATCH] Build cfgm files using the nondeterministic conversion. Allow coercions in cfgm rule functions and remove the name. --- examples/stoneage/mkStoneage.gfs | 8 +- src/GF/CFGM/AbsCFG.hs | 12 +- src/GF/CFGM/CFG.cf | 6 +- src/GF/CFGM/LexCFG.hs | 151 ++++++++++------- src/GF/CFGM/LexCFG.x | 54 ++++--- src/GF/CFGM/ParCFG.hs | 267 ++++++++++++++++--------------- src/GF/CFGM/ParCFG.y | 12 +- src/GF/CFGM/PrintCFG.hs | 34 ++-- src/GF/CFGM/PrintCFGrammar.hs | 22 +-- 9 files changed, 312 insertions(+), 254 deletions(-) diff --git a/examples/stoneage/mkStoneage.gfs b/examples/stoneage/mkStoneage.gfs index b231aed8c..71a7681c9 100644 --- a/examples/stoneage/mkStoneage.gfs +++ b/examples/stoneage/mkStoneage.gfs @@ -1,5 +1,5 @@ -i -src examples/stoneage/StoneageEng.gf -i -src examples/stoneage/StoneageFre.gf -i -src examples/stoneage/StoneageNor.gf -i -src examples/stoneage/StoneageSwe.gf +i -src -conversion=nondet -optimize=share examples/stoneage/StoneageEng.gf +i -src -conversion=nondet -optimize=share examples/stoneage/StoneageFre.gf +i -src -conversion=nondet -optimize=share examples/stoneage/StoneageNor.gf +i -src -conversion=nondet -optimize=share examples/stoneage/StoneageSwe.gf pm -printer=gfcm | wf stoneage.gfcm \ No newline at end of file diff --git a/src/GF/CFGM/AbsCFG.hs b/src/GF/CFGM/AbsCFG.hs index d66289ae9..c605ce212 100644 --- a/src/GF/CFGM/AbsCFG.hs +++ b/src/GF/CFGM/AbsCFG.hs @@ -1,4 +1,3 @@ - module AbsCFG where -- Haskell module generated by the BNF converter @@ -18,7 +17,12 @@ data Flag = deriving (Eq,Ord,Show) data Rule = - Rule Ident Name Profile Category [Symbol] + Rule Fun Profile Category [Symbol] + deriving (Eq,Ord,Show) + +data Fun = + Cons Ident + | Coerce deriving (Eq,Ord,Show) data Profile = @@ -34,10 +38,6 @@ data Symbol = | TermS String deriving (Eq,Ord,Show) -data Name = - Name SingleQuoteString - deriving (Eq,Ord,Show) - data Category = Category SingleQuoteString deriving (Eq,Ord,Show) diff --git a/src/GF/CFGM/CFG.cf b/src/GF/CFGM/CFG.cf index f6efce7e5..af55d6401 100644 --- a/src/GF/CFGM/CFG.cf +++ b/src/GF/CFGM/CFG.cf @@ -8,9 +8,12 @@ separator Grammar ""; StartCat. Flag ::= "startcat" Category; terminator Flag ";"; -Rule. Rule ::= Ident ":" Name Profile "." Category "->" [Symbol]; +Rule. Rule ::= Fun ":" Profile "." Category "->" [Symbol]; terminator Rule ";"; +Cons. Fun ::= Ident ; +Coerce. Fun ::= "_" ; + Profile. Profile ::= "[" [Ints] "]"; Ints. Ints ::= "[" [Integer] "]"; @@ -25,7 +28,6 @@ TermS. Symbol ::= String; (:[]). [Symbol] ::= Symbol ; (:). [Symbol] ::= Symbol [Symbol] ; -Name. Name ::= SingleQuoteString ; Category. Category ::= SingleQuoteString ; token SingleQuoteString '\'' ((char - ["'\\"]) | ('\\' ["'\\"]))* '\'' ; diff --git a/src/GF/CFGM/LexCFG.hs b/src/GF/CFGM/LexCFG.hs index fbf5ede3d..b06420998 100644 --- a/src/GF/CFGM/LexCFG.hs +++ b/src/GF/CFGM/LexCFG.hs @@ -1,9 +1,10 @@ -{-# OPTIONS -cpp #-} +{-# OPTIONS -fglasgow-exts -cpp #-} {-# LINE 3 "LexCFG.x" #-} module LexCFG where import ErrM + #if __GLASGOW_HASKELL__ >= 503 import Data.Array import Data.Char (ord) @@ -12,31 +13,39 @@ import Data.Array.Base (unsafeAt) import Array import Char (ord) #endif -alex_base :: Array Int Int -alex_base = listArray (0,15) [-8,-3,2,0,-46,0,-6,-4,45,200,408,0,115,323,257,67] +#if __GLASGOW_HASKELL__ >= 503 +import GHC.Exts +#else +import GlaExts +#endif +alex_base :: AlexAddr +alex_base = AlexA# "\xf8\xff\xfd\xff\x02\x00\x00\x00\xd2\xff\x00\x00\xfa\xff\xfc\xff\x2d\x00\xc8\x00\x98\x01\x00\x00\x73\x00\x43\x01\x01\x01\x43\x00"# -alex_table :: Array Int Int -alex_table = listArray (0,663) [0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,0,0,0,0,0,0,0,2,0,12,0,0,2,0,6,0,5,2,5,3,4,3,0,15,15,15,15,15,15,15,15,15,15,3,3,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,3,7,3,8,0,8,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,15,15,15,15,15,15,15,15,15,15,-1,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,14,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,10,9,9,9,9,9,9,9,9,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,13,0,0,0,10,13,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,14,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,10,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,10,10,10,10,10,10,10,10] +alex_table :: AlexAddr +alex_table = AlexA# "\x00\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x05\x00\x02\x00\x05\x00\x03\x00\x04\x00\x03\x00\x00\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x03\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x03\x00\x07\x00\x03\x00\x08\x00\x03\x00\x08\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\x0f\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x0e\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x0a\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x0d\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0e\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x00\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00\x0a\x00"# -alex_check :: Array Int Int -alex_check = listArray (0,663) [-1,9,10,11,12,13,9,10,11,12,13,9,10,11,12,13,62,-1,-1,-1,-1,-1,-1,-1,32,-1,34,-1,-1,32,-1,39,-1,39,32,39,44,45,46,-1,48,49,50,51,52,53,54,55,56,57,58,59,-1,-1,-1,-1,-1,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,39,93,92,-1,92,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,48,49,50,51,52,53,54,55,56,57,10,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,92,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,92,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,39,248,249,250,251,252,253,254,255,48,49,50,51,52,53,54,55,56,57,-1,-1,-1,-1,-1,-1,-1,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,34,-1,-1,-1,95,39,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,10,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,92,-1,-1,-1,-1,-1,-1,-1,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,110,-1,-1,-1,-1,-1,116,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,92,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,39,248,249,250,251,252,253,254,255,48,49,50,51,52,53,54,55,56,57,-1,-1,-1,-1,-1,-1,-1,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,-1,-1,-1,-1,95,-1,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,-1,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,-1,248,249,250,251,252,253,254,255] +alex_check :: AlexAddr +alex_check = AlexA# "\xff\xff\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x3e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x20\x00\xff\xff\x22\x00\xff\xff\xff\xff\x20\x00\xff\xff\x27\x00\xff\xff\x27\x00\x20\x00\x27\x00\x2c\x00\x2d\x00\x2e\x00\xff\xff\x30\x00\x31\x00\x32\x00\x33\x00\x34\x00\x35\x00\x36\x00\x37\x00\x38\x00\x39\x00\x3a\x00\x3b\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x41\x00\x42\x00\x43\x00\x44\x00\x45\x00\x46\x00\x47\x00\x48\x00\x49\x00\x4a\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x4f\x00\x50\x00\x51\x00\x52\x00\x53\x00\x54\x00\x55\x00\x56\x00\x57\x00\x58\x00\x59\x00\x5a\x00\x5b\x00\x27\x00\x5d\x00\x5c\x00\x5f\x00\x5c\x00\x61\x00\x62\x00\x63\x00\x64\x00\x65\x00\x66\x00\x67\x00\x68\x00\x69\x00\x6a\x00\x6b\x00\x6c\x00\x6d\x00\x6e\x00\x6f\x00\x70\x00\x71\x00\x72\x00\x73\x00\x74\x00\x75\x00\x76\x00\x77\x00\x78\x00\x79\x00\x7a\x00\x30\x00\x31\x00\x32\x00\x33\x00\x34\x00\x35\x00\x36\x00\x37\x00\x38\x00\x39\x00\x0a\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5c\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x22\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\x00\xc1\x00\xc2\x00\xc3\x00\xc4\x00\xc5\x00\xc6\x00\xc7\x00\xc8\x00\xc9\x00\xca\x00\xcb\x00\xcc\x00\xcd\x00\xce\x00\xcf\x00\xd0\x00\xd1\x00\xd2\x00\xd3\x00\xd4\x00\xd5\x00\xd6\x00\x5c\x00\xd8\x00\xd9\x00\xda\x00\xdb\x00\xdc\x00\xdd\x00\xde\x00\xdf\x00\xe0\x00\xe1\x00\xe2\x00\xe3\x00\xe4\x00\xe5\x00\xe6\x00\xe7\x00\xe8\x00\xe9\x00\xea\x00\xeb\x00\xec\x00\xed\x00\xee\x00\xef\x00\xf0\x00\xf1\x00\xf2\x00\xf3\x00\xf4\x00\xf5\x00\xf6\x00\x27\x00\xf8\x00\xf9\x00\xfa\x00\xfb\x00\xfc\x00\xfd\x00\xfe\x00\xff\x00\x30\x00\x31\x00\x32\x00\x33\x00\x34\x00\x35\x00\x36\x00\x37\x00\x38\x00\x39\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x41\x00\x42\x00\x43\x00\x44\x00\x45\x00\x46\x00\x47\x00\x48\x00\x49\x00\x4a\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x4f\x00\x50\x00\x51\x00\x52\x00\x53\x00\x54\x00\x55\x00\x56\x00\x57\x00\x58\x00\x59\x00\x5a\x00\x22\x00\xff\xff\xff\xff\xff\xff\x5f\x00\x27\x00\x61\x00\x62\x00\x63\x00\x64\x00\x65\x00\x66\x00\x67\x00\x68\x00\x69\x00\x6a\x00\x6b\x00\x6c\x00\x6d\x00\x6e\x00\x6f\x00\x70\x00\x71\x00\x72\x00\x73\x00\x74\x00\x75\x00\x76\x00\x77\x00\x78\x00\x79\x00\x7a\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0a\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5c\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x22\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x6e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x74\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\x00\xc1\x00\xc2\x00\xc3\x00\xc4\x00\xc5\x00\xc6\x00\xc7\x00\xc8\x00\xc9\x00\xca\x00\xcb\x00\xcc\x00\xcd\x00\xce\x00\xcf\x00\xd0\x00\xd1\x00\xd2\x00\xd3\x00\xd4\x00\xd5\x00\xd6\x00\x5c\x00\xd8\x00\xd9\x00\xda\x00\xdb\x00\xdc\x00\xdd\x00\xde\x00\xdf\x00\xe0\x00\xe1\x00\xe2\x00\xe3\x00\xe4\x00\xe5\x00\xe6\x00\xe7\x00\xe8\x00\xe9\x00\xea\x00\xeb\x00\xec\x00\xed\x00\xee\x00\xef\x00\xf0\x00\xf1\x00\xf2\x00\xf3\x00\xf4\x00\xf5\x00\xf6\x00\x27\x00\xf8\x00\xf9\x00\xfa\x00\xfb\x00\xfc\x00\xfd\x00\xfe\x00\xff\x00\x30\x00\x31\x00\x32\x00\x33\x00\x34\x00\x35\x00\x36\x00\x37\x00\x38\x00\x39\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x41\x00\x42\x00\x43\x00\x44\x00\x45\x00\x46\x00\x47\x00\x48\x00\x49\x00\x4a\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x4f\x00\x50\x00\x51\x00\x52\x00\x53\x00\x54\x00\x55\x00\x56\x00\x57\x00\x58\x00\x59\x00\x5a\x00\xff\xff\xff\xff\xff\xff\xff\xff\x5f\x00\xff\xff\x61\x00\x62\x00\x63\x00\x64\x00\x65\x00\x66\x00\x67\x00\x68\x00\x69\x00\x6a\x00\x6b\x00\x6c\x00\x6d\x00\x6e\x00\x6f\x00\x70\x00\x71\x00\x72\x00\x73\x00\x74\x00\x75\x00\x76\x00\x77\x00\x78\x00\x79\x00\x7a\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc0\x00\xc1\x00\xc2\x00\xc3\x00\xc4\x00\xc5\x00\xc6\x00\xc7\x00\xc8\x00\xc9\x00\xca\x00\xcb\x00\xcc\x00\xcd\x00\xce\x00\xcf\x00\xd0\x00\xd1\x00\xd2\x00\xd3\x00\xd4\x00\xd5\x00\xd6\x00\xff\xff\xd8\x00\xd9\x00\xda\x00\xdb\x00\xdc\x00\xdd\x00\xde\x00\xdf\x00\xe0\x00\xe1\x00\xe2\x00\xe3\x00\xe4\x00\xe5\x00\xe6\x00\xe7\x00\xe8\x00\xe9\x00\xea\x00\xeb\x00\xec\x00\xed\x00\xee\x00\xef\x00\xf0\x00\xf1\x00\xf2\x00\xf3\x00\xf4\x00\xf5\x00\xf6\x00\xff\xff\xf8\x00\xf9\x00\xfa\x00\xfb\x00\xfc\x00\xfd\x00\xfe\x00\xff\x00"# -alex_deflt :: Array Int Int -alex_deflt = listArray (0,15) [-1,-1,-1,-1,-1,-1,7,7,-1,-1,-1,-1,13,13,-1,-1] +alex_deflt :: AlexAddr +alex_deflt = AlexA# "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x07\x00\x07\x00\xff\xff\xff\xff\xff\xff\xff\xff\x0d\x00\x0d\x00\xff\xff\xff\xff"# alex_accept = listArray (0::Int,15) [[],[],[(AlexAccSkip)],[(AlexAcc (alex_action_1))],[],[(AlexAcc (alex_action_2))],[],[],[],[(AlexAcc (alex_action_3))],[(AlexAcc (alex_action_3))],[(AlexAcc (alex_action_4))],[],[],[],[(AlexAcc (alex_action_5))]] -{-# LINE 32 "LexCFG.x" #-} +{-# LINE 33 "LexCFG.x" #-} tok f p s = f p s +share :: String -> String +share = id + data Tok = - TS String -- reserved words - | TL String -- string literals - | TI String -- integer literals - | TV String -- identifiers - | TD String -- double precision float literals - | TC String -- character literals - | T_SingleQuoteString String + TS !String -- reserved words + | TL !String -- string literals + | TI !String -- integer literals + | TV !String -- identifiers + | TD !String -- double precision float literals + | TC !String -- character literals + | T_SingleQuoteString !String deriving (Eq,Show,Ord) @@ -58,24 +67,22 @@ prToken t = case t of PT _ (TV s) -> s PT _ (TD s) -> s PT _ (TC s) -> s - _ -> show t PT _ (T_SingleQuoteString s) -> s + _ -> show t + +data BTree = N | B String Tok BTree BTree deriving (Show) eitherResIdent :: (String -> Tok) -> String -> Tok -eitherResIdent tv s = if isResWord s then (TS s) else (tv s) where - isResWord s = isInTree s $ - B "grammar" (B "end" N N) (B "startcat" N N) +eitherResIdent tv s = treeFind resWords + where + treeFind N = tv s + treeFind (B a t left right) | s < a = treeFind left + | s > a = treeFind right + | s == a = t -data BTree = N | B String BTree BTree deriving (Show) - -isInTree :: String -> BTree -> Bool -isInTree x tree = case tree of - N -> False - B a left right - | x < a -> isInTree x left - | x > a -> isInTree x right - | x == a -> True +resWords = b "grammar" (b "end" N N) (b "startcat" N N) + where b s = B s (TS s) unescapeInitTail :: String -> String unescapeInitTail = unesc . tail where @@ -127,11 +134,11 @@ alexGetChar (p, _, (c:s)) = alexInputPrevChar :: AlexInput -> Char alexInputPrevChar (p, c, s) = c -alex_action_1 = tok (\p s -> PT p (TS s)) -alex_action_2 = tok (\p s -> PT p (eitherResIdent T_SingleQuoteString s)) -alex_action_3 = tok (\p s -> PT p (eitherResIdent TV s)) -alex_action_4 = tok (\p s -> PT p (TL $ unescapeInitTail s)) -alex_action_5 = tok (\p s -> PT p (TI s)) +alex_action_1 = tok (\p s -> PT p (TS $ share s)) +alex_action_2 = tok (\p s -> PT p (eitherResIdent (T_SingleQuoteString . share) s)) +alex_action_3 = tok (\p s -> PT p (eitherResIdent (TV . share) s)) +alex_action_4 = tok (\p s -> PT p (TL $ share $ unescapeInitTail s)) +alex_action_5 = tok (\p s -> PT p (TI $ share s)) {-# LINE 1 "GenericTemplate.hs" #-} {-# LINE 1 "" #-} {-# LINE 1 "" #-} @@ -145,13 +152,41 @@ alex_action_5 = tok (\p s -> PT p (TI s)) -- ----------------------------------------------------------------------------- -- INTERNALS and main scanner engine -{-# LINE 23 "GenericTemplate.hs" #-} + {-# LINE 35 "GenericTemplate.hs" #-} -{-# LINE 44 "GenericTemplate.hs" #-} -{-# LINE 67 "GenericTemplate.hs" #-} -alexIndexShortOffAddr arr off = arr ! off + + + + + + + + + +data AlexAddr = AlexA# Addr# + +{-# INLINE alexIndexShortOffAddr #-} +alexIndexShortOffAddr (AlexA# arr) off = +#if __GLASGOW_HASKELL__ > 500 + narrow16Int# i +#elif __GLASGOW_HASKELL__ == 500 + intToInt16# i +#else + (i `iShiftL#` 16#) `iShiftRA#` 16# +#endif + where +#if __GLASGOW_HASKELL__ >= 503 + i = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low) +#else + i = word2Int# ((high `shiftL#` 8#) `or#` low) +#endif + high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#))) + low = int2Word# (ord# (indexCharOffAddr# arr off')) + off' = off *# 2# + + -- ----------------------------------------------------------------------------- @@ -164,11 +199,11 @@ data AlexReturn a | AlexToken !AlexInput !Int a -- alexScan :: AlexInput -> StartCode -> Maybe (AlexInput,Int,act) -alexScan input (sc) - = alexScanUser undefined input (sc) +alexScan input (I# (sc)) + = alexScanUser undefined input (I# (sc)) -alexScanUser user input (sc) - = case alex_scan_tkn user input (0) input sc AlexNone of +alexScanUser user input (I# (sc)) + = case alex_scan_tkn user input 0# input sc AlexNone of (AlexNone, input') -> case alexGetChar input of Nothing -> @@ -201,12 +236,12 @@ alexScanUser user input (sc) alex_scan_tkn user orig_input len input s last_acc = input `seq` -- strict in the input case s of - (-1) -> (last_acc, input) + -1# -> (last_acc, input) _ -> alex_scan_tkn' user orig_input len input s last_acc alex_scan_tkn' user orig_input len input s last_acc = let - new_acc = check_accs (alex_accept `unsafeAt` (s)) + new_acc = check_accs (alex_accept `unsafeAt` (I# (s))) in new_acc `seq` case alexGetChar input of @@ -217,26 +252,26 @@ alex_scan_tkn' user orig_input len input s last_acc = let base = alexIndexShortOffAddr alex_base s - (ord_c) = ord c - offset = (base + ord_c) + (I# (ord_c)) = ord c + offset = (base +# ord_c) check = alexIndexShortOffAddr alex_check offset - new_s = if (offset >= (0)) && (check == ord_c) + new_s = if (offset >=# 0#) && (check ==# ord_c) then alexIndexShortOffAddr alex_table offset else alexIndexShortOffAddr alex_deflt s in - alex_scan_tkn user orig_input (len + (1)) new_input new_s new_acc + alex_scan_tkn user orig_input (len +# 1#) new_input new_s new_acc where check_accs [] = last_acc - check_accs (AlexAcc a : _) = AlexLastAcc a input (len) - check_accs (AlexAccSkip : _) = AlexLastSkip input (len) + check_accs (AlexAcc a : _) = AlexLastAcc a input (I# (len)) + check_accs (AlexAccSkip : _) = AlexLastSkip input (I# (len)) check_accs (AlexAccPred a pred : rest) - | pred user orig_input (len) input - = AlexLastAcc a input (len) + | pred user orig_input (I# (len)) input + = AlexLastAcc a input (I# (len)) check_accs (AlexAccSkipPred pred : rest) - | pred user orig_input (len) input - = AlexLastSkip input (len) + | pred user orig_input (I# (len)) input + = AlexLastSkip input (I# (len)) check_accs (_ : rest) = check_accs rest data AlexLastAcc a @@ -265,8 +300,8 @@ alexPrevCharIs c _ input _ _ = c == alexInputPrevChar input alexPrevCharIsOneOf arr _ input _ _ = arr ! alexInputPrevChar input --alexRightContext :: Int -> AlexAccPred _ -alexRightContext (sc) user _ _ input = - case alex_scan_tkn user input (0) input sc AlexNone of +alexRightContext (I# (sc)) user _ _ input = + case alex_scan_tkn user input 0# input sc AlexNone of (AlexNone, _) -> False _ -> True -- TODO: there's no need to find the longest @@ -274,4 +309,4 @@ alexRightContext (sc) user _ _ input = -- the first match will do. -- used by wrappers -iUnbox (i) = i +iUnbox (I# (i)) = i diff --git a/src/GF/CFGM/LexCFG.x b/src/GF/CFGM/LexCFG.x index 322d10a18..f3ecb14eb 100644 --- a/src/GF/CFGM/LexCFG.x +++ b/src/GF/CFGM/LexCFG.x @@ -4,6 +4,7 @@ module LexCFG where import ErrM + } @@ -15,32 +16,35 @@ $i = [$l $d _ '] -- identifier character $u = [\0-\255] -- universal: any character @rsyms = -- reserved words consisting of special symbols - \; | \: | \. | \- \> | \[ | \] | \, + \; | \: | \. | \- \> | \_ | \[ | \] | \, :- $white+ ; -@rsyms { tok (\p s -> PT p (TS s)) } -\' ($u # [\' \\]| \\ [\' \\]) * \' { tok (\p s -> PT p (eitherResIdent T_SingleQuoteString s)) } +@rsyms { tok (\p s -> PT p (TS $ share s)) } +\' ($u # [\' \\]| \\ [\' \\]) * \' { tok (\p s -> PT p (eitherResIdent (T_SingleQuoteString . share) s)) } -$l $i* { tok (\p s -> PT p (eitherResIdent TV s)) } -\" ([$u # [\" \\ \n]] | (\\ (\" | \\ | \' | n | t)))* \"{ tok (\p s -> PT p (TL $ unescapeInitTail s)) } +$l $i* { tok (\p s -> PT p (eitherResIdent (TV . share) s)) } +\" ([$u # [\" \\ \n]] | (\\ (\" | \\ | \' | n | t)))* \"{ tok (\p s -> PT p (TL $ share $ unescapeInitTail s)) } -$d+ { tok (\p s -> PT p (TI s)) } +$d+ { tok (\p s -> PT p (TI $ share s)) } { tok f p s = f p s +share :: String -> String +share = id + data Tok = - TS String -- reserved words - | TL String -- string literals - | TI String -- integer literals - | TV String -- identifiers - | TD String -- double precision float literals - | TC String -- character literals - | T_SingleQuoteString String + TS !String -- reserved words + | TL !String -- string literals + | TI !String -- integer literals + | TV !String -- identifiers + | TD !String -- double precision float literals + | TC !String -- character literals + | T_SingleQuoteString !String deriving (Eq,Show,Ord) @@ -62,24 +66,22 @@ prToken t = case t of PT _ (TV s) -> s PT _ (TD s) -> s PT _ (TC s) -> s - _ -> show t PT _ (T_SingleQuoteString s) -> s + _ -> show t + +data BTree = N | B String Tok BTree BTree deriving (Show) eitherResIdent :: (String -> Tok) -> String -> Tok -eitherResIdent tv s = if isResWord s then (TS s) else (tv s) where - isResWord s = isInTree s $ - B "grammar" (B "end" N N) (B "startcat" N N) +eitherResIdent tv s = treeFind resWords + where + treeFind N = tv s + treeFind (B a t left right) | s < a = treeFind left + | s > a = treeFind right + | s == a = t -data BTree = N | B String BTree BTree deriving (Show) - -isInTree :: String -> BTree -> Bool -isInTree x tree = case tree of - N -> False - B a left right - | x < a -> isInTree x left - | x > a -> isInTree x right - | x == a -> True +resWords = b "grammar" (b "end" N N) (b "startcat" N N) + where b s = B s (TS s) unescapeInitTail :: String -> String unescapeInitTail = unesc . tail where diff --git a/src/GF/CFGM/ParCFG.hs b/src/GF/CFGM/ParCFG.hs index 454b69ccb..e41aefb98 100644 --- a/src/GF/CFGM/ParCFG.hs +++ b/src/GF/CFGM/ParCFG.hs @@ -1,6 +1,4 @@ {-# OPTIONS -fglasgow-exts -cpp #-} --- parser produced by Happy Version 1.13 - module ParCFG where import AbsCFG import LexCFG @@ -12,6 +10,8 @@ import GHC.Exts import GlaExts #endif +-- parser produced by Happy Version 1.15 + newtype HappyAbsSyn t4 t5 t6 t7 = HappyAbsSyn (() -> ()) happyIn4 :: t4 -> (HappyAbsSyn t4 t5 t6 t7) happyIn4 x = unsafeCoerce# x @@ -79,46 +79,46 @@ happyIn14 x = unsafeCoerce# x happyOut14 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Rule]) happyOut14 x = unsafeCoerce# x {-# INLINE happyOut14 #-} -happyIn15 :: (Profile) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn15 :: (Fun) -> (HappyAbsSyn t4 t5 t6 t7) happyIn15 x = unsafeCoerce# x {-# INLINE happyIn15 #-} -happyOut15 :: (HappyAbsSyn t4 t5 t6 t7) -> (Profile) +happyOut15 :: (HappyAbsSyn t4 t5 t6 t7) -> (Fun) happyOut15 x = unsafeCoerce# x {-# INLINE happyOut15 #-} -happyIn16 :: (Ints) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn16 :: (Profile) -> (HappyAbsSyn t4 t5 t6 t7) happyIn16 x = unsafeCoerce# x {-# INLINE happyIn16 #-} -happyOut16 :: (HappyAbsSyn t4 t5 t6 t7) -> (Ints) +happyOut16 :: (HappyAbsSyn t4 t5 t6 t7) -> (Profile) happyOut16 x = unsafeCoerce# x {-# INLINE happyOut16 #-} -happyIn17 :: ([Ints]) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn17 :: (Ints) -> (HappyAbsSyn t4 t5 t6 t7) happyIn17 x = unsafeCoerce# x {-# INLINE happyIn17 #-} -happyOut17 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Ints]) +happyOut17 :: (HappyAbsSyn t4 t5 t6 t7) -> (Ints) happyOut17 x = unsafeCoerce# x {-# INLINE happyOut17 #-} -happyIn18 :: ([Integer]) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn18 :: ([Ints]) -> (HappyAbsSyn t4 t5 t6 t7) happyIn18 x = unsafeCoerce# x {-# INLINE happyIn18 #-} -happyOut18 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Integer]) +happyOut18 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Ints]) happyOut18 x = unsafeCoerce# x {-# INLINE happyOut18 #-} -happyIn19 :: (Symbol) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn19 :: ([Integer]) -> (HappyAbsSyn t4 t5 t6 t7) happyIn19 x = unsafeCoerce# x {-# INLINE happyIn19 #-} -happyOut19 :: (HappyAbsSyn t4 t5 t6 t7) -> (Symbol) +happyOut19 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Integer]) happyOut19 x = unsafeCoerce# x {-# INLINE happyOut19 #-} -happyIn20 :: ([Symbol]) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn20 :: (Symbol) -> (HappyAbsSyn t4 t5 t6 t7) happyIn20 x = unsafeCoerce# x {-# INLINE happyIn20 #-} -happyOut20 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Symbol]) +happyOut20 :: (HappyAbsSyn t4 t5 t6 t7) -> (Symbol) happyOut20 x = unsafeCoerce# x {-# INLINE happyOut20 #-} -happyIn21 :: (Name) -> (HappyAbsSyn t4 t5 t6 t7) +happyIn21 :: ([Symbol]) -> (HappyAbsSyn t4 t5 t6 t7) happyIn21 x = unsafeCoerce# x {-# INLINE happyIn21 #-} -happyOut21 :: (HappyAbsSyn t4 t5 t6 t7) -> (Name) +happyOut21 :: (HappyAbsSyn t4 t5 t6 t7) -> ([Symbol]) happyOut21 x = unsafeCoerce# x {-# INLINE happyOut21 #-} happyIn22 :: (Category) -> (HappyAbsSyn t4 t5 t6 t7) @@ -135,21 +135,21 @@ happyOutTok x = unsafeCoerce# x {-# INLINE happyOutTok #-} happyActOffsets :: HappyAddr -happyActOffsets = HappyA# "\x00\x00\x33\x00\x00\x00\x27\x00\x34\x00\x00\x00\x31\x00\x00\x00\x30\x00\x38\x00\x19\x00\x2d\x00\x00\x00\x00\x00\x00\x00\x36\x00\x35\x00\x2c\x00\x00\x00\x00\x00\x00\x00\x26\x00\x00\x00\x2e\x00\x2f\x00\x2b\x00\x2a\x00\x29\x00\x22\x00\x1f\x00\x28\x00\x24\x00\x20\x00\x00\x00\x00\x00\x1d\x00\x00\x00\x00\x00\x1e\x00\x11\x00\x00\x00\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# +happyActOffsets = HappyA# "\x00\x00\x37\x00\x00\x00\x31\x00\x34\x00\x00\x00\x30\x00\x00\x00\x2e\x00\x36\x00\x17\x00\x2c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x35\x00\x33\x00\x00\x00\x2a\x00\x00\x00\x00\x00\x2d\x00\x00\x00\x2f\x00\x2b\x00\x27\x00\x29\x00\x21\x00\x1e\x00\x28\x00\x22\x00\x24\x00\x00\x00\x00\x00\x23\x00\x00\x00\x00\x00\x11\x00\x0b\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# happyGotoOffsets :: HappyAddr -happyGotoOffsets = HappyA# "\x21\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x0d\x00\x01\x00\x16\x00\x00\x00\x1a\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\xf9\xff\x00\x00\x1c\x00\x00\x00\x00\x00\x0b\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x02\x00\x03\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# +happyGotoOffsets = HappyA# "\x19\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x0c\x00\x05\x00\x01\x00\x00\x00\x1b\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf7\xff\x00\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x09\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x08\x00\x02\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# happyDefActions :: HappyAddr -happyDefActions = HappyA# "\xf8\xff\x00\x00\xfe\xff\x00\x00\xfa\xff\xf7\xff\x00\x00\xf5\xff\xf2\xff\x00\x00\x00\x00\x00\x00\xe2\xff\xf6\xff\xfb\xff\x00\x00\x00\x00\x00\x00\xf4\xff\xf9\xff\xf1\xff\x00\x00\xe3\xff\x00\x00\x00\x00\xee\xff\xed\xff\x00\x00\xeb\xff\x00\x00\x00\x00\xea\xff\x00\x00\xfd\xff\xf0\xff\xee\xff\xec\xff\xef\xff\xeb\xff\x00\x00\xe7\xff\xe5\xff\xf3\xff\xe8\xff\xe6\xff\xfc\xff\xe9\xff\xe4\xff"# +happyDefActions = HappyA# "\xf8\xff\x00\x00\xfe\xff\x00\x00\xfa\xff\xf7\xff\x00\x00\xf5\xff\xf2\xff\x00\x00\x00\x00\x00\x00\xe1\xff\xf6\xff\xfb\xff\xf0\xff\x00\x00\x00\x00\xef\xff\x00\x00\xf4\xff\xf9\xff\x00\x00\xf1\xff\x00\x00\xec\xff\xeb\xff\x00\x00\xe9\xff\x00\x00\x00\x00\xe8\xff\x00\x00\xfd\xff\xee\xff\xec\xff\xea\xff\xed\xff\xe9\xff\x00\x00\xe5\xff\xe3\xff\xf3\xff\xe6\xff\xe4\xff\xfc\xff\xe7\xff\xe2\xff"# happyCheck :: HappyAddr -happyCheck = HappyA# "\xff\xff\x02\x00\x03\x00\x01\x00\x0b\x00\x02\x00\x03\x00\x03\x00\x03\x00\x08\x00\x03\x00\x05\x00\x01\x00\x00\x00\x0f\x00\x10\x00\x0e\x00\x12\x00\x0f\x00\x10\x00\x03\x00\x12\x00\x12\x00\x12\x00\x11\x00\x0e\x00\x00\x00\x0c\x00\x0d\x00\x07\x00\x0d\x00\x0e\x00\x0a\x00\x08\x00\x05\x00\x09\x00\x0b\x00\x04\x00\x06\x00\x06\x00\x0c\x00\x0d\x00\x0c\x00\x07\x00\x04\x00\x0e\x00\x0c\x00\x06\x00\x05\x00\x07\x00\x03\x00\x05\x00\x0e\x00\x09\x00\x01\x00\x10\x00\x02\x00\x01\x00\x0a\x00\x0e\x00\x0b\x00\x09\x00\x0b\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"# +happyCheck = HappyA# "\xff\xff\x02\x00\x03\x00\x0c\x00\x02\x00\x03\x00\x03\x00\x03\x00\x07\x00\x01\x00\x01\x00\x0a\x00\x00\x00\x08\x00\x03\x00\x10\x00\x11\x00\x12\x00\x10\x00\x11\x00\x12\x00\x12\x00\x12\x00\x0f\x00\x0f\x00\x0e\x00\x0f\x00\x00\x00\x05\x00\x04\x00\x0d\x00\x06\x00\x09\x00\x0d\x00\x0e\x00\x0c\x00\x09\x00\x05\x00\x0b\x00\x0d\x00\x0e\x00\x06\x00\x08\x00\x07\x00\x04\x00\x0f\x00\x0d\x00\x08\x00\x07\x00\x06\x00\x03\x00\x06\x00\x0a\x00\x02\x00\x01\x00\x01\x00\xff\xff\x0b\x00\xff\xff\x0f\x00\x0c\x00\xff\xff\x0a\x00\xff\xff\xff\xff\xff\xff\x11\x00\x0c\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"# happyTable :: HappyAddr -happyTable = HappyA# "\x00\x00\x28\x00\x0c\x00\x1f\x00\x18\x00\x28\x00\x0c\x00\x0c\x00\x0c\x00\x08\x00\x16\x00\x05\x00\x1f\x00\x07\x00\x29\x00\x2f\x00\x2e\x00\x2b\x00\x29\x00\x2a\x00\x2d\x00\x2b\x00\x1e\x00\x0d\x00\x17\x00\x20\x00\x0f\x00\x1a\x00\x24\x00\x09\x00\x2e\x00\x0f\x00\x0a\x00\x12\x00\x1d\x00\x10\x00\x03\x00\x03\x00\x26\x00\x04\x00\x1a\x00\x1b\x00\x22\x00\x27\x00\x28\x00\x0f\x00\x22\x00\x23\x00\x1d\x00\x24\x00\x1e\x00\x1a\x00\x0f\x00\x14\x00\x15\x00\xff\xff\x16\x00\x13\x00\x0c\x00\x0f\x00\x03\x00\x07\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# +happyTable = HappyA# "\x00\x00\x28\x00\x0c\x00\x18\x00\x28\x00\x0c\x00\x0c\x00\x0c\x00\x09\x00\x1f\x00\x1f\x00\x0a\x00\x07\x00\x08\x00\x2d\x00\x29\x00\x2f\x00\x2b\x00\x29\x00\x2a\x00\x2b\x00\x1e\x00\x0d\x00\x2e\x00\x20\x00\x2e\x00\x0f\x00\x0f\x00\x13\x00\x03\x00\x22\x00\x04\x00\x14\x00\x1a\x00\x24\x00\x03\x00\x10\x00\x05\x00\x11\x00\x1a\x00\x1b\x00\x1d\x00\x27\x00\x26\x00\x28\x00\x0f\x00\x22\x00\x24\x00\x23\x00\x1d\x00\x1e\x00\x1a\x00\x16\x00\x17\x00\x18\x00\x15\x00\x00\x00\x0c\x00\x00\x00\x0f\x00\x03\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\xff\xff\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# -happyReduceArr = array (1, 29) [ +happyReduceArr = array (1, 30) [ (1 , happyReduce_1), (2 , happyReduce_2), (3 , happyReduce_3), @@ -178,10 +178,11 @@ happyReduceArr = array (1, 29) [ (26 , happyReduce_26), (27 , happyReduce_27), (28 , happyReduce_28), - (29 , happyReduce_29) + (29 , happyReduce_29), + (30 , happyReduce_30) ] -happy_n_terms = 17 :: Int +happy_n_terms = 18 :: Int happy_n_nonterms = 19 :: Int happyReduce_1 = happySpecReduce_1 0# happyReduction_1 @@ -271,9 +272,8 @@ happyReduction_11 happy_x_3 (flip (:) happy_var_1 happy_var_2 )}} -happyReduce_12 = happyReduce 8# 9# happyReduction_12 -happyReduction_12 (happy_x_8 `HappyStk` - happy_x_7 `HappyStk` +happyReduce_12 = happyReduce 7# 9# happyReduction_12 +happyReduction_12 (happy_x_7 `HappyStk` happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` @@ -281,14 +281,13 @@ happyReduction_12 (happy_x_8 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` happyRest) - = case happyOut4 happy_x_1 of { happy_var_1 -> - case happyOut21 happy_x_3 of { happy_var_3 -> - case happyOut15 happy_x_4 of { happy_var_4 -> - case happyOut22 happy_x_6 of { happy_var_6 -> - case happyOut20 happy_x_8 of { happy_var_8 -> + = case happyOut15 happy_x_1 of { happy_var_1 -> + case happyOut16 happy_x_3 of { happy_var_3 -> + case happyOut22 happy_x_5 of { happy_var_5 -> + case happyOut21 happy_x_7 of { happy_var_7 -> happyIn13 - (Rule happy_var_1 happy_var_3 happy_var_4 happy_var_6 happy_var_8 - ) `HappyStk` happyRest}}}}} + (Rule happy_var_1 happy_var_3 happy_var_5 happy_var_7 + ) `HappyStk` happyRest}}}} happyReduce_13 = happySpecReduce_0 10# happyReduction_13 happyReduction_13 = happyIn14 @@ -305,120 +304,126 @@ happyReduction_14 happy_x_3 (flip (:) happy_var_1 happy_var_2 )}} -happyReduce_15 = happySpecReduce_3 11# happyReduction_15 -happyReduction_15 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut17 happy_x_2 of { happy_var_2 -> +happyReduce_15 = happySpecReduce_1 11# happyReduction_15 +happyReduction_15 happy_x_1 + = case happyOut4 happy_x_1 of { happy_var_1 -> happyIn15 - (Profile happy_var_2 + (Cons happy_var_1 )} -happyReduce_16 = happySpecReduce_3 12# happyReduction_16 -happyReduction_16 happy_x_3 +happyReduce_16 = happySpecReduce_1 11# happyReduction_16 +happyReduction_16 happy_x_1 + = happyIn15 + (Coerce + ) + +happyReduce_17 = happySpecReduce_3 12# happyReduction_17 +happyReduction_17 happy_x_3 happy_x_2 happy_x_1 = case happyOut18 happy_x_2 of { happy_var_2 -> happyIn16 + (Profile happy_var_2 + )} + +happyReduce_18 = happySpecReduce_3 13# happyReduction_18 +happyReduction_18 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut19 happy_x_2 of { happy_var_2 -> + happyIn17 (Ints happy_var_2 )} -happyReduce_17 = happySpecReduce_0 13# happyReduction_17 -happyReduction_17 = happyIn17 +happyReduce_19 = happySpecReduce_0 14# happyReduction_19 +happyReduction_19 = happyIn18 ([] ) -happyReduce_18 = happySpecReduce_1 13# happyReduction_18 -happyReduction_18 happy_x_1 - = case happyOut16 happy_x_1 of { happy_var_1 -> - happyIn17 - ((:[]) happy_var_1 - )} - -happyReduce_19 = happySpecReduce_3 13# happyReduction_19 -happyReduction_19 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut16 happy_x_1 of { happy_var_1 -> - case happyOut17 happy_x_3 of { happy_var_3 -> - happyIn17 - ((:) happy_var_1 happy_var_3 - )}} - -happyReduce_20 = happySpecReduce_0 14# happyReduction_20 -happyReduction_20 = happyIn18 - ([] - ) - -happyReduce_21 = happySpecReduce_1 14# happyReduction_21 -happyReduction_21 happy_x_1 - = case happyOut5 happy_x_1 of { happy_var_1 -> +happyReduce_20 = happySpecReduce_1 14# happyReduction_20 +happyReduction_20 happy_x_1 + = case happyOut17 happy_x_1 of { happy_var_1 -> happyIn18 ((:[]) happy_var_1 )} -happyReduce_22 = happySpecReduce_3 14# happyReduction_22 -happyReduction_22 happy_x_3 +happyReduce_21 = happySpecReduce_3 14# happyReduction_21 +happyReduction_21 happy_x_3 happy_x_2 happy_x_1 - = case happyOut5 happy_x_1 of { happy_var_1 -> + = case happyOut17 happy_x_1 of { happy_var_1 -> case happyOut18 happy_x_3 of { happy_var_3 -> happyIn18 ((:) happy_var_1 happy_var_3 )}} -happyReduce_23 = happySpecReduce_1 15# happyReduction_23 -happyReduction_23 happy_x_1 - = case happyOut22 happy_x_1 of { happy_var_1 -> - happyIn19 - (CatS happy_var_1 - )} - -happyReduce_24 = happySpecReduce_1 15# happyReduction_24 -happyReduction_24 happy_x_1 - = case happyOut6 happy_x_1 of { happy_var_1 -> - happyIn19 - (TermS happy_var_1 - )} - -happyReduce_25 = happySpecReduce_1 16# happyReduction_25 -happyReduction_25 happy_x_1 - = happyIn20 +happyReduce_22 = happySpecReduce_0 15# happyReduction_22 +happyReduction_22 = happyIn19 ([] ) -happyReduce_26 = happySpecReduce_1 16# happyReduction_26 -happyReduction_26 happy_x_1 - = case happyOut19 happy_x_1 of { happy_var_1 -> - happyIn20 +happyReduce_23 = happySpecReduce_1 15# happyReduction_23 +happyReduction_23 happy_x_1 + = case happyOut5 happy_x_1 of { happy_var_1 -> + happyIn19 ((:[]) happy_var_1 )} -happyReduce_27 = happySpecReduce_2 16# happyReduction_27 -happyReduction_27 happy_x_2 +happyReduce_24 = happySpecReduce_3 15# happyReduction_24 +happyReduction_24 happy_x_3 + happy_x_2 happy_x_1 - = case happyOut19 happy_x_1 of { happy_var_1 -> - case happyOut20 happy_x_2 of { happy_var_2 -> - happyIn20 - ((:) happy_var_1 happy_var_2 + = case happyOut5 happy_x_1 of { happy_var_1 -> + case happyOut19 happy_x_3 of { happy_var_3 -> + happyIn19 + ((:) happy_var_1 happy_var_3 )}} +happyReduce_25 = happySpecReduce_1 16# happyReduction_25 +happyReduction_25 happy_x_1 + = case happyOut22 happy_x_1 of { happy_var_1 -> + happyIn20 + (CatS happy_var_1 + )} + +happyReduce_26 = happySpecReduce_1 16# happyReduction_26 +happyReduction_26 happy_x_1 + = case happyOut6 happy_x_1 of { happy_var_1 -> + happyIn20 + (TermS happy_var_1 + )} + +happyReduce_27 = happySpecReduce_1 17# happyReduction_27 +happyReduction_27 happy_x_1 + = happyIn21 + ([] + ) + happyReduce_28 = happySpecReduce_1 17# happyReduction_28 happyReduction_28 happy_x_1 - = case happyOut7 happy_x_1 of { happy_var_1 -> + = case happyOut20 happy_x_1 of { happy_var_1 -> happyIn21 - (Name happy_var_1 + ((:[]) happy_var_1 )} -happyReduce_29 = happySpecReduce_1 18# happyReduction_29 -happyReduction_29 happy_x_1 +happyReduce_29 = happySpecReduce_2 17# happyReduction_29 +happyReduction_29 happy_x_2 + happy_x_1 + = case happyOut20 happy_x_1 of { happy_var_1 -> + case happyOut21 happy_x_2 of { happy_var_2 -> + happyIn21 + ((:) happy_var_1 happy_var_2 + )}} + +happyReduce_30 = happySpecReduce_1 18# happyReduction_30 +happyReduction_30 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn22 (Category happy_var_1 )} happyNewToken action sts stk [] = - happyDoAction 16# (error "reading EOF!") action sts stk [] + happyDoAction 17# (error "reading EOF!") action sts stk [] happyNewToken action sts stk (tk:tks) = let cont i = happyDoAction i tk action sts stk tks in @@ -427,28 +432,35 @@ happyNewToken action sts stk (tk:tks) = PT _ (TS ":") -> cont 2#; PT _ (TS ".") -> cont 3#; PT _ (TS "->") -> cont 4#; - PT _ (TS "[") -> cont 5#; - PT _ (TS "]") -> cont 6#; - PT _ (TS ",") -> cont 7#; - PT _ (TS "end") -> cont 8#; - PT _ (TS "grammar") -> cont 9#; - PT _ (TS "startcat") -> cont 10#; - PT _ (TV happy_dollar_dollar) -> cont 11#; - PT _ (TI happy_dollar_dollar) -> cont 12#; - PT _ (TL happy_dollar_dollar) -> cont 13#; - PT _ (T_SingleQuoteString happy_dollar_dollar) -> cont 14#; - _ -> cont 15#; - _ -> happyError tks + PT _ (TS "_") -> cont 5#; + PT _ (TS "[") -> cont 6#; + PT _ (TS "]") -> cont 7#; + PT _ (TS ",") -> cont 8#; + PT _ (TS "end") -> cont 9#; + PT _ (TS "grammar") -> cont 10#; + PT _ (TS "startcat") -> cont 11#; + PT _ (TV happy_dollar_dollar) -> cont 12#; + PT _ (TI happy_dollar_dollar) -> cont 13#; + PT _ (TL happy_dollar_dollar) -> cont 14#; + PT _ (T_SingleQuoteString happy_dollar_dollar) -> cont 15#; + _ -> cont 16#; + _ -> happyError' (tk:tks) } -happyThen :: Err a -> (a -> Err b) -> Err b +happyError_ tk tks = happyError' (tk:tks) + +happyThen :: () => Err a -> (a -> Err b) -> Err b happyThen = (thenM) -happyReturn :: a -> Err a +happyReturn :: () => a -> Err a happyReturn = (returnM) happyThen1 m k tks = (thenM) m (\a -> k a tks) +happyReturn1 :: () => a -> b -> Err a happyReturn1 = \a tks -> (returnM) a +happyError' :: () => [Token] -> Err a +happyError' = happyError -pGrammars tks = happyThen (happyParse 0# tks) (\x -> happyReturn (happyOut8 x)) +pGrammars tks = happySomeParser where + happySomeParser = happyThen (happyParse 0# tks) (\x -> happyReturn (happyOut8 x)) happySeq = happyDontSeq @@ -464,7 +476,7 @@ happyError ts = myLexer = tokens {-# LINE 1 "GenericTemplate.hs" #-} --- $Id: ParCFG.hs,v 1.5 2005/02/04 14:17:06 bringert Exp $ +-- $Id: ParCFG.hs,v 1.6 2005/03/21 14:27:06 bringert Exp $ @@ -532,9 +544,13 @@ happyParse start_state = happyNewToken start_state notHappyAtAll notHappyAtAll ----------------------------------------------------------------------------- -- Accepting the parse -happyAccept j tk st sts (HappyStk ans _) = (happyTcHack j - (happyTcHack st)) - (happyReturn1 ans) +-- If the current token is 0#, it means we've just accepted a partial +-- parse (a %partial parser). We must ignore the saved token on the top of +-- the stack in this case. +happyAccept 0# tk st sts (_ `HappyStk` ans `HappyStk` _) = + happyReturn1 ans +happyAccept j tk st sts (HappyStk ans _) = + (happyTcHack j (happyTcHack st)) (happyReturn1 ans) ----------------------------------------------------------------------------- -- Arrays only: do the next action @@ -607,7 +623,7 @@ data HappyAddr = HappyA# Addr# ----------------------------------------------------------------------------- -- HappyState data type (not arrays) -{-# LINE 165 "GenericTemplate.hs" #-} +{-# LINE 169 "GenericTemplate.hs" #-} ----------------------------------------------------------------------------- @@ -687,8 +703,7 @@ happyGoto nt j tk st = -- parse error if we are in recovery and we fail again happyFail 0# tk old_st _ stk = -- trace "failing" $ - happyError - + happyError_ tk {- We don't need state discarding for our restricted implementation of "error". In fact, it can cause some bogus parses, so I've disabled it diff --git a/src/GF/CFGM/ParCFG.y b/src/GF/CFGM/ParCFG.y index b6021bcd6..70432ecb7 100644 --- a/src/GF/CFGM/ParCFG.y +++ b/src/GF/CFGM/ParCFG.y @@ -16,6 +16,7 @@ import ErrM ':' { PT _ (TS ":") } '.' { PT _ (TS ".") } '->' { PT _ (TS "->") } + '_' { PT _ (TS "_") } '[' { PT _ (TS "[") } ']' { PT _ (TS "]") } ',' { PT _ (TS ",") } @@ -60,7 +61,7 @@ ListFlag : {- empty -} { [] } Rule :: { Rule } -Rule : Ident ':' Name Profile '.' Category '->' ListSymbol { Rule $1 $3 $4 $6 $8 } +Rule : Fun ':' Profile '.' Category '->' ListSymbol { Rule $1 $3 $5 $7 } ListRule :: { [Rule] } @@ -68,6 +69,11 @@ ListRule : {- empty -} { [] } | ListRule Rule ';' { flip (:) $1 $2 } +Fun :: { Fun } +Fun : Ident { Cons $1 } + | '_' { Coerce } + + Profile :: { Profile } Profile : '[' ListInts ']' { Profile $2 } @@ -99,10 +105,6 @@ ListSymbol : '.' { [] } | Symbol ListSymbol { (:) $1 $2 } -Name :: { Name } -Name : SingleQuoteString { Name $1 } - - Category :: { Category } Category : SingleQuoteString { Category $1 } diff --git a/src/GF/CFGM/PrintCFG.hs b/src/GF/CFGM/PrintCFG.hs index db3ae74a4..7310da562 100644 --- a/src/GF/CFGM/PrintCFG.hs +++ b/src/GF/CFGM/PrintCFG.hs @@ -1,4 +1,3 @@ - module PrintCFG where -- pretty-printer generated by the BNF converter @@ -15,20 +14,22 @@ type Doc = [ShowS] -> [ShowS] doc :: ShowS -> Doc doc = (:) --- seriously hacked spacing render :: Doc -> String render d = rend 0 (map ($ "") $ d []) "" where rend i ss = case ss of - ";" :ts -> showString ";" . new i . rend i ts - -- H removed a bunch of cases here - "]":".":ts -> showString "]" . space "." . rend i ts -- H - t:t' :ts | noSpace t' -> showString t . showString t' . rend i ts -- H - t :ts | noSpace t -> showString t . rend i ts -- H - t :ts -> space t . rend i ts - _ -> id + "[" :ts -> showChar '[' . rend i ts + "(" :ts -> showChar '(' . rend i ts + "{" :ts -> showChar '{' . new (i+1) . rend (i+1) ts + "}" : ";":ts -> new (i-1) . space "}" . showChar ';' . new (i-1) . rend (i-1) ts + "}" :ts -> new (i-1) . showChar '}' . new (i-1) . rend (i-1) ts + ";" :ts -> showChar ';' . new i . rend i ts + t : "," :ts -> showString t . space "," . rend i ts + t : ")" :ts -> showString t . showChar ')' . rend i ts + t : "]" :ts -> showString t . showChar ']' . rend i ts + t :ts -> space t . rend i ts + _ -> id new i = showChar '\n' . replicateS (2*i) (showChar ' ') . dropWhile isSpace space t = showString t . (\s -> if null s then "" else (' ':s)) - noSpace t = t `elem` ["[","]","{","}",",","/",":",".","!"] -- H parenth :: Doc -> Doc parenth ss = doc (showChar '(') . ss . doc (showChar ')') @@ -111,12 +112,18 @@ instance Print Flag where instance Print Rule where prt i e = case e of - Rule id name profile category symbols -> prPrec i 0 (concatD [prt 0 id , doc (showString ":") , prt 0 name , prt 0 profile , doc (showString ".") , prt 0 category , doc (showString "->") , prt 0 symbols]) + Rule fun profile category symbols -> prPrec i 0 (concatD [prt 0 fun , doc (showString ":") , prt 0 profile , doc (showString ".") , prt 0 category , doc (showString "->") , prt 0 symbols]) prtList es = case es of [] -> (concatD []) x:xs -> (concatD [prt 0 x , doc (showString ";") , prt 0 xs]) +instance Print Fun where + prt i e = case e of + Cons id -> prPrec i 0 (concatD [prt 0 id]) + Coerce -> prPrec i 0 (concatD [doc (showString "_")]) + + instance Print Profile where prt i e = case e of Profile intss -> prPrec i 0 (concatD [doc (showString "[") , prt 0 intss , doc (showString "]")]) @@ -141,11 +148,6 @@ instance Print Symbol where [x] -> (concatD [prt 0 x]) x:xs -> (concatD [prt 0 x , prt 0 xs]) -instance Print Name where - prt i e = case e of - Name singlequotestring -> prPrec i 0 (concatD [prt 0 singlequotestring]) - - instance Print Category where prt i e = case e of Category singlequotestring -> prPrec i 0 (concatD [prt 0 singlequotestring]) diff --git a/src/GF/CFGM/PrintCFGrammar.hs b/src/GF/CFGM/PrintCFGrammar.hs index 1d353be31..108122547 100644 --- a/src/GF/CFGM/PrintCFGrammar.hs +++ b/src/GF/CFGM/PrintCFGrammar.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/21 14:17:44 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.10 $ +-- > CVS $Date: 2005/03/21 14:27:10 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.11 $ -- -- Handles printing a CFGrammar in CFGM format. ----------------------------------------------------------------------------- @@ -49,7 +49,7 @@ getFlag fs x = listToMaybe [v | Flg (IC k) (IC v) <- fs, k == x] -- instead of 'Cnv.pInfo' (which recalculates the grammar every time) prLangAsCFGM :: CanonGrammar -> Ident -> Maybe String -> String prLangAsCFGM gr i start = prCFGrammarAsCFGM (Cnv.cfg (Cnv.pInfo opts gr i)) i start - where opts = Option.noOptions + where opts = Option.Opts [Option.gfcConversion "nondet"] {- prCFGrammarAsCFGM :: GT.CFGrammar -> Ident -> Maybe String -> String @@ -71,11 +71,10 @@ cfGrammarToCFGM gr i start = AbsCFG.Grammar (identToCFGMIdent i) flags (map rule ruleToCFGMRule :: GT.CFRule -> AbsCFG.Rule -- new version, without the MCFName constructor: -ruleToCFGMRule (CFGrammar.Rule c rhs (GT.CFName ({-GT.MCFName-} fun {-cat args-}) {-lbl-} profile)) - = AbsCFG.Rule fun' n' p' c' rhs' +ruleToCFGMRule (CFGrammar.Rule c rhs (GT.CFName fun profile)) + = AbsCFG.Rule fun' p' c' rhs' where - fun' = identToCFGMIdent fun - n' = strToCFGMName "this_should_disappear" + fun' = identToFun fun p' = profileToCFGMProfile profile c' = catToCFGMCat c rhs' = map symbolToGFCMSymbol rhs @@ -97,15 +96,16 @@ profileToCFGMProfile = AbsCFG.Profile . map (AbsCFG.Ints . map fromIntegral) identToCFGMIdent :: Ident -> AbsCFG.Ident identToCFGMIdent = AbsCFG.Ident . Prt.prt +identToFun :: Ident -> AbsCFG.Fun +identToFun IW = AbsCFG.Coerce +identToFun i = AbsCFG.Cons (identToCFGMIdent i) + strToCFGMCat :: String -> AbsCFG.Category strToCFGMCat = AbsCFG.Category . AbsCFG.SingleQuoteString . quoteSingle catToCFGMCat :: GT.CFCat -> AbsCFG.Category catToCFGMCat = strToCFGMCat . Prt.prt -strToCFGMName :: String -> AbsCFG.Name -strToCFGMName = AbsCFG.Name . AbsCFG.SingleQuoteString . quoteSingle - symbolToGFCMSymbol :: Parser.Symbol GT.CFCat GT.Tokn -> AbsCFG.Symbol symbolToGFCMSymbol (Parser.Cat c) = AbsCFG.CatS (catToCFGMCat c) symbolToGFCMSymbol (Parser.Tok t) = AbsCFG.TermS (Prt.prt t)