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

past participle in proper place in English VP

Browse Source
This commit is contained in:
aarne
2011-07-22 07:49:53 +00:00
parent 61c9bdf94e
commit b43fa3ce9e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/src/english/ExtraEng.gf
View File

@@ -120,11 +120,12 @@ lin
PassVPSlash vps = PassVPSlash vps =
let let
be = predAux auxBe ; be = predAux auxBe ;
ppt = (vps.s ! Pres ! Anter ! CPos ! ODir ! agrP3 Pl).inf ppt = vps.ptp
in { in {
s = be.s ; s = be.s ;
prp = be.prp ++ ppt ; prp = be.prp ;
inf = be.inf ++ ppt ; ptp = be.ptp ;
inf = be.inf ;
ad = vps.ad ; ad = vps.ad ;
s2 = \\a => ppt ++ vps.s2 ! a ---- order s2 = \\a => ppt ++ vps.s2 ! a ---- order
} ; } ;

6
lib/src/english/ResEng.gf
View File

@@ -224,6 +224,7 @@ resource ResEng = ParamX ** open Prelude in {
VP : Type = { VP : Type = {
s : VerbForms ; s : VerbForms ;
prp : Str ; -- present participle prp : Str ; -- present participle
ptp : Str ; -- past participle
inf : Str ; -- the infinitive form ; VerbForms would be the logical place inf : Str ; -- the infinitive form ; VerbForms would be the logical place
ad : Str ; -- sentence adverb ad : Str ; -- sentence adverb
s2 : Agr => Str -- complement s2 : Agr => Str -- complement
@@ -263,6 +264,7 @@ resource ResEng = ParamX ** open Prelude in {
<Pres,Simul,CNeg c,_> => vfn c (does agr) (doesnt agr) inf <Pres,Simul,CNeg c,_> => vfn c (does agr) (doesnt agr) inf
} ; } ;
prp = verb.s ! VPresPart ; prp = verb.s ! VPresPart ;
ptp = verb.s ! VPPart ;
inf = verb.s ! VInf ; inf = verb.s ! VInf ;
ad = [] ; ad = [] ;
s2 = \\a => if_then_Str verb.isRefl (reflPron ! a) [] s2 = \\a => if_then_Str verb.isRefl (reflPron ! a) []
@@ -299,6 +301,7 @@ resource ResEng = ParamX ** open Prelude in {
<Pres,Simul,CNeg c, _> => vfn c finp fin [] <Pres,Simul,CNeg c, _> => vfn c finp fin []
} ; } ;
prp = verb.prpart ; prp = verb.prpart ;
ptp = verb.ppart ;
inf = verb.inf ; inf = verb.inf ;
ad = [] ; ad = [] ;
s2 = \\_ => [] s2 = \\_ => []
@@ -319,6 +322,7 @@ resource ResEng = ParamX ** open Prelude in {
insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> { insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> {
s = vp.s ; s = vp.s ;
prp = vp.prp ; prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ; inf = vp.inf ;
ad = vp.ad ; ad = vp.ad ;
s2 = \\a => vp.s2 ! a ++ obj ! a s2 = \\a => vp.s2 ! a ++ obj ! a
@@ -327,6 +331,7 @@ resource ResEng = ParamX ** open Prelude in {
insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> { insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> {
s = vp.s ; s = vp.s ;
prp = vp.prp ; prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ; inf = vp.inf ;
ad = vp.ad ; ad = vp.ad ;
s2 = \\a => obj ! a ++ vp.s2 ! a s2 = \\a => obj ! a ++ vp.s2 ! a
@@ -340,6 +345,7 @@ resource ResEng = ParamX ** open Prelude in {
insertAdV : Str -> VP -> VP = \ad,vp -> { insertAdV : Str -> VP -> VP = \ad,vp -> {
s = vp.s ; s = vp.s ;
prp = vp.prp ; prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ; inf = vp.inf ;
ad = vp.ad ++ ad ; ad = vp.ad ++ ad ;
s2 = \\a => vp.s2 ! a s2 = \\a => vp.s2 ! a