summaryrefslogtreecommitdiff
path: root/src/GF/Canon/GFCC/FCFGParsing.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/GF/Canon/GFCC/FCFGParsing.hs')
-rw-r--r--src/GF/Canon/GFCC/FCFGParsing.hs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/GF/Canon/GFCC/FCFGParsing.hs b/src/GF/Canon/GFCC/FCFGParsing.hs
index dfedc6622..eeea653d2 100644
--- a/src/GF/Canon/GFCC/FCFGParsing.hs
+++ b/src/GF/Canon/GFCC/FCFGParsing.hs
@@ -118,13 +118,11 @@ cnv_forests2 (FFloat x) = FFloat x
tree2term :: SyntaxTree Fun -> Exp
tree2term (TNode f ts) = Tr (AC f) (map tree2term ts)
-{- ----
-tree2term (TString s) = Macros.string2term s
-tree2term (TInt n) = Macros.int2term n
-tree2term (TFloat f) = Macros.float2term f
-tree2term (TMeta) = Macros.mkMeta 0
--}
+tree2term (TString s) = Tr (AS s) []
+tree2term (TInt n) = Tr (AI n) []
+tree2term (TFloat f) = Tr (AF f) []
+tree2term (TMeta) = Tr AM []
----------------------------------------------------------------------
-- conversion and unification of forests