GitHub/gf-rgl
1
0 Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-10-31 19:03:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed that-less variants of ComplVS and SlashV2S from VerbEng, and added constructors ComplBareVS and SlashBareV2S to Extra, so that the library user can control the presence of "that".

Browse Source
This commit is contained in:
aarne committed 2013-10-18 08:45:56 +00:00
1 parent eba599f2f1
commit 635252bb1f
6 files changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/english/ExtraEng.gf
+8
View File
@@ -176,6 +176,14 @@ lin
PurposeVP vp = {s = infVP VVInf vp Simul CPos (agrP3 Sg)} ; --- agr
ComplBareVS v s = insertObj (\\_ => s.s) (predV v) ;
SlashBareV2S v s = insertObjc (\\_ => s.s) (predVc v) ;
------------
--- obsolete: use UncNeg : Pol
src/english/ParseEng.gf
+1 -1
View File
@@ -18,7 +18,7 @@ concrete ParseEng of ParseEngAbs =
Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,
ComplSlashPartLast,
ClSlash, RCl, EmptyRelSlash],
ClSlash, RCl, EmptyRelSlash, VS, V2S, ComplBareVS, SlashBareV2S],
DictEng **
open MorphoEng, ResEng, ParadigmsEng, Prelude in {
src/english/ParseEngAbs.gf
+1 -1
View File
@@ -16,7 +16,7 @@ abstract ParseEngAbs =
ExtraEngAbs [NP, Quant, VPSlash, VP, GenNP, PassVPSlash,
Temp, Tense, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
VPI, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, ComplSlashPartLast,
ClSlash, RCl, EmptyRelSlash],
ClSlash, RCl, EmptyRelSlash, VS, V2S, ComplBareVS, SlashBareV2S],
DictEngAbs ** {
flags
src/english/VerbEng.gf
+4 -2
View File
@@ -12,12 +12,14 @@ concrete VerbEng of Verb = CatEng ** open ResEng, Prelude in {
insertObjc (\\_ => v.c3 ++ np.s ! NPAcc) (predVc v) ; ----
ComplVV v vp = insertObj (\\a => infVP v.typ vp Simul CPos a) (predVV v) ;
ComplVS v s = insertObj (variants {\\_ => conjThat ++ s.s; \\_ => s.s}) (predV v) ;
ComplVS v s = insertObj (\\_ => conjThat ++ s.s) (predV v) ;
--- ComplVS v s = insertObj (variants {\\_ => conjThat ++ s.s; \\_ => s.s}) (predV v) ;
ComplVQ v q = insertObj (\\_ => q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObj (ap.s) (predV v) ;
SlashV2V v vp = insertObjc (\\a => v.c3 ++ infVP v.typ vp Simul CPos a) (predVc v) ;
SlashV2S v s = insertObjc (variants {\\_ => conjThat ++ s.s; \\_ => s.s}) (predVc v) ;
SlashV2S v s = insertObjc (\\_ => conjThat ++ s.s) (predVc v) ;
--- SlashV2S v s = insertObjc (variants {\\_ => conjThat ++ s.s; \\_ => s.s}) (predVc v) ;
SlashV2Q v q = insertObjc (\\_ => q.s ! QIndir) (predVc v) ;
SlashV2A v ap = insertObjc (\\a => ap.s ! a) (predVc v) ; ----