GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-05 17:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added ETag constructor to GF.Data.XML.XML since not all tags can use the empty shorthand.

Browse Source
This commit is contained in:
bringert
2007-01-07 23:57:29 +00:00
parent ac3d790e14
commit a4aec2da49
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/GF/Speech/GrammarToVoiceXML.hs
View File

@@ -219,7 +219,7 @@ filled :: [(String,String)] -> [XML] -> XML
filled = Tag "filled"
vxmlGrammar :: String -> XML
vxmlGrammar uri = Tag "grammar" [("src",uri)] []
vxmlGrammar uri = ETag "grammar" [("src",uri)]
prompt :: [XML] -> XML
prompt = Tag "prompt" []
@@ -228,13 +228,13 @@ promptString :: String -> XML
promptString p = prompt [Data p]
reprompt :: XML
reprompt = Tag "reprompt" [] []
reprompt = ETag "reprompt" []
assign :: String -> String -> XML
assign n e = Tag "assign" [("name",n),("expr",e)] []
assign n e = ETag "assign" [("name",n),("expr",e)]
value :: String -> XML
value expr = Tag "value" [("expr",expr)] []
value expr = ETag "value" [("expr",expr)]
if_ :: String -> [XML] -> XML
if_ c b = if_else c b []
@@ -248,10 +248,10 @@ cond ((c,b):rest) els = Tag "if" [("cond",c)] (b ++ es)
++ if null els then [] else (Tag "else" [] []:els)
goto_item :: String -> XML
goto_item nextitem = Tag "goto" [("nextitem",nextitem)] []
goto_item nextitem = ETag "goto" [("nextitem",nextitem)]
return_ :: [String] -> XML
return_ names = Tag "return" [("namelist", unwords names)] []
return_ names = ETag "return" [("namelist", unwords names)]
block :: [XML] -> XML
block = Tag "block" []
@@ -269,10 +269,10 @@ help :: [XML] -> XML
help = Tag "help" []
param :: String -> String -> XML
param name expr = Tag "param" [("name",name),("expr",expr)] []
param name expr = ETag "param" [("name",name),("expr",expr)]
var :: String -> Maybe String -> XML
var name expr = Tag "var" ([("name",name)]++e) []
var name expr = ETag "var" ([("name",name)]++e)
where e = maybe [] ((:[]) . (,) "expr") expr
script :: String -> XML