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

a bunch of new things in DictEng and ParseEng a simple fix for the VPI category in ExtraEng

Browse Source
This commit is contained in:
kr.angelov
2012-05-21 15:06:41 +00:00
parent bd8046f23d
commit 3549db552e
5 changed files with 119 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,21 +31,23 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
};
lincat
VPI = {s : VPIForm => Agr => Str} ;
[VPI] = {s1,s2 : VPIForm => Agr => Str} ;
VPI = {s : VVType => Agr => Str} ;
[VPI] = {s1,s2 : VVType => Agr => Str} ;
lin
BaseVPI = twoTable2 VPIForm Agr ;
ConsVPI = consrTable2 VPIForm Agr comma ;
BaseVPI = twoTable2 VVType Agr ;
ConsVPI = consrTable2 VVType Agr comma ;
MkVPI vp = {
s = \\v,a => vp.ad ++ vp.inf ++ vp.s2 ! a
s = table {
VVAux => \\a => vp.ad ++ vp.inf ++ vp.s2 ! a;
VVInf => \\a => "to" ++ vp.ad ++ vp.inf ++ vp.s2 ! a;
VVPresPart => \\a => vp.ad ++ vp.prp ++ vp.s2 ! a
}
} ;
ConjVPI = conjunctDistrTable2 VPIForm Agr ;
ConjVPI = conjunctDistrTable2 VVType Agr ;
ComplVPIVV vv vpi =
---- insertObj (\\a => infVP vv.typ vpi a) (predVV vv) ;
let isAux = case vv.typ of {VVAux => True ; _ => False} in
insertObj (\\a => (if_then_Str isAux [] "to") ++ vpi.s ! VPIInf ! a) (predVV vv) ;
insertObj (\\a => vpi.s ! vv.typ ! a) (predVV vv) ;
lin
that_RP =
@@ -64,9 +66,6 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
-- for VP conjunction
param
VPIForm = VPIInf | VPIPPart ;
lincat
VPS = {s : Agr => Str} ;
[VPS] = {s1,s2 : Agr => Str} ;