(Eng) Undo the change in FunRP from #381

2022-01-19 14:51:49 +08:00
parent eb7b74578f
commit 5a5adef0db
4 changed files with 6 additions and 21 deletions
@@ -32,16 +32,10 @@ concrete RelativeEng of Relative = CatEng ** open ResEng, Prelude in {
      c = NPAcc
      } ;

-    -- John , whose every friend is right
+    -- a number, [the square of which] is 4
+    -- For a construction like "John , [whose every friend] is right", use Extend.GenRP
    FunRP p np rp = {
-      s = \\c =>
-        let npGender : Gender = (fromAgr np.a).g in
-        case p.isPoss of {
-          True  => rp.s ! RC npGender NPNomPoss ++  -- whose
-                   p.empty ++                       -- empty string to avoid metavariables
-                   np.s ! NCase Nom ;               -- NP in nom: "whose every friend"
-          False => np.s ! NPAcc ++ p.s ++ rp.s ! RPrep npGender
-          } ;
+      s = \\c => np.s ! NPAcc ++ p.s ++ rp.s ! RPrep (fromAgr np.a).g ;
      a = RAg np.a
      } ;