summaryrefslogtreecommitdiff
path: root/src/GF/Grammar/Lockfield.hs
diff options
context:
space:
mode:
authoraarne <aarne@chalmers.se>2009-06-20 13:50:34 +0000
committeraarne <aarne@chalmers.se>2009-06-20 13:50:34 +0000
commitbeb8cad7d868b5ef1eb74d8f0d50cb689db613ab (patch)
tree8c0f93c7f2d26e37d22aa3bac37732336d0614c6 /src/GF/Grammar/Lockfield.hs
parent48c755597598fc4656603a90997ebe484488a8f9 (diff)
the construct lin C t now replaces lock fields (in source code; still tempor used internally); lock fields removed from english resource as an example
Diffstat (limited to 'src/GF/Grammar/Lockfield.hs')
-rw-r--r--src/GF/Grammar/Lockfield.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/GF/Grammar/Lockfield.hs b/src/GF/Grammar/Lockfield.hs
index 12b78ab9b..66a978770 100644
--- a/src/GF/Grammar/Lockfield.hs
+++ b/src/GF/Grammar/Lockfield.hs
@@ -36,8 +36,10 @@ lockRecType c t = plusRecType t $ RecType [(lockLabel c, RecType [])]
unlockRecord :: Ident -> Term -> Err Term
unlockRecord c ft = do
let (xs,t) = termFormCnc ft
- t' <- plusRecord t $ R [(lockLabel c, (Just (RecType []),R []))]
- return $ mkAbs xs t'
+ let lock = R [(lockLabel c, (Just (RecType []),R []))]
+ case plusRecord t lock of
+ Ok t' -> return $ mkAbs xs t'
+ _ -> return $ mkAbs xs (ExtR t lock)
lockLabel :: Ident -> Label
lockLabel c = LIdent $! BS.append lockPrefix (ident2bs c)