From 759d648de9972072057fada49ede2281e772be30 Mon Sep 17 00:00:00 2001
From: bjorn <bjorn@bringert.net>
Date: Mon, 3 Nov 2008 12:28:40 +0000
Subject: [PATCH] ParseEng: StrandRelSlash as variant of RelSlash.

---
 next-lib/src/parsing/ParseEng.gf | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/next-lib/src/parsing/ParseEng.gf b/next-lib/src/parsing/ParseEng.gf
index e16a790d0..889aa0dc2 100644
--- a/next-lib/src/parsing/ParseEng.gf
+++ b/next-lib/src/parsing/ParseEng.gf
@@ -8,7 +8,7 @@ concrete ParseEng of ParseEngAbs =
   NumeralEng,
   SentenceEng - [UseCl, UseQCl, UseRCl],
   QuestionEng,
-  RelativeEng - [IdRP],
+  RelativeEng - [IdRP, RelSlash],
   ConjunctionEng,
   PhraseEng - [UttImpSg, UttImpPl],
   TextX,
@@ -16,9 +16,9 @@ concrete ParseEng of ParseEngAbs =
   IdiomEng,
 
   ExtraEng - [
-   -- Don't include the uncontracted clauses. Instead
-   -- use them as variants of the contracted ones.
-   UncNegCl, UncNegQCl, UncNegRCl, UncNegImpSg, UncNegImpPl
+   UncNegCl, UncNegQCl, UncNegRCl, UncNegImpSg, UncNegImpPl,
+   StrandRelSlash,
+   that_RP
   ],
 
   LexiconEng [N3, distance_N3, 
@@ -72,6 +72,15 @@ lin UttImpPl p i =
 	Neg => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
       } ;
 
+-- Two different forms of relative clauses:
+-- Pied piping: "at which we are looking". 
+-- Stranding: "that he looks at"
+-- EmptyRelSlash is not used here, since it would give 
+-- a meta-variable for the RP.
+
+lin RelSlash rp slash = variants { RelativeEng.RelSlash rp slash; StrandRelSlash rp slash } ;
+
+
 -- Allow both "who"/"which" and "that"
 -- FIXME: allow both "who" and "which" for all genders
 lin IdRP = variants { RelativeEng.IdRP; that_RP } ;