mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-25 02:38:55 -06:00
restored passives in Extensions for Bul,Fre,Ita,Spa ; PassAgentVPSlash in ExtraBul to be verified
This commit is contained in:
@@ -109,4 +109,9 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
|
|||||||
PassVPSlash vp = insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++
|
PassVPSlash vp = insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++
|
||||||
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe) ;
|
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe) ;
|
||||||
|
|
||||||
|
PassAgentVPSlash vp np = ---- AR 9/4/2014: to be verified
|
||||||
|
insertObj (\\_ => "÷ðåç" ++ np.s ! RObj Acc) Pos
|
||||||
|
(insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++
|
||||||
|
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe)) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
concrete ExtraRomanceCat of ExtraRomanceAbs = CatCat ** ExtraRomance with
|
concrete ExtraRomanceCat of ExtraRomanceAbs = CatCat ** ExtraRomance with
|
||||||
(ResRomance = ResCat) ;
|
(ResRomance = ResCat), (Grammar = GrammarCat) ;
|
||||||
|
|||||||
@@ -77,8 +77,8 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre **
|
|||||||
ExistsNP np =
|
ExistsNP np =
|
||||||
mkClause "il" True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (regV "exister"))) ;
|
mkClause "il" True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (regV "exister"))) ;
|
||||||
|
|
||||||
|
--- in ExtraRomance
|
||||||
PassAgentVPSlash vps np = passVPSlash
|
-- PassAgentVPSlash vps np = passVPSlash
|
||||||
vps ("par" ++ (np.s ! Acc).ton) ;
|
-- vps ("par" ++ (np.s ! Acc).ton) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
concrete ExtraRomanceFre of ExtraRomanceAbs = CatFre ** ExtraRomance - [ProDrop] with
|
concrete ExtraRomanceFre of ExtraRomanceAbs = CatFre ** ExtraRomance - [ProDrop] with
|
||||||
(ResRomance = ResFre) ;
|
(ResRomance = ResFre), (Grammar = GrammarFre) ;
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
concrete ExtraRomanceIta of ExtraRomanceAbs = CatIta ** ExtraRomance with
|
concrete ExtraRomanceIta of ExtraRomanceAbs = CatIta ** ExtraRomance with
|
||||||
(ResRomance = ResIta) ;
|
(ResRomance = ResIta), (Grammar = GrammarIta) ;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance **
|
|||||||
CommonRomance,
|
CommonRomance,
|
||||||
Coordination,
|
Coordination,
|
||||||
ResRomance,
|
ResRomance,
|
||||||
(G = Grammar),
|
Grammar,
|
||||||
Prelude in {
|
Prelude in {
|
||||||
|
|
||||||
lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent
|
lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent
|
||||||
@@ -77,8 +77,8 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance **
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
PassVPSlash vps = passVPSlash vps [] ;
|
PassVPSlash vps = passVPSlash vps [] ;
|
||||||
---- PassAgentVPSlash vps np = passVPSlash
|
PassAgentVPSlash vps np = passVPSlash
|
||||||
---- vps (let by = <Grammar.by8agent_Prep : Prep> in by.s ++ (np.s ! by.c).ton) ;
|
vps (let by = <Grammar.by8agent_Prep : Prep> in by.s ++ (np.s ! by.c).ton) ;
|
||||||
|
|
||||||
oper
|
oper
|
||||||
passVPSlash : VPSlash -> Str -> ResRomance.VP = \vps, ag ->
|
passVPSlash : VPSlash -> Str -> ResRomance.VP = \vps, ag ->
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
concrete ExtraRomanceSpa of ExtraRomanceAbs = CatSpa ** ExtraRomance with
|
concrete ExtraRomanceSpa of ExtraRomanceAbs = CatSpa ** ExtraRomance with
|
||||||
(ResRomance = ResSpa) ;
|
(ResRomance = ResSpa), (Grammar = GrammarSpa) ;
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ lin
|
|||||||
---- GenIP = E.GenIP ;
|
---- GenIP = E.GenIP ;
|
||||||
---- GenRP = E.GenRP ;
|
---- GenRP = E.GenRP ;
|
||||||
|
|
||||||
---- PassVPSlash = E.PassVPSlash ;
|
PassVPSlash = E.PassVPSlash ;
|
||||||
---- PassAgentVPSlash = E.PassAgentVPSlash ;
|
PassAgentVPSlash = E.PassAgentVPSlash ;
|
||||||
|
|
||||||
EmptyRelSlash = E.EmptyRelSlash ;
|
EmptyRelSlash = E.EmptyRelSlash ;
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ lin
|
|||||||
---- GenIP = E.GenIP ;
|
---- GenIP = E.GenIP ;
|
||||||
---- GenRP = E.GenRP ;
|
---- GenRP = E.GenRP ;
|
||||||
|
|
||||||
---- PassVPSlash = E.PassVPSlash ;
|
PassVPSlash = E.PassVPSlash ;
|
||||||
---- PassAgentVPSlash = E.PassAgentVPSlash ;
|
PassAgentVPSlash = E.PassAgentVPSlash ;
|
||||||
|
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ lin
|
|||||||
---- GenIP = E.GenIP ;
|
---- GenIP = E.GenIP ;
|
||||||
---- GenRP = E.GenRP ;
|
---- GenRP = E.GenRP ;
|
||||||
|
|
||||||
---- PassVPSlash = E.PassVPSlash ;
|
PassVPSlash = E.PassVPSlash ;
|
||||||
---- PassAgentVPSlash = E.PassAgentVPSlash ;
|
PassAgentVPSlash = E.PassAgentVPSlash ;
|
||||||
|
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ lin
|
|||||||
---- GenIP = E.GenIP ;
|
---- GenIP = E.GenIP ;
|
||||||
---- GenRP = E.GenRP ;
|
---- GenRP = E.GenRP ;
|
||||||
|
|
||||||
---- PassVPSlash = E.PassVPSlash ;
|
PassVPSlash = E.PassVPSlash ;
|
||||||
---- PassAgentVPSlash = E.PassAgentVPSlash ;
|
PassAgentVPSlash = E.PassAgentVPSlash ;
|
||||||
|
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|||||||
Reference in New Issue
Block a user