GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

swadesh fixes; bug fix in i -old

Browse Source
This commit is contained in:
aarne
2005-03-14 16:40:08 +00:00
parent 623521c70b
commit 4ca5d0b507
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stoneage/StoneageFre.gf
View File

@@ -66,9 +66,9 @@ lin
Fly = PresV fly_V ; Fly = PresV fly_V ;
Walk = PresV walk_V ; Walk = PresV walk_V ;
Come = PresV come_V ; Come = PresV come_V ;
Lie = PresV lie_V ; Lie = PresReflV lie_V ;
Sit = PresV sit_V ; Sit = PresReflV sit_V ;
Stand = PresV stand_V ; Stand = PresReflV stand_V ;
Turn = PresV turn_V ; Turn = PresV turn_V ;
Fall = PresV fall_V ; Fall = PresV fall_V ;
Sing = PresV sing_V ; Sing = PresV sing_V ;

4
examples/stoneage/StoneageResFre.gf
View File

@@ -8,6 +8,10 @@ oper
PresCl (insertObject (mkSatsObject s v o) v.c3 v.s3 r) ; PresCl (insertObject (mkSatsObject s v o) v.c3 v.s3 r) ;
PresVasV2 : V -> NP -> NP -> Phr = \ v -> PresV2 (dirV2 v) ; 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 -> PresCl : Sats -> Phr = \c ->
{s = (UseCl (PosTP TPresent ASimul) {s = (UseCl (PosTP TPresent ASimul)
(sats2clause c ** {lock_Cl = <>}) (sats2clause c ** {lock_Cl = <>})

7
src/GF/API/IOGrammar.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/03/08 18:08:58 $ -- > CVS $Date: 2005/03/14 17:40:10 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.15 $ -- > CVS $Revision: 1.16 $
-- --
-- for reading grammars and terms from strings and files -- 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' else addOptions (options [emitCode]) opts'
grts <- compileModule osb st file grts <- compileModule osb st file
let top = identC $ justModuleName 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 --- liftM (changeModTimes rts) $ grammar2shellState opts gr
getShellStateFromFiles :: Options -> FilePath -> IO ShellState getShellStateFromFiles :: Options -> FilePath -> IO ShellState