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

fixed Scandinavian bugs in exx-resource

Browse Source
This commit is contained in:
aarne
2008-06-20 20:42:26 +00:00
parent 2f8a83b883
commit 23793d3353
24 changed files with 101 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource-1.4/swedish/DiffSwe.gf
View File

@@ -80,9 +80,9 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in {
} ;
relPron : GenNum => RCase => Str = \\gn,c => case c of {
RNom => "som" ;
RNom | RPrep False => "som" ;
RGen => "vars" ;
RPrep => gennumForms "vilken" "vilket" "vilka" ! gn
RPrep True => gennumForms "vilken" "vilket" "vilka" ! gn
} ;
pronSuch = gennumForms "sådan" "sådant" "sådana" ;

7
lib/resource-1.4/swedish/IdiomSwe.gf
View File

@@ -12,13 +12,10 @@ concrete IdiomSwe of Idiom = CatSwe **
GenericCl vp = mkClause "man" (agrP3 utr Sg) vp ;
CleftNP np rs = mkClause "det" (agrP3 neutr Sg)
(insertObj (\\_ => rs.s ! np.a)
(insertObj (\\_ => np.s ! rs.c) (predV verbBe))) ;
(insertObj (\\_ => np.s ! rs.c ++ rs.s ! np.a) (predV verbBe)) ;
CleftAdv ad s = mkClause "det" (agrP3 neutr Sg)
(insertObj (\\_ => "som" ++ s.s ! Sub)
(insertObj (\\_ => ad.s) (predV verbBe))) ;
(insertObj (\\_ => ad.s ++ s.s ! Sub) (predV verbBe)) ;
ExistNP np =
mkClause "det" (agrP3 neutr Sg) (insertObj

2
lib/resource-1.4/swedish/LexiconSwe.gf
View File

@@ -155,7 +155,7 @@ lin
say_VS = mkVS (mkV "säga" "säger" "säg" "sade" "sagt" "sagd") ;
school_N = regGenN "skola" utrum;
science_N = mk2N "vetenskap" "vetenskaper" ;
sea_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
sea_N = mkN "hav" "hav" ;
seek_V2 = dirV2 (mk2V "söka" "sökte") ;
see_V2 = dirV2 (mkV "se" "ser" "se" "såg" "sett" "sedd") ;
sell_V3 = dirV3 (irregV "sälja" "sålde" "sålt") (mkPrep "till") ;

15
lib/resource-1.4/swedish/ParadigmsSwe.gf
View File

@@ -415,9 +415,10 @@ oper
regN2 : Str -> Gender -> N2 ;
mmkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p.s} ;
mmkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = mkComplement p.s} ;
regN2 n g = mmkN2 (regGenN n g) (mkPrep "av") ;
mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p.s ; c3 = q.s} ;
mkN3 = \n,p,q -> n **
{lock_N3 = <> ; c2 = mkComplement p.s ; c3 = mkComplement q.s} ;
mkPN = overload {
mkPN : Str -> PN = regPN ;
@@ -474,7 +475,7 @@ oper
compoundA adj = {s = adj.s ; isComp = True ; lock_A = <>} ;
mkA2 a p = a ** {c2 = p.s ; lock_A2 = <>} ;
mkA2 a p = a ** {c2 = mkComplement p.s ; lock_A2 = <>} ;
mkAdv x = ss x ** {lock_Adv = <>} ;
mkAdV x = ss x ** {lock_AdV = <>} ;
@@ -566,7 +567,7 @@ oper
} ;
mmkV2 v p = v ** {c2 = p.s ; lock_V2 = <>} ;
mmkV2 v p = v ** {c2 = mkComplement p.s ; lock_V2 = <>} ;
dirV2 v = mmkV2 v noPrep ;
mkV3 = overload {
@@ -581,13 +582,13 @@ oper
dirdirV3 : V -> V3 ; -- ge, (dat), (acc)
mmkV3 v p q = v ** {c2 = p.s ; c3 = q.s ; lock_V3 = <>} ;
mmkV3 v p q = v ** {c2 = mkComplement p.s ; c3 = mkComplement q.s ; lock_V3 = <>} ;
dirV3 v p = mmkV3 v noPrep p ;
dirdirV3 v = dirV3 v noPrep ;
mkV0 v = v ** {lock_V0 = <>} ;
mkVS v = v ** {lock_VS = <>} ;
mkVV v = v ** {c2 = "att" ; lock_VV = <>} ;
mkVV v = v ** {c2 = mkComplement "att" ; lock_VV = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;
mkVA v = v ** {lock_VA = <>} ;
@@ -599,7 +600,7 @@ oper
A2V : Type = A2 ;
mkV2S v p = mmkV2 v p ** {lock_V2S = <>} ;
mkV2V v p t = mmkV2 v p ** {c3 = "att" ; lock_V2V = <>} ;
mkV2V v p t = mmkV2 v p ** {c3 = mkComplement "att" ; lock_V2V = <>} ;
mkV2Q v p = mmkV2 v p ** {lock_V2Q = <>} ;
mkAS v = v ** {lock_A = <>} ;

7
lib/resource-1.4/swedish/StructuralSwe.gf
View File

@@ -21,7 +21,7 @@ concrete StructuralSwe of Structural = CatSwe **
by8means_Prep = ss "med" ;
can8know_VV, can_VV =
mkV "kunna" "kan" "kunn" "kunde" "kunnat" "kunnen" **
{c2 = [] ; lock_VV = <>} ;
{c2 = mkComplement [] ; lock_VV = <>} ;
during_Prep = ss "under" ;
either7or_DConj = sd2 "antingen" "eller" ** {n = Sg} ;
everybody_NP = regNP "alla" "allas" Plg ;
@@ -49,7 +49,8 @@ concrete StructuralSwe of Structural = CatSwe **
most_Predet = {s = gennumForms ["den mesta"] ["det mesta"] ["de flesta"]} ;
much_Det = {s = \\_,_ => "mycket" ; n = Pl ; det = DDef Indef} ;
must_VV =
mkV "få" "måste" "få" "fick" "måst" "måst" ** {c2 = [] ; lock_VV = <>} ;
mkV "få" "måste" "få" "fick" "måst" "måst" **
{c2 = mkComplement [] ; lock_VV = <>} ;
no_Utt = ss ["nej"] ;
on_Prep = ss "på" ;
--- one_Quant = {s = \\_ => genderForms ["en"] ["ett"] ; n = Sg ; det = DIndef} ;
@@ -93,7 +94,7 @@ concrete StructuralSwe of Structural = CatSwe **
very_AdA = ss "mycket" ;
want_VV =
mkV "vilja" "vill" "vilj" "ville" "velat" "velad" **
{c2 = [] ; lock_VV = <>} ;
{c2 = mkComplement [] ; lock_VV = <>} ;
we_Pron = MorphoSwe.mkNP "vi" "oss" "vår" "vårt" "våra" Plg P1 ;
whatSg_IP = {s = \\_ => "vad" ; gn = SgUtr} ; ---- infl
whatPl_IP = {s = \\_ => "vad" ; gn = Plg} ; ---- infl