GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-24 03:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

macros for commands (dc) and terms (dt)

Browse Source
This commit is contained in:
aarne
2008-06-18 07:22:30 +00:00
parent ae171fc05f
commit b37db6c880
5 changed files with 107 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-3.0/GF/Command/Parse.hs
View File

@@ -20,10 +20,10 @@ pCommandLine = RP.sepBy (RP.skipSpaces >> pPipe) (RP.skipSpaces >> RP.char ';')
pPipe = RP.sepBy1 (RP.skipSpaces >> pCommand) (RP.skipSpaces >> RP.char '|')
pCommand = do
cmd <- pIdent
cmd <- pIdent RP.<++ (RP.char '%' >> pIdent >>= return . ('%':))
RP.skipSpaces
opts <- RP.sepBy pOption RP.skipSpaces
arg <- RP.option ANoArg (fmap AExp (pExp False))
arg <- pArgument
return (Command cmd opts arg)
pOption = do
@@ -38,3 +38,9 @@ pValue = do
pFilename = liftM2 (:) (RP.satisfy isFileFirst) (RP.munch (not . isSpace)) where
isFileFirst c = not (isSpace c) && not (isDigit c)
pArgument =
RP.option ANoArg
(fmap AExp (pExp False)
RP.<++
(RP.munch isSpace >> RP.char '%' >> fmap AMacro pIdent))