mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-21 01:06:21 -06:00
(Ara) Conjunctions, ComplV*, additions in Idiom&Construction, etc.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
concrete RelativeAra of Relative = CatAra **
|
||||
open ResAra, (Se=SentenceAra), (St=StructuralAra) in {
|
||||
open ResAra in {
|
||||
flags coding=utf8;
|
||||
|
||||
lin
|
||||
@@ -13,8 +13,8 @@ concrete RelativeAra of Relative = CatAra **
|
||||
s = \\t,p,agr,c =>
|
||||
let
|
||||
npS : Case => Str = \\_ => rp.s ! agr2ragr agr c ;
|
||||
np = emptyNP ** {s = npS ; a = agr} ;
|
||||
cl = Se.PredVP np vp ;
|
||||
np : NP = agrNP agr ** {s = npS} ;
|
||||
cl = predVP np vp ;
|
||||
in
|
||||
cl.s ! t ! p ! Nominal
|
||||
} ;
|
||||
@@ -22,9 +22,8 @@ concrete RelativeAra of Relative = CatAra **
|
||||
-- : RP -> ClSlash -> RCl ; -- whom John loves
|
||||
RelSlash rp cls = cls ** {
|
||||
s = \\t,p,agr,c =>
|
||||
let obj = case (pgn2gn agr.pgn).g of {
|
||||
Fem => St.she_Pron ; -- head is repeated as a clitic object pronoun
|
||||
Masc => St.he_Pron } ;
|
||||
let --empty : Agr -> NP = emptyNP ;
|
||||
obj : ResAra.NP = pgn2pron agr.pgn ; -- head is repeated as a clitic object pronoun
|
||||
cl : ResAra.Cl = complClSlash obj cls ;
|
||||
in rp.s ! agr2ragr agr c ++ cl.s ! t ! p ! VOS
|
||||
} ;
|
||||
|
||||
Reference in New Issue
Block a user