diff options
| author | bjorn <bjorn@bringert.net> | 2008-10-29 13:27:04 +0000 |
|---|---|---|
| committer | bjorn <bjorn@bringert.net> | 2008-10-29 13:27:04 +0000 |
| commit | 856d401337699e70588f79f01351208c2f7239a0 (patch) | |
| tree | 4d3893e801625ff252ffa11387a16abfdec58e7c /next-lib | |
| parent | 03fb2af472e376aedadc4e8e386df24491c5d547 (diff) | |
Changed UncNegX in ExtraEng to take a Temp rather than Tense and Ant arguments.
Diffstat (limited to 'next-lib')
| -rw-r--r-- | next-lib/src/english/ExtraEng.gf | 8 | ||||
| -rw-r--r-- | next-lib/src/english/ExtraEngAbs.gf | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/next-lib/src/english/ExtraEng.gf b/next-lib/src/english/ExtraEng.gf index fa836cda4..99bdd57eb 100644 --- a/next-lib/src/english/ExtraEng.gf +++ b/next-lib/src/english/ExtraEng.gf @@ -35,10 +35,10 @@ concrete ExtraEng of ExtraEngAbs = CatEng ** ComplVPIVV vv vpi = insertObj (\\a => (if_then_Str vv.isAux [] "to") ++ vpi.s ! VPIInf ! a) (predVV vv) ; - UncNegCl t a cl = {s = t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg ! ODir} ; - UncNegQCl t a cl = {s = \\q => t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg !q} ; - UncNegRCl t a cl = { - s = \\r => t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg ! r ; + UncNegCl t cl = {s = t.s ++ cl.s ! t.t ! t.a ! neg ! ODir} ; + UncNegQCl t cl = {s = \\q => t.s ++ cl.s ! t.t ! t.a ! neg !q} ; + UncNegRCl t cl = { + s = \\r => t.s ++ cl.s ! t.t ! t.a ! neg ! r ; c = cl.c } ; UncNegImpSg imp = {s = imp.s ! neg ! ImpF Sg False} ; diff --git a/next-lib/src/english/ExtraEngAbs.gf b/next-lib/src/english/ExtraEngAbs.gf index 9ee849627..f71b7080d 100644 --- a/next-lib/src/english/ExtraEngAbs.gf +++ b/next-lib/src/english/ExtraEngAbs.gf @@ -2,9 +2,9 @@ abstract ExtraEngAbs = Extra ** { -- uncontracted negations; contracted are the default fun - UncNegCl : Tense -> Ant -> Cl -> S ; - UncNegQCl : Tense -> Ant -> QCl -> QS ; - UncNegRCl : Tense -> Ant -> RCl -> RS ; + UncNegCl : Temp -> Cl -> S ; + UncNegQCl : Temp -> QCl -> QS ; + UncNegRCl : Temp -> RCl -> RS ; UncNegImpSg : Imp -> Utt; -- do not help yourself UncNegImpPl : Imp -> Utt; -- do not help yourselves |