diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-01-31 20:56:42 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-01-31 20:56:42 +0000 |
| commit | 3addf256bcfaaa7748b0159a3dd6f6ce8fcd8b7c (patch) | |
| tree | 7bc860aa21e18b1db20889fdc19a764c92c5535f /src/GF/Devel | |
| parent | 8f8aac4d24b8ea7d0867df8b3f890422a1f833d8 (diff) | |
GFCC: TM with argument; fixed labels from bindings in gfc
Diffstat (limited to 'src/GF/Devel')
| -rw-r--r-- | src/GF/Devel/GFCCtoJS.hs | 2 | ||||
| -rw-r--r-- | src/GF/Devel/GrammarToGFCC.hs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/GF/Devel/GFCCtoJS.hs b/src/GF/Devel/GFCCtoJS.hs index ca2cfa183..1d0c863f2 100644 --- a/src/GF/Devel/GFCCtoJS.hs +++ b/src/GF/Devel/GFCCtoJS.hs @@ -63,7 +63,7 @@ term2js l t = f t D.FV xs -> new "Variants" (map f xs) D.W str x -> new "Suffix" [JS.EStr str, f x] D.RP x y -> new "Rp" [f x, f y] - D.TM -> new "Meta" [] + D.TM _ -> new "Meta" [] tokn2js :: D.Tokn -> JS.Expr tokn2js (D.KS s) = mkStr s diff --git a/src/GF/Devel/GrammarToGFCC.hs b/src/GF/Devel/GrammarToGFCC.hs index 4353eda03..0d24113dd 100644 --- a/src/GF/Devel/GrammarToGFCC.hs +++ b/src/GF/Devel/GrammarToGFCC.hs @@ -459,7 +459,8 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of Vr (IA (cat, _)) -> return (identC cat,[]) Vr (IAV (cat,_,_)) -> return (identC cat,[]) Vr (IC s) -> return (identC cat,[]) where - cat = init (reverse (dropWhile (/='_') (reverse s))) ---- from gf parser + cat = takeWhile (/='_') s ---- also to match IAVs; no _ in a cat tolerated + ---- init (reverse (dropWhile (/='_') (reverse s))) ---- from gf parser ---- Vr _ -> error $ "getLab " ++ show tr P p lab2 -> do (cat,labs) <- getLab p |