Added Pol argument to ExtraEng.Unc* to give them the same signatures as the standard (contracted) versions. This makes it easier to use Unc* as a variant without getting meta-variables when parsing,

1 files changed, 5 insertions, 7 deletions

diff --git a/next-lib/src/parsing/ParseEng.gf b/next-lib/src/parsing/ParseEng.gf
index d0c0f47ff..f892957f6 100644
--- a/next-lib/src/parsing/ParseEng.gf
+++ b/next-lib/src/parsing/ParseEng.gf
@@ -38,33 +38,31 @@ lin ComplVS v s = variants { VerbEng.ComplVS v s; insertObj (\\_ => s.s) (predV
 lin UseCl t p cl = 
       case p.p of {
 	Pos => SentenceEng.UseCl t p cl;
-	Neg => variants { SentenceEng.UseCl t p cl; { s = p.s ++ (UncNegCl t cl).s } }
+	Neg => variants { SentenceEng.UseCl t p cl; UncNegCl t p cl }
       } ;
 
 lin UseQCl t p cl = 
       case p.p of {
 	Pos => SentenceEng.UseQCl t p cl;
-	Neg => variants { SentenceEng.UseQCl t p cl; { s = \\qf => p.s ++ (UncNegQCl t cl).s!qf } }
+	Neg => variants { SentenceEng.UseQCl t p cl; UncNegQCl t p cl }
       } ;
 
 lin UseRCl t p cl = 
       case p.p of {
 	Pos => SentenceEng.UseRCl t p cl;
-	Neg => variants { SentenceEng.UseRCl t p cl; 
-                          let s = UncNegRCl t cl
-			   in { s = \\agr => p.s ++ s.s!agr; c = s.c } }
+	Neg => variants { SentenceEng.UseRCl t p cl; UncNegRCl t p cl }
       } ;
 
 lin UttImpSg p i = 
       case p.p of {
 	Pos => PhraseEng.UttImpSg p i;
-	Neg => variants { PhraseEng.UttImpSg p i ; { s = p.s ++ (UncNegImpSg i).s } }
+	Neg => variants { PhraseEng.UttImpSg p i ; UncNegImpSg p i }
       } ;
 
 lin UttImpPl p i = 
       case p.p of {
 	Pos => PhraseEng.UttImpPl p i;
-	Neg => variants { PhraseEng.UttImpPl p i ; { s = p.s ++ (UncNegImpPl i).s } }
+	Neg => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
       } ;
 
 -- Allow both "who"/"which" and "that"