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

distinguished know_VS and know_V2 in Lexicon; patched Italian imperatives (not quite finished yet)

Browse Source
This commit is contained in:
aarne
2008-11-05 10:22:09 +00:00
parent a629d30958
commit f7aed275d3
10 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
next-lib/src/abstract/Lexicon.gf
View File

@@ -163,7 +163,7 @@ fun
king_N : N ;
knee_N : N ;
know_V2 : V2 ;
know_V2 : V2 ;
know_VS : VS ;
lake_N : N ;
lamp_N : N ;
language_N : N ;

1
next-lib/src/english/LexiconEng.gf
View File

@@ -102,6 +102,7 @@ lin
iron_N = regN "iron" ;
king_N = mkN masculine (regN "king") ;
know_V2 = dirV2 (irregV "know" "knew" "known") ;
know_VS = mkVS (irregV "know" "knew" "known") ;
lake_N = regN "lake" ;
lamp_N = regN "lamp" ;
learn_V2 = dirV2 (regV "learn") ;

5
next-lib/src/finnish/LexiconFin.gf
View File

@@ -105,7 +105,8 @@ lin
industry_N = mkN "teollisuus" ;
iron_N = mkN "rauta" ;
king_N = mkN "kuningas" ;
know_V2 = mkV2 (mk2V "tietää" "tiesi") ; --- tuntea; gives tietänyt
know_VS = mkVS (mkV "tietää" "tiesi") ;
know_V2 = mkV2 (mkV "tuntea" "tunsi") ;
lake_N = mkN "järvi" "järviä" ;
lamp_N = mkN "lamppu" ;
learn_V2 =
@@ -348,7 +349,7 @@ lin
sew_V = mkV "kylvää" ;
sing_V = mkV "laulaa" ;
sit_V = mkV "istua" ;
smell_V = mk2V "haistaa" "haistoi" ;
smell_V = mk2V "haista" "haisi" ;
spit_V = mkV "sylkeä" ;
split_V2 = mkV2 (mk2V "halkaista" "halkaisi") ;
squeeze_V2 = mkV2 (mkV "puristaa") cpartitive ;

3
next-lib/src/french/LexiconFre.gf
View File

@@ -103,7 +103,8 @@ lin
industry_N = regGenN "industrie" feminine ;
iron_N = regGenN "fer" masculine ;
king_N = regGenN "roi" masculine ;
know_V2 = connaître_V2 ; ---- savoir_V2 : VS
know_V2 = connaître_V2 ;
know_VS = mkVS savoir_V2 ;
lake_N = regGenN "lac" masculine ;
lamp_N = regGenN "lampe" feminine ;
learn_V2 = apprendre_V2 ;

3
next-lib/src/german/LexiconGer.gf
View File

@@ -108,7 +108,8 @@ lin
iron_N = reg2N "Eisen" "Eisen" neuter ;
jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ;
king_N = regN "König" ;
know_V2 = dirV2 (irregV "wissen" "weiß" "wußte" "wüßte" "gewußt") ; ---- infl
know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl
know_VS = mkVS (irregV "wissen" "weiß" "wußte" "wüßte" "gewußt") ; ---- infl
lake_N = reg2N "See" "Seen" masculine ; --- infl
lamp_N = regN "Lampe";
learn_V2 = dirV2 (regV "lernen") ;

11
next-lib/src/italian/DiffIta.gf
View File

@@ -112,12 +112,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
let
pe = case b of {True => P3 ; _ => p} ;
agr = aag ** {p = pe} ;
clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
----e verb = case <aag.n, pol,pe> of {
----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
----e _ => (vp.s ! VPImperat).fin ! agr
----e } ;
verb = (vp.s ! VPImperat).fin ! agr ; ----e
clpr = <vp.clit1 ++ vp.clit2,[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
verb = case <aag.n, pol,pe> of {
<Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
_ => (vp.s ! VPImperat).fin ! agr
} ;
neg = vp.neg ! pol ;
compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
in

3
next-lib/src/italian/LexiconIta.gf
View File

@@ -103,7 +103,8 @@ lin
iron_N = regN "ferro" ;
john_PN = mkPN "Giovanni" masculine ;
king_N = regN "ré" ;
know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; --- savoir_V2 : VS
know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ;
know_VS = mkVS (verboV (sapere_78 "sapere")) ;
lake_N = regN "lago" ;
lamp_N = regN "lampa" ;
learn_V2 = dirV2 (regV "imparare") ;

2
next-lib/src/romance/ResRomance.gf
View File

@@ -306,7 +306,7 @@ oper
vp = useVP vpr ;
----e clpr = pronArg agr.n agr.p vp.clAcc vp.clDat ;
----e iform = infForm agr.n agr.p vp.clAcc vp.clDat ;
clpr = <vp.clit1, vp.clit2, False> ; ----e
clpr = <vp.clit1,vp.clit2, False> ; ----e
iform = False ; ----e
inf = (vp.s ! VPInfinit Simul iform).inf ! (aagr agr.g agr.n) ;
neg = vp.neg ! Pos ; --- Neg not in API

3
next-lib/src/swedish/LexiconSwe.gf
View File

@@ -102,7 +102,8 @@ lin
industry_N = mk2N "industri" "industrier" ; ---- "ien" ??
iron_N = regGenN "järn" neutrum ;
king_N = (regGenN "kung" utrum) ;
know_V2 = dirV2 (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
know_V2 = mkV2 (mkV "känner") ;
know_VS = mkVS (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
lamp_N = regGenN "lampa" utrum;
learn_V2 = dirV2 (reflV (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd")) ;

2
src/server/gf-server.cabal
View File

@@ -23,4 +23,4 @@ executable pgf.fcgi
FastCGIUtils
Cache
URLEncoding
ghc-options: -threaded
ghc-options: -threaded