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

genitives in possessives in Nor (and Scand)

Browse Source
This commit is contained in:
aarne
2010-05-28 13:29:13 +00:00
parent 7a96cfc1b6
commit da5ecd322e
8 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/danish/ParadigmsDan.gf
View File

@@ -340,7 +340,7 @@ oper
makeNP : Str -> Str -> Number -> Gender -> NP ;
makeNP x y n g =
{s = table {NPPoss _ => x ; _ => y} ; a = agrP3 g n ;
{s = table {NPPoss _ _ => x ; _ => y} ; a = agrP3 g n ;
lock_NP = <>} ;
mk3A = mk3ADeg ;

6
lib/src/norwegian/ExtraNor.gf
View File

@@ -2,10 +2,8 @@ concrete ExtraNor of ExtraNorAbs = ExtraScandNor ** open CommonScand, ResNor, Pr
lin
PossNP np pro = {
s = table {
NPPoss _ => np.s ! NPNom ++ pro.s ! NPPoss (gennumAgr np.a) ++ BIND ++ "s" ; ----
_ => np.s ! NPNom ++ pro.s ! NPPoss (gennumAgr np.a)
} ;
s = \\c => np.s ! NPNom ++ pro.s ! NPPoss (gennumAgr np.a) (caseNP c) ;
a = np.a
} ;
}

2
lib/src/norwegian/ParadigmsNor.gf
View File

@@ -325,7 +325,7 @@ oper
makeNP : Str -> Str -> Number -> Gender -> NP ;
makeNP x y n g =
{s = table {NPPoss _ => x ; _ => y} ; a = agrP3 (ngen2gen g) n ;
{s = table {NPPoss _ _ => x ; _ => y} ; a = agrP3 (ngen2gen g) n ;
lock_NP = <>} ;
mk3A = mk3ADeg ; ---- (mkAdject a b c [] []) ** {isComp = False ; lock_A = <>} ;

2
lib/src/norwegian/StructuralNor.gf
View File

@@ -74,7 +74,7 @@ concrete StructuralNor of Structural = CatNor **
Sg => \\_,_ => genderForms ["den der"] ["det der"] ;
Pl => \\_,_,_ => ["de der"]
} ;
det = DDef Indef
det = DDef Def
} ;
there_Adv = ss "der" ;
there7to_Adv = ss "dit" ;

6
lib/src/scandinavian/CommonScand.gf
View File

@@ -65,7 +65,7 @@ param
VType = VAct | VPass | VRefl ;
NPForm = NPNom | NPAcc | NPPoss GenNum ;
NPForm = NPNom | NPAcc | NPPoss GenNum Case ;
RCase = RNom | RGen | RPrep Bool ;
@@ -82,7 +82,7 @@ oper
accusative : NPForm = NPAcc ;
caseNP : NPForm -> Case = \np -> case np of {
NPPoss _ => Gen ;
NPPoss _ _ => Gen ;
_ => Nom
} ;
@@ -224,7 +224,7 @@ oper
s = table {
NPNom => du ;
NPAcc => dig ;
NPPoss h => gennumForms din ditt dina ! h
NPPoss h c => mkCase c (gennumForms din ditt dina ! h)
} ;
a = {
g = g ;

2
lib/src/scandinavian/ExtraScand.gf
View File

@@ -2,7 +2,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
open CommonScand,Coordination,ResScand in {
lin
GenNP np = {
s,sp = \\n,_,_,g => np.s ! NPPoss (gennum (ngen2gen g) n) ;
s,sp = \\n,_,_,g => np.s ! NPPoss (gennum (ngen2gen g) n) Nom ;
det = DDef Indef
} ;

2
lib/src/scandinavian/NounScand.gf
View File

@@ -83,7 +83,7 @@ incomplete concrete NounScand of Noun =
} ;
PossPron p = {
s,sp = \\n,_,_,g => p.s ! NPPoss (gennum (ngen2gen g) n) ;
s,sp = \\n,_,_,g => p.s ! NPPoss (gennum (ngen2gen g) n) Nom ;
det = DDef Indef
} ;

2
lib/src/swedish/ParadigmsSwe.gf
View File

@@ -436,7 +436,7 @@ oper
regGenPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
nounPN n = {s = n.s ! singular ! Indef ; g = n.g ; lock_PN = <>} ;
makeNP x y n g =
{s = table {NPPoss _ => y ; _ => x} ; a = agrP3 g n ; p = P3 ;
{s = table {NPPoss _ _ => y ; _ => x} ; a = agrP3 g n ; p = P3 ;
lock_NP = <>} ;
mkA = overload {