forked from GitHub/gf-core
swadesh fixes; bug fix in i -old
This commit is contained in:
@@ -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 ;
|
||||
|
||||
@@ -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 = <>})
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user