diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-01-04 20:55:13 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-01-04 20:55:13 +0000 |
| commit | 2497093a5e6d854fad1326fa709292090d3ffda6 (patch) | |
| tree | 3cac373337e69e6103bbbe6e38ac37cdeacfe335 /src | |
| parent | bead8666735df23d439cf009016288229c0aae48 (diff) | |
SISR: top categories do not need the Cat_field field.
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Speech/PrJSGF.hs | 5 | ||||
| -rw-r--r-- | src/GF/Speech/PrSRGS.hs | 5 | ||||
| -rw-r--r-- | src/GF/Speech/SISR.hs | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs index f284f941d..02d455f73 100644 --- a/src/GF/Speech/PrJSGF.hs +++ b/src/GF/Speech/PrJSGF.hs @@ -68,14 +68,11 @@ prJSGF srg@(SRG{grammarName=name,startCat=start,origStartCat=origStart,rules=rs} finalTag = tag sisr (profileFinalSISR n) topCatRules = [rule True (catFormId tc) (map (it tc) cs) | (tc,cs) <- srgTopCats srg] - where it i c = prCat c <+> tag sisr (topCatSISR (catFieldId i) c) + where it i c = prCat c <+> tag sisr (topCatSISR c) catFormId :: String -> String catFormId = (++ "_cat") -catFieldId :: String -> String -catFieldId = (++ "_field") - prCat :: SRGCat -> Doc prCat c = char '<' <> text c <> char '>' diff --git a/src/GF/Speech/PrSRGS.hs b/src/GF/Speech/PrSRGS.hs index 855ad0132..21261ddc4 100644 --- a/src/GF/Speech/PrSRGS.hs +++ b/src/GF/Speech/PrSRGS.hs @@ -64,7 +64,7 @@ prSrgsXml sisr srg@(SRG{grammarName=name,startCat=start, -- externally visible rules for each of the GF categories topCatRules = [topRule tc [oneOf (map (it tc) cs)] | (tc,cs) <- srgTopCats srg] where it i c = Tag "item" [] [Tag "ruleref" [("uri","#" ++ c)] [], - tag sisr (topCatSISR (catFieldId i) c)] + tag sisr (topCatSISR c)] topRule i is = Tag "rule" [("id",catFormId i),("scope","public")] is rule :: String -> [XML] -> XML @@ -111,9 +111,6 @@ tag (Just fmt) t = case t fmt of catFormId :: String -> String catFormId = (++ "_cat") -catFieldId :: String -> String -catFieldId = (++ "_field") - showToken :: Token -> String showToken t = t diff --git a/src/GF/Speech/SISR.hs b/src/GF/Speech/SISR.hs index 731f01a3e..71d5612ef 100644 --- a/src/GF/Speech/SISR.hs +++ b/src/GF/Speech/SISR.hs @@ -38,8 +38,8 @@ type SISRTag = [JS.DeclOrExpr] prSISR :: SISRTag -> String prSISR = JS.printTree -topCatSISR :: String -> String -> SISRFormat -> SISRTag -topCatSISR i c fmt = map JS.DExpr [field (fmtOut fmt) i `ass` fmtRef fmt c] +topCatSISR :: String -> SISRFormat -> SISRTag +topCatSISR c fmt = map JS.DExpr [fmtOut fmt `ass` fmtRef fmt c] profileInitSISR :: CFTerm -> SISRFormat -> SISRTag profileInitSISR t fmt |