tidy up res; bug fix in ShellState.addTransfer

2005-12-05 16:14:12 +00:00
parent 3442d42d3b
commit 18986bfdd4
17 changed files with 164 additions and 268 deletions
--- a/lib/resource-1.0/english/RelativeEng.gf
+++ b/lib/resource-1.0/english/RelativeEng.gf
@@ -15,11 +15,9 @@ concrete RelativeEng of Relative = CatEng ** open ResEng in {
            RNoAg => ag ;
            RAg a => a
            } ;
-          verb  = vp.s ! t ! ant ! b ! ODir ! agr ;
-          subj  = rp.s ! Nom ;
-          compl = vp.s2 ! agr
+          cl = mkS (rp.s ! Nom) agr vp.s vp.s2
        in
-        subj ++ verb.fin ++ verb.inf ++ compl
+        cl.s ! t ! ant ! b ! ODir
      } ;

    RelSlash rp slash = {