improved performance of ParadigmsFin; merged Param with Res

lib/resource-1.0/english/ResEng.gf

@@ -7,11 +7,63 @@
 -- implement $Test$, it moreover contains regular lexical
 -- patterns needed for $Lex$.
 
-resource ResEng = ParamEng ** open Prelude in {
+resource ResEng = ParamX ** open Prelude in {
 
   flags optimize=all ;
 
+
+-- Some parameters, such as $Number$, are inherited from $ParamX$.
+
+--2 For $Noun$
+
+-- This is the worst-case $Case$ needed for pronouns.
+
+  param
+    Case = Nom | Acc | Gen ;
+
+-- Agreement of $NP$ is a record. We'll add $Gender$ later.
+
   oper
+    Agr = {n : Number ; p : Person} ;
+
+  param 
+    Gender = Neutr | Masc | Fem ;
+
+--2 For $Verb$
+
+-- Only these five forms are needed for open-lexicon verbs.
+
+  param
+    VForm = VInf | VPres | VPast | VPPart | VPresPart ;
+
+-- The order of sentence is needed already in $VP$.
+
+    Order = ODir | OQuest ;
+
+
+--2 For $Adjective$
+
+    AForm = AAdj Degree | AAdv ;
+
+--2 For $Relative$
+ 
+    RAgr = RNoAg | RAg {n : Number ; p : Person} ;
+
+--2 For $Numeral$
+
+    CardOrd = NCard | NOrd ;
+    DForm = unit | teen | ten  ;
+
+--2 Transformations between parameter types
+
+  oper
+    agrP3 : Number -> Agr = \n -> 
+      {n = n ; p = P3} ;
+
+    conjAgr : Agr -> Agr -> Agr = \a,b -> {
+      n = conjNumber a.n b.n ;
+      p = conjPerson a.p b.p
+      } ;
 
 -- For $Lex$.