diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-03-21 13:57:38 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-03-21 13:57:38 +0000 |
| commit | e7f325f975eb7e816e04d06e35e0bd6dd16776ed (patch) | |
| tree | 058833498fce8fc775fb8d126bb01eab8ffbf45a /src/GF | |
| parent | da61e709ad08d059f5a2a604eb98ff82a5a15e5e (diff) | |
unlexer bug ; "vilka" ; lib path warning ; p -lines result
Diffstat (limited to 'src/GF')
| -rw-r--r-- | src/GF/Shell.hs | 6 | ||||
| -rw-r--r-- | src/GF/Text/Text.hs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/GF/Shell.hs b/src/GF/Shell.hs index 1077616f5..3af343bb2 100644 --- a/src/GF/Shell.hs +++ b/src/GF/Shell.hs @@ -24,6 +24,7 @@ import qualified GF.Grammar.Lookup as L import qualified GF.Canon.GFC as GFC import qualified GF.Canon.Look as Look import qualified GF.Canon.CMacros as CMacros +import qualified GF.Grammar.MMacros as MMacros import qualified GF.Compile.GrammarToCanon as GrammarToCanon import GF.Grammar.Values import GF.UseGrammar.GetTree @@ -236,7 +237,10 @@ execC co@(comm, opts0) sa@(sh@(st,(h,_,_,_)),a) = checkOptions st co >> case com let ss = (if oElem showAll opts then id else filter (not . null)) $ lines $ prCommandArg a mts <- mapM parse ss - let a' = ATrms [t | (_,ATrms ts) <- mts, t <- ts] + let mark s ts = case ts of + [] -> [MMacros.uTree] -- to leave a trace of unparsed line + _ -> ts + let a' = ATrms [t | (s,(_,ATrms ts)) <- zip ss mts, t <- mark s ts] changeArg (const a') sa | otherwise -> parse $ prCommandArg a where diff --git a/src/GF/Text/Text.hs b/src/GF/Text/Text.hs index 3e1b9c46d..a2a69f70c 100644 --- a/src/GF/Text/Text.hs +++ b/src/GF/Text/Text.hs @@ -60,7 +60,7 @@ formatAsCodeLit :: String -> String formatAsCodeLit = formatAsCode . unwords . map unStringLit . words formatAsText,formatAsHTML,formatAsLatex :: String -> String -formatAsText = formatAsTextGen (=="&-") (=="&-") +formatAsText = formatAsTextGen (const False) (=="&-") formatAsHTML = formatAsTextGen (\s -> take 1 s == "<" || last s == '>') (const False) formatAsLatex = formatAsTextGen ((=="\\") . take 1) (const False) |