diff options
| author | aarne <unknown> | 2005-03-14 16:40:08 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-03-14 16:40:08 +0000 |
| commit | 4ca5d0b507906e0f352217899776ca0f4f37cd29 (patch) | |
| tree | 4829658934096001dd31139b24fce3b0b1e2eb86 | |
| parent | 623521c70b04b0ca79aaf7f0695698bb82e48b6b (diff) | |
swadesh fixes; bug fix in i -old
| -rw-r--r-- | examples/stoneage/StoneageFre.gf | 6 | ||||
| -rw-r--r-- | examples/stoneage/StoneageResFre.gf | 4 | ||||
| -rw-r--r-- | src/GF/API/IOGrammar.hs | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/examples/stoneage/StoneageFre.gf b/examples/stoneage/StoneageFre.gf index 6696b2659..56f719d74 100644 --- a/examples/stoneage/StoneageFre.gf +++ b/examples/stoneage/StoneageFre.gf @@ -66,9 +66,9 @@ lin Fly = PresV fly_V ; Walk = PresV walk_V ; Come = PresV come_V ; - Lie = PresV lie_V ; - Sit = PresV sit_V ; - Stand = PresV stand_V ; + Lie = PresReflV lie_V ; + Sit = PresReflV sit_V ; + Stand = PresReflV stand_V ; Turn = PresV turn_V ; Fall = PresV fall_V ; Sing = PresV sing_V ; diff --git a/examples/stoneage/StoneageResFre.gf b/examples/stoneage/StoneageResFre.gf index c1aedf59a..cd5c90a5a 100644 --- a/examples/stoneage/StoneageResFre.gf +++ b/examples/stoneage/StoneageResFre.gf @@ -8,6 +8,10 @@ oper PresCl (insertObject (mkSatsObject s v o) v.c3 v.s3 r) ; PresVasV2 : V -> NP -> NP -> Phr = \ v -> PresV2 (dirV2 v) ; + PresReflV : V -> NP -> Phr = \v,s -> + PresCl (insertObject (mkSats s v) accusative.p1 [] + (reflPronNounPhrase (pgen2gen s.g) s.n s.p)) ; + PresCl : Sats -> Phr = \c -> {s = (UseCl (PosTP TPresent ASimul) (sats2clause c ** {lock_Cl = <>}) diff --git a/src/GF/API/IOGrammar.hs b/src/GF/API/IOGrammar.hs index c2c2628ba..8a521cc67 100644 --- a/src/GF/API/IOGrammar.hs +++ b/src/GF/API/IOGrammar.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/08 18:08:58 $ +-- > CVS $Date: 2005/03/14 17:40:10 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.15 $ +-- > CVS $Revision: 1.16 $ -- -- for reading grammars and terms from strings and files ----------------------------------------------------------------------------- @@ -67,7 +67,8 @@ shellStateFromFiles opts st file = case fileSuffix file of else addOptions (options [emitCode]) opts' grts <- compileModule osb st file let top = identC $ justModuleName file - ioeErr $ updateShellState opts' (Just top) st grts + mtop = if oElem showOld opts' then Nothing else Just top + ioeErr $ updateShellState opts' mtop st grts --- liftM (changeModTimes rts) $ grammar2shellState opts gr getShellStateFromFiles :: Options -> FilePath -> IO ShellState |