msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Removed "that" variant in RelativeEng.IdRP. Added instead that_RP in ExtraEng[Abs].

Browse Source
This commit is contained in:
bjorn
2008-10-30 15:06:34 +00:00
parent bed2d9068e
commit e64d5a8bb0
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
next-lib/src/english/ExtraEng.gf
View File

@@ -50,4 +50,17 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
oper
neg = CNeg False ;
lin
that_RP =
{ s = table {
RC _ Gen => "whose" ;
RC _ _ => "that" ;
RPrep Neutr => "which" ;
RPrep _ => "whom"
} ;
a = RNoAg
} ;
}

2
next-lib/src/english/ExtraEngAbs.gf
View File

@@ -13,4 +13,6 @@ abstract ExtraEngAbs = Extra ** {
CompoundCN : CN -> CN -> CN ; -- rock album
that_RP : RP ; -- "that" as a relational pronoun (IdRP is "which" / "who")
}

10
next-lib/src/english/RelativeEng.gf
View File

@@ -38,13 +38,11 @@ concrete RelativeEng of Relative = CatEng ** open ResEng in {
} ;
IdRP =
let varr : Str -> Str = \x -> variants {x ; "that"} --- for bwc
in {
s = table {
{ s = table {
RC _ Gen => "whose" ;
RC Neutr _ => varr "which" ;
RC _ Acc => varr "whom" ;
RC _ Nom => varr "who" ;
RC Neutr _ => "which" ;
RC _ Acc => "whom" ;
RC _ Nom => "who" ;
RPrep Neutr => "which" ;
RPrep _ => "whom"
} ;