summaryrefslogtreecommitdiff
path: root/src/GF/UseGrammar
diff options
context:
space:
mode:
authoraarne <unknown>2005-02-08 15:35:58 +0000
committeraarne <unknown>2005-02-08 15:35:58 +0000
commit4fd0c636f8590bf800715f2598e54ccc22c99b90 (patch)
tree6415ac64c06f2cf27bce3b5b154eeb58f18d3776 /src/GF/UseGrammar
parent6fe9cca0ff4f0730de4f254482cb68ce494f58d7 (diff)
unlexer concat
Diffstat (limited to 'src/GF/UseGrammar')
-rw-r--r--src/GF/UseGrammar/Custom.hs2
-rw-r--r--src/GF/UseGrammar/Randomized.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index 4ec37d1ae..12b9b2ca9 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -75,6 +75,7 @@ import MoreCustom -- either small/ or big/. The one in Small is empty.
import UseIO
import Monad
+import Char
-- character codings
import Unicode
@@ -365,6 +366,7 @@ customUntokenizer =
(strCI "unwords", const $ id) -- DEFAULT
,(strCI "text", const $ formatAsText)
,(strCI "code", const $ formatAsCode)
+ ,(strCI "concat", const $ filter (not . isSpace))
,(strCI "textlit", const $ formatAsTextLit)
,(strCI "codelit", const $ formatAsCodeLit)
,(strCI "concat", const $ concatRemSpace)
diff --git a/src/GF/UseGrammar/Randomized.hs b/src/GF/UseGrammar/Randomized.hs
index 200e69104..d2e26a18b 100644
--- a/src/GF/UseGrammar/Randomized.hs
+++ b/src/GF/UseGrammar/Randomized.hs
@@ -45,7 +45,7 @@ mkTreeFromInts ints gr catfun = do
return $ loc2tree state
mkStateFromInts :: [Int] -> CGrammar -> Action
-mkStateFromInts ints gr = mkRandomState ints where
+mkStateFromInts ints gr z = mkRandomState ints z >>= reCheckState gr where
mkRandomState [] state = do
testErr (isCompleteState state) "not completed"
return state