improved performance of ParadigmsFin; merged Param with Res

lib/resource-1.0/german/ResGer.gf

@@ -9,10 +9,136 @@
 -- implement $Test$, it moreover contains some lexical
 -- patterns needed for $Lex$.
 
-resource ResGer = ParamGer ** open Prelude in {
+resource ResGer = ParamX ** open Prelude in {
 
   flags optimize=all ;
 
+--2 For $Noun$
+
+-- These are the standard four-value case and three-value gender.
+
+  param
+    Case = Nom | Acc | Dat | Gen ;
+    Gender = Masc | Fem | Neutr ;
+
+-- Complex $CN$s, like adjectives, have strong and weak forms.
+
+    Adjf = Strong | Weak ;
+
+-- Gender distinctions are only made in the singular. 
+
+    GenNum = GSg Gender | GPl ;
+
+-- Agreement of $NP$ is a record.
+
+  oper Agr = {n : Number ; p : Person} ;
+
+-- Pronouns are the worst-case noun phrases, which have both case
+-- and possessive forms.
+
+  param NPForm = NPCase Case | NPPoss GenNum Case ;
+
+--2 For $Adjective$
+
+-- The predicative form of adjectives is not inflected further.
+
+  param AForm = APred | AMod GenNum Case ;  
+
+
+--2 For $Verb$
+
+  param VForm = 
+     VInf 
+   | VPresInd  Number Person
+   | VPresSubj Number Person
+   | VImper    Number
+   | VImpfInd  Number Person 
+   | VImpfSubj Number Person 
+   | VPresPart AForm 
+   | VPastPart AForm ;
+
+  param VPForm =
+     VPFinite Tense Anteriority
+   | VPImperat
+   | VPInfinit Anteriority ;
+
+  param VAux = VHaben | VSein ;
+
+  param VType = VAct | VRefl Case ;
+
+-- The order of sentence is depends on whether it is used as a main
+-- clause, inverted, or subordinate.
+
+  param  
+    Order = Main | Inv | Sub ;
+
+
+--2 For $Relative$
+ 
+    RAgr = RNoAg | RAg {n : Number ; p : Person} ;
+
+--2 For $Numeral$
+
+    CardOrd = NCard | NOrd AForm ;
+    DForm = DUnit  | DTeen  | DTen ;
+
+--2 Transformations between parameter types
+
+  oper
+    agrP3 : Number -> Agr = \n -> 
+      {n = n ; p = P3} ;
+
+    gennum : Gender -> Number -> GenNum = \g,n ->
+      case n of {
+        Sg => GSg g ;
+        Pl => GPl
+        } ;
+
+-- Needed in $RelativeGer$.
+
+    numGenNum : GenNum -> Number = \gn -> 
+      case gn of {
+        GSg _ => Sg ;
+        GPl   => Pl
+        } ;
+
+-- Used in $NounGer$.
+
+    agrAdj : Gender -> Adjf -> Number -> Case -> AForm = \g,a,n,c ->
+      let
+        gn = gennum g n ;
+        e  = AMod (GSg Fem) Nom ;
+        en = AMod (GSg Masc) Acc ;
+      in
+      case a of {
+        Strong => AMod gn c ;
+        _ => case <gn,c> of {
+          <GSg _,   Nom> => e ;
+          <GSg Masc,Acc> => en ;
+          <GSg _,   Acc> => e ;
+          _              => en 
+        }
+      } ;
+
+-- This is used twice in NounGer.
+
+    adjfCase : Adjf -> Case -> Adjf = \a,c -> case <a,c> of {
+         <Strong, Nom|Acc> => Strong ;
+         _ => Weak
+         } ;      
+
+    vFin : Tense -> Agr -> VForm = \t,a ->
+      case t of {
+        Pres => VPresInd  a.n a.p ;
+        Past => VImpfInd  a.n a.p ;
+        _ => VInf --- never used
+        } ;
+
+    conjAgr : Agr -> Agr -> Agr = \a,b -> {
+      n = conjNumber a.n b.n ;
+      p = conjPerson a.p b.p
+      } ;
+
 -- For $Lex$.
 
 -- For conciseness and abstraction, we first define a method for