Merge branch 'GrammaticalFramework:master' into master

This commit is contained in:
Meowyam
2023-05-26 14:58:37 +08:00
committed by GitHub
33 changed files with 92124 additions and 92041 deletions

View File

@@ -3,7 +3,7 @@
concrete ExtendMay of Extend = CatMay
** ExtendFunctor - [
VPS -- finite VP's with tense and polarity
, ListVPS
, ListVPS, BaseVPS, ConsVPS, ConjVPS
, VPI, MkVPI, ComplVPIVV
, ListVPI -- infinitive VP's (TODO: with anteriority and polarity)
, MkVPS
@@ -18,6 +18,7 @@ concrete ExtendMay of Extend = CatMay
,GenModNP, GenNP, GenRP
,CompoundN
,GerundNP, GerundAdv
,ByVP
-- VPS2 ; -- have loved (binary version of VPS)
@@ -38,11 +39,11 @@ concrete ExtendMay of Extend = CatMay
} ;
-- BaseVPS : VPS -> VPS -> ListVPS ;
BaseVPS vps vps2 = twoSS vps vps2 ;
BaseVPS = twoSS ;
-- ConsVPS : VPS -> ListVPS -> ListVPS ;
ConsVPS str listvps vps = consSS "," listvps vps ;
ConsVPS = consrSS ",";
-- ConjVPS : Conj -> [VPS] -> VPS ; -- has walked and won't sleep
ConjVPS conj listvps = conjunctX conj listvps ;
ConjVPS = conjunctDistrSS ;
-- PredVPS : NP -> VPS -> S ; -- she [has walked and won't sleep]
PredVPS np vps = {
s = np.s ! Bare ++ vps.s ;
@@ -99,6 +100,7 @@ concrete ExtendMay of Extend = CatMay
GerundAdv vp = ss (linVP vp) ;
ByVP vp = cc2 by8means_Prep (GerundAdv vp) ;
-- PassVPSlash : VPS -> VP ;
-- be begged to sleep