From c9d10ab5ed8b82ba0f74a25ca30103ccf0985e6d Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Fri, 30 Apr 2004 11:28:35 +0000
Subject: random gen to fill given term

---
 src/GF/UseGrammar/Parsing.hs  | 3 ++-
 src/GF/UseGrammar/Tokenize.hs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/GF/UseGrammar')

diff --git a/src/GF/UseGrammar/Parsing.hs b/src/GF/UseGrammar/Parsing.hs
index 48b6ffac6..5d601bc58 100644
--- a/src/GF/UseGrammar/Parsing.hs
+++ b/src/GF/UseGrammar/Parsing.hs
@@ -5,6 +5,7 @@ import qualified AbsGFC as C
 import GFC
 import MkGFC (trExp) ----
 import CMacros
+import MMacros (refreshMetas)
 import Linear
 import Str
 import CF
@@ -68,7 +69,7 @@ tokens2trms opts sg cn parser as = do
     _ -> do
       (ts1,ss) <- checkErr $ mapErr postParse ts0
       if null ts1 then raise ss else return ()
-      ts2 <- mapM (checkErr . (annotate gr) . trExp) ts1 ---- 
+      ts2 <- mapM (checkErr . annotate gr . refreshMetas [] . trExp) ts1 ---- 
       if forgive then return ts2 else do
         let tsss = [(t, allLinsOfTree gr cn t) | t <- ts2]
             ps = [t | (t,ss) <- tsss, 
diff --git a/src/GF/UseGrammar/Tokenize.hs b/src/GF/UseGrammar/Tokenize.hs
index b264075ba..22d70a9b1 100644
--- a/src/GF/UseGrammar/Tokenize.hs
+++ b/src/GF/UseGrammar/Tokenize.hs
@@ -29,7 +29,7 @@ mkCFTok s = case s of
 
 mkCFTokVar :: String -> CFTok
 mkCFTokVar s = case s of
-  '?':_:_      -> tM s
+  '?':_:_      -> tM s --- "?" --- compat with prCF
   'x':'_':_    -> tV s
   'x':[]       -> tV s
   '$':xs@(_:_) -> if last s == '$' then tV (init xs) else tS s
-- 
cgit v1.2.3