float parsing fixed

2 files changed, 18 insertions, 2 deletions

diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs
index 2facd6e65..bb80fb0fa 100644
--- a/src/GF/Canon/CMacros.hs
+++ b/src/GF/Canon/CMacros.hs
@@ -227,6 +227,20 @@ allLinValues trm = do
   lts <- allLinFields trm
   mapM (mapPairsM (return . allCaseValues)) lts
 
+-- | to gather all fields; does not assume s naming of fields; 
+-- used in Morpho only
+allAllLinValues :: Term -> Err [[(Label,[([Patt],Term)])]]
+allAllLinValues trm = do
+  lts <- allFields trm
+  mapM (mapPairsM (return . allCaseValues)) lts
+ where
+  allFields trm = case trm of
+    R rs  -> return [[(l,t) | Ass l t <- rs]]
+    FV ts -> do
+      lts <- mapM allFields ts
+      return $ concat lts
+    _ -> prtBad "fields can only be sought in a record not in" trm
+
 -- | to gather all linearizations, even from nested records; params ignored
 allLinBranches :: Term -> [([Label],Term)]
 allLinBranches trm = case trm of
diff --git a/src/GF/Canon/MkGFC.hs b/src/GF/Canon/MkGFC.hs
index 69ccc3034..8443354fc 100644
--- a/src/GF/Canon/MkGFC.hs
+++ b/src/GF/Canon/MkGFC.hs
@@ -112,12 +112,14 @@ trExp t = case t of
     AM i   -> A.Meta $ A.MetaSymb $ fromInteger i
     AT s   -> A.Sort $ prt s
     AS s   -> A.K s
-    AI i   -> A.EInt $ fromInteger i
+    AI i   -> A.EInt $ i
+    AF i   -> A.EFloat $ i
   trPt p = case p of
     APC mc ps -> let (m,c) = trQIdent mc in A.PP m c (map trPt ps)
     APV x -> A.PV x
     APS s -> A.PString s
-    API i -> A.PInt $ fromInteger i
+    API i -> A.PInt $ i
+    APF i -> A.PFloat $ i
     APW   -> A.PW
 
 trQIdent (CIQ m c) = (m,c)