mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-06 17:52:51 -06:00
restest completed, English ready in exper
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
--# -path=.:../abstract:../common:prelude
|
||||
--# -path=.:abstract:../common:prelude
|
||||
|
||||
concrete English of EnglishAbs =
|
||||
LangEng,
|
||||
|
||||
@@ -6,7 +6,8 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
|
||||
ComplBareVS v s = insertObj (\\_ => s.s) (predV v) ;
|
||||
|
||||
StrandRelSlash rp slash = {
|
||||
s = \\t,a,p,_ => rp.s ! RC Acc ++ slash.s ! t ! a ! p ! ODir ++ slash.c2 ;
|
||||
s = \\t,a,p,ag =>
|
||||
rp.s ! RC (fromAgr ag).g Acc ++ slash.s ! t ! a ! p ! ODir ++ slash.c2 ;
|
||||
c = Acc
|
||||
} ;
|
||||
EmptyRelSlash rp slash = {
|
||||
@@ -43,7 +44,7 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
|
||||
UncNegImpSg imp = {s = imp.s ! neg ! ImpF Sg False} ;
|
||||
UncNegImpPl imp = {s = imp.s ! neg ! ImpF Pl False} ;
|
||||
|
||||
CompoundCN a b = {s = \\n,c => a.s ! Sg ! Nom ++ b.s ! n ! c} ;
|
||||
CompoundCN a b = {s = \\n,c => a.s ! Sg ! Nom ++ b.s ! n ! c ; g = b.g} ;
|
||||
|
||||
|
||||
oper
|
||||
|
||||
@@ -41,7 +41,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
|
||||
|
||||
PassV2 v = insertObj (\\_ => v.s ! VPPart) (predAux auxBe) ;
|
||||
|
||||
UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; isRefl = vv.isRefl} ; -- no "to"
|
||||
---b UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; isRefl = vv.isRefl} ; -- no "to"
|
||||
|
||||
CompAP ap = ap ;
|
||||
CompNP np = {s = \\_ => np.s ! Acc} ;
|
||||
|
||||
Reference in New Issue
Block a user