Added case parameter for stand-alone forms of determiners. I had to move mkPron from ResEng to MorphoEng, and mkQuant from StructuralEng to MorphoEng. I also removed the unused mkPronoun stuff from MorphoEng.

1 files changed, 4 insertions, 10 deletions

diff --git a/next-lib/src/english/ResEng.gf b/next-lib/src/english/ResEng.gf
index b3f5f2071..f867d9197 100644
--- a/next-lib/src/english/ResEng.gf
+++ b/next-lib/src/english/ResEng.gf
@@ -148,21 +148,15 @@ resource ResEng = ParamX ** open Prelude in {
         n = n
         } ;
 
-    mkPron : (i,me,my,mine : Str) -> Number -> Person -> Gender -> 
-     {s : Case => Str ; sp : Str ; a : Agr} =
-     \i,me,my,mine,n,p,g -> {
-     s = table {
+    mkNP : (i,me,my : Str) -> Number -> Person -> Gender -> 
+     {s : Case => Str ; a : Agr} = \i,me,my,n,p,g -> 
+   { s = table {
        Nom => i ;
        Acc => me ;
        Gen => my
        } ;
      a = toAgr n p g ;
-     sp = mine
-     } ;
-
-    mkNP : (i,me,my : Str) -> Number -> Person -> Gender -> 
-     {s : Case => Str ; a : Agr} =
-     \i,me,my,n,p,g -> mkPron i me my me n p g ;
+   };
 
 -- These functions cover many cases; full coverage inflectional patterns are
 -- in $MorphoEng$.