diff options
| author | aarne <unknown> | 2005-11-11 22:24:33 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-11-11 22:24:33 +0000 |
| commit | 00b435c839b12539a78e9d5040f94d2284d37c0b (patch) | |
| tree | 1a74f03ecc42f53e034998fb29b0ab12256ae6e8 /src/GF/Grammar | |
| parent | c52e57411b79b543f626651783a5cf2306c916f7 (diff) | |
compilation of functors
Diffstat (limited to 'src/GF/Grammar')
| -rw-r--r-- | src/GF/Grammar/Lockfield.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/GF/Grammar/Lockfield.hs b/src/GF/Grammar/Lockfield.hs index e2482363b..960b12983 100644 --- a/src/GF/Grammar/Lockfield.hs +++ b/src/GF/Grammar/Lockfield.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:22:21 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.6 $ +-- > CVS $Date: 2005/11/11 23:24:34 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.7 $ -- -- Creating and using lock fields in reused resource grammars. -- @@ -26,8 +26,8 @@ import GF.Data.Operations lockRecType :: Ident -> Type -> Err Type lockRecType c t@(RecType rs) = let lab = lockLabel c in - return $ if elem lab (map fst rs) - then t --- don't add an extra copy of the lock field + return $ if elem lab (map fst rs) || elem (prt c) ["String","Int"] + then t --- don't add an extra copy of lock field, nor predef cats else RecType (rs ++ [(lockLabel c, RecType [])]) lockRecType c t = plusRecType t $ RecType [(lockLabel c, RecType [])] |
