Simplified ResGer

lib/resource-1.0/german/LexGer.gf

@@ -3,14 +3,33 @@ concrete LexGer of Lex = CatGer ** open ResGer, Prelude in {
   flags optimize = values ;
 
   lin
-    walk_V  = mkV "gehen" "geht" "geh" "ging" "ginge" "gegangen" VSein ;
+    walk_V = 
-    help_V2 = mkV "helfen" "hilft" "hilf" "half" "hälfe" "geholfen" VHaben ** 
+      mkV 
-              {c2 = {s = [] ; c = Dat}} ;
+        "gehen" "gehe" "gehst" "geht" "geht" "geh" 
-    show_V3 = regV "zeigen" ** 
+        "ging" "gingst" "gingt" "gingen"
-              {c2 = {s = [] ; c = Acc} ; c3 = {s = [] ; c = Dat}} ;
+        "ginge" "gegangen" VSein ;
-    want_VV = auxVV wollen_V ;
+    help_V2 = 
-    claim_VS = no_geV (regV "behaupten") ;
+      mkV 
-    ask_VQ = regV "fragen" ;
+        "helfen" "helfe" "hilfst" "hilft" "helft" "hilf" 
+        "half" "halfst" "halft" "halfen" 
+        "hälfe" "geholfen" VHaben ** 
+      {c2 = {s = [] ; c = Dat}} ;
+    show_V3 = 
+      regV "zeigen" ** 
+      {c2 = {s = [] ; c = Acc} ; c3 = {s = [] ; c = Dat}} ;
+    want_VV = auxVV 
+      (mkV 
+        "wollen" "will" "willst" "will" "wollt" "woll" 
+        "wollte" "wolltest" "wollten" "wolltet"
+        "wollte" "gewollen" 
+        VHaben) ;
+    claim_VS = 
+      mkV
+        "behaupten" "behaupte" "bahauptest" "behauptet" "behauptet" "behaupte"
+        "behauptete" "behauptetest" "behauptetet" "behaupteten"
+        "behauptete" "behauptet" VHaben ;
+    ask_VQ = 
+      regV "fragen" ;
 
     dog_N  = mkN4 "Hund" "Hundes" "Hünde" "Hünden" Masc ;
     son_N2 = mkN4 "Sohn" "Sohnes" "Söhne" "Söhnen" Masc ** 
@@ -19,7 +38,7 @@ concrete LexGer of Lex = CatGer ** open ResGer, Prelude in {
              {c2 = {s = "von" ; c = Dat} ; c3 = {s = "nach" ; c = Dat}} ;
 
     warm_A = mkA "warm" "warm" "wärmer" "wärmst" ;
-    close_A2 = regA "eng" ** {c2 = {s = "zu" ; c = Dat}} ;
+    close_A2 = regA "eng" ** {c2 = {s = "bei" ; c = Dat}} ;
 
     here_Adv = {s = "hier"} ;
     very_AdA = {s = "sehr"} ;

lib/resource-1.0/german/MorphoGer.gf

@@ -17,6 +17,108 @@
 ---- To regulate the use of endings for both nouns, adjectives, and verbs:
 --
 --oper
+
+  mkV : (x1,_,_,_,_,x6 : Str) -> VAux -> Verb = 
+    \geben,gibt,gib,gab,gaebe,gegeben,aux -> 
+    let
+      ifSibilant : Str -> Str -> Str -> Str = \u,b1,b2 -> 
+        case u of {
+          "s" | "x" | "z" | "ß" => b1 ;
+          _   => b2 
+          } ; 
+      en = Predef.dp 2 geben ;
+      geb = case Predef.tk 1 en of {
+        "e" => Predef.tk 2 geben ;
+         _  => Predef.tk 1 geben
+         } ;
+      gebt = addE geb + "t" ;
+      gebte = ifTok Tok (Predef.dp 1 gab) "e" gab (gab + "e") ;
+      gibst = ifSibilant (Predef.dp 1 gib) (gib + "t") (gib + "st") ;
+      gegebener = (regA gegeben).s ! Posit ;
+      gabe = addE gab ;
+      gibe = ifTok Str (Predef.dp 2 gib) "ig" "e" [] ++ addE gib
+    in {s = table {
+
+       VInf       => geben ;
+
+       VPresInd Sg P1 => geb + "e" ;
+       VPresInd Sg P2 => gibst ;
+       VPresInd Sg P3 => gibt ;
+       VPresInd Pl P2 => gebt ;
+       VPresInd Pl _  => geben ; -- the famous law
+
+       VImper Sg    => gibe ;
+       VImper Pl    => gebt ;
+
+       VPresSubj Sg P2 => geb + "est" ;
+       VPresSubj Sg _  => geb + "e" ;
+       VPresSubj Pl P2 => geb + "et" ;
+       VPresSubj Pl _  => geben ;
+
+       VPresPart a => (regA (geben + "d")).s ! Posit ! a ;
+
+       VImpfInd Sg P2 => gabe + "st" ;
+       VImpfInd Sg _  => gab ;
+       VImpfInd Pl P2 => gabe + "t" ;
+       VImpfInd Pl _  => gebte + "n" ;
+
+       VImpfSubj Sg P2 => gaebe + "st" ;
+       VImpfSubj Sg _  => gaebe ;
+       VImpfSubj Pl P2 => gaebe + "t" ;
+       VImpfSubj Pl _  => gaebe + "n" ;
+
+       VPastPart a    => gegebener ! a
+       } ;
+     aux = aux
+     } ;
+ 
+-- This function decides whether to add an "e" to the stem before "t".
+-- Examples: "töten - tötet", "kehren - kehrt", "lernen - lernt", "atmen - atmet".
+
+  addE : Str -> Str = \stem ->
+    let
+      r = init (Predef.dp 2 stem) ;
+      n = last stem ;
+      e = case n of {
+        "t" | "d" => "e" ;
+        "e" | "h" => [] ;
+        _ => case r of {
+          "l" | "r" | "a" | "o" | "u" | "e" | "i" | "ü" | "ä" | "ö"|"h" => [] ;
+          _ => "e" 
+          }
+        }
+    in 
+      stem + e ;
+
+  weakV : Str -> Verb = \legen ->
+    let 
+       leg = case Predef.dp 2 legen of {
+         "en" => Predef.tk 2 legen ;
+         _  => Predef.tk 1 legen
+         } ;
+       lege = addE leg ;
+       legte = lege + "te"
+    in
+       mkV legen (lege+"t") leg legte legte ("ge"+lege+"t") VHaben ;
+
+-- To eliminate the past participle prefix "ge".
+
+  no_geV : Verb -> Verb = \verb -> {
+    s = table {
+      VPastPart a => Predef.drop 2 (verb.s ! VPastPart a) ;
+      v => verb.s ! v
+      } ;
+    aux = verb.aux
+    } ;
+
+-- To change the default auxiliary "haben" to "sein".
+
+  seinV : Verb -> Verb = \verb -> {
+    s = verb.s ;
+    aux = VSein
+    } ;
+
+
 --  y2ie : Str -> Str -> Str = \fly,s -> 
 --    let y = last (init fly) in
 --    case y of {

lib/resource-1.0/german/ResGer.gf

@@ -6,9 +6,8 @@
 --
 -- This module contains operations that are needed to make the
 -- resource syntax work. To define everything that is needed to
--- implement $Test$, it moreover contains regular lexical
+-- implement $Test$, it moreover contains some lexical
 -- patterns needed for $Lex$.
---
 
 resource ResGer = ParamGer ** open Prelude in {
 
@@ -59,112 +58,62 @@ resource ResGer = ParamGer ** open Prelude in {
        }
     } ;
 
--- This auxiliary gives the forms in each degree. 
+-- Verbs need as many as 12 forms, to cover the variations with
-
+-- suffixes "t" and "st". Auxiliaries like "sein" will have to
-  adjForms : (x1,x2 : Str) -> AForm => Str = \teuer,teur ->
+-- make extra cases even for this.
-   table {
-    APred => teuer ;
-    AMod Strong (GSg Masc) c => 
-      caselist (teur+"er") (teur+"en") (teur+"em") (teur+"es") ! c ;
-    AMod Strong (GSg Fem) c => 
-      caselist (teur+"e") (teur+"e") (teur+"er") (teur+"er") ! c ;
-    AMod Strong (GSg Neut) c => 
-      caselist (teur+"es") (teur+"es") (teur+"em") (teur+"es") ! c ;
-    AMod Strong GPl c => 
-      caselist (teur+"e") (teur+"e") (teur+"en") (teur+"er") ! c ;
-    AMod Weak (GSg g) c => case <g,c> of {
-      <_,Nom>    => teur+"e" ;
-      <Masc,Acc> => teur+"en" ;
-      <_,Acc>    => teur+"e" ;
-      _          => teur+"en" } ;
-    AMod Weak GPl c => teur+"en"
-    } ;
-
--- This is used e.g. when forming determiners.
-
-  appAdj : Adjective -> Number => Gender => Case => Str = \adj ->
-    let
-      ad : GenNum -> Case -> Str = \gn,c -> 
-        adj.s ! Posit ! AMod Strong gn c
-    in
-    \\n,g,c => case n of {
-       Sg => ad (GSg g) c ;
-       _  => ad GPl c
-     } ;
 
   Verb : Type = {s : VForm => Str ; aux : VAux} ;
 
-  mkV : (x1,_,_,_,_,x6 : Str) -> VAux -> Verb = 
+  mkV : (x1,_,_,_,_,_,_,_,_,_,_,x12 : Str) -> VAux -> Verb = 
-    \geben,gibt,gib,gab,gaebe,gegeben,aux -> 
+    \geben,gebe,gibst,gibt,gebt,gib,gab,gabst,gaben,gabt,gaebe,gegeben,aux -> 
-    let
+    {s = table {
-      ifSibilant : Str -> Str -> Str -> Str = \u,b1,b2 -> 
+       VInf            => geben ;
-        case u of {
+       VPresInd Sg P1  => gebe ;
-          "s" | "x" | "z" | "ß" => b1 ;
+       VPresInd Sg P2  => gibst ;
-          _   => b2 
+       VPresInd Sg P3  => gibt ;
-          } ; 
+       VPresInd Pl P2  => gebt ;
-      en = Predef.dp 2 geben ;
+       VPresInd Pl _   => geben ;
-      geb = case Predef.tk 1 en of {
+       VImper Sg       => gib ;
-        "e" => Predef.tk 2 geben ;
+       VImper Pl       => gebt ;
-         _  => Predef.tk 1 geben
+       VPresSubj Sg P2 => init geben + "st" ;
-         } ;
+       VPresSubj Sg _  => init geben ;
-      gebt = addE geb + "t" ;
+       VPresSubj Pl P2 => init geben + "t" ;
-      gebte = ifTok Tok (Predef.dp 1 gab) "e" gab (gab + "e") ;
-      gibst = ifSibilant (Predef.dp 1 gib) (gib + "t") (gib + "st") ;
-      gegebener = (regA gegeben).s ! Posit ;
-      gabe = addE gab ;
-      gibe = ifTok Str (Predef.dp 2 gib) "ig" "e" [] ++ addE gib
-    in {s = table {
-
-       VInf       => geben ;
-
-       VPresInd Sg P1 => geb + "e" ;
-       VPresInd Sg P2 => gibst ;
-       VPresInd Sg P3 => gibt ;
-       VPresInd Pl P2 => gebt ;
-       VPresInd Pl _  => geben ; -- the famous law
-
-       VImper Sg    => gibe ;
-       VImper Pl    => gebt ;
-
-       VPresSubj Sg P2 => geb + "est" ;
-       VPresSubj Sg _  => geb + "e" ;
-       VPresSubj Pl P2 => geb + "et" ;
        VPresSubj Pl _  => geben ;
-
+       VPresPart a     => (regA (geben + "d")).s ! Posit ! a ;
-       VPresPart a => (regA (geben + "d")).s ! Posit ! a ;
+       VImpfInd Sg P2  => gabst ;
-
+       VImpfInd Sg _   => gab ;
-       VImpfInd Sg P2 => gabe + "st" ;
+       VImpfInd Pl P2  => gabt ;
-       VImpfInd Sg _  => gab ;
+       VImpfInd Pl _   => gaben ;
-       VImpfInd Pl P2 => gabe + "t" ;
-       VImpfInd Pl _  => gebte + "n" ;
-
        VImpfSubj Sg P2 => gaebe + "st" ;
        VImpfSubj Sg _  => gaebe ;
        VImpfSubj Pl P2 => gaebe + "t" ;
        VImpfSubj Pl _  => gaebe + "n" ;
-
+       VPastPart a     => (regA gegeben).s ! Posit ! a
-       VPastPart a    => gegebener ! a
        } ;
      aux = aux
      } ;
- 
--- This function decides whether to add an "e" to the stem before "t".
--- Examples: "töten - tötet", "kehren - kehrt", "lernen - lernt", "atmen - atmet".
 
-  addE : Str -> Str = \stem ->
+-- These functions cover many regular cases; full coverage inflectional patterns are
-    let
+-- defined in $MorphoGer$.
-      r = init (Predef.dp 2 stem) ;
+
-      n = last stem ;
+  mkN4 : (x1,_,_,x4 : Str) -> Gender -> Noun = \wein,weines,weine,weinen ->
-      e = case n of {
+    mkN wein wein wein weines weine weinen ;
-        "t" | "d" => "e" ;
+
-        "e" | "h" => [] ;
+  regA : Str -> Adjective = \blau ->
-        _ => case r of {
+    mkA blau blau (blau + "er") (blau + "est") ;
-          "l" | "r" | "a" | "o" | "u" | "e" | "i" | "ü" | "ä" | "ö"|"h" => [] ;
+
-          _ => "e" 
+  regV : Str -> Verb = \legen ->
-          }
+    let 
-        }
+      lege  = init legen ;
-    in 
+      leg   = init lege ;
-      stem + e ;
+      legt  = leg + "t" ;
+      legte = legt + "e"
+    in
+    mkV 
+      legen lege (leg+"st") legt legt leg 
+      legte (legte + "st") (legte + "n") (legte + "t")
+      legte ("ge" + legt) 
+      VHaben ;
 
 -- Prepositions for complements indicate the complement case.
 
@@ -209,65 +158,39 @@ resource ResGer = ParamGer ** open Prelude in {
     GPl      => caselist "die" "die" "den" "der"
     } ;
 
+-- This is used when forming determiners that are like adjectives.
 
---
+  appAdj : Adjective -> Number => Gender => Case => Str = \adj ->
---    mkIP : (i,me,my : Str) -> Number -> {s : Case => Str ; n : Number} =
+    let
---     \i,me,my,n -> let who = mkNP i me my n P3 in {s = who.s ; n = n} ;
+      ad : GenNum -> Case -> Str = \gn,c -> 
---
+        adj.s ! Posit ! AMod Strong gn c
---    mkNP : (i,me,my : Str) -> Number -> Person -> {s : Case => Str ; a : Agr} =
---     \i,me,my,n,p -> {
---     s = table {
---       Nom => i ;
---       Acc => me ;
---       Gen => my
---       } ;
---     a = {
---       n = n ;
---       p = p
---       }
---     } ;
---
--- These functions cover many cases; full coverage inflectional patterns are
--- in $MorphoGer$.
-
-  mkN4 : (x1,_,_,x4 : Str) -> Gender -> Noun = \wein,weines,weine,weinen ->
-    mkN wein wein wein weines weine weinen ;
-
-  mkN2 : (x1,x2 : Str) -> Gender -> Noun = \frau,frauen ->
-    mkN4 frau frau frauen frauen ;
-
-  regA : Str -> Adjective = \blau ->
-    mkA blau blau (blau + "er") (blau + "est") ;
-
-  regV : Str -> Verb = \legen ->
-    let 
-       leg = case Predef.dp 2 legen of {
-         "en" => Predef.tk 2 legen ;
-         _  => Predef.tk 1 legen
-         } ;
-       lege = addE leg ;
-       legte = lege + "te"
     in
-       mkV legen (lege+"t") leg legte legte ("ge"+lege+"t") VHaben ;
+    \\n,g,c => case n of {
+       Sg => ad (GSg g) c ;
+       _  => ad GPl c
+     } ;
 
--- To eliminate the morpheme "ge".
+-- This auxiliary gives the forms in each degree of adjectives. 
 
-  no_geV : Verb -> Verb = \verb -> {
+  adjForms : (x1,x2 : Str) -> AForm => Str = \teuer,teur ->
-    s = table {
+   table {
-      VPastPart a => Predef.drop 2 (verb.s ! VPastPart a) ;
+    APred => teuer ;
-      v => verb.s ! v
+    AMod Strong (GSg Masc) c => 
-      } ;
+      caselist (teur+"er") (teur+"en") (teur+"em") (teur+"es") ! c ;
-    aux = verb.aux
+    AMod Strong (GSg Fem) c => 
+      caselist (teur+"e") (teur+"e") (teur+"er") (teur+"er") ! c ;
+    AMod Strong (GSg Neut) c => 
+      caselist (teur+"es") (teur+"es") (teur+"em") (teur+"es") ! c ;
+    AMod Strong GPl c => 
+      caselist (teur+"e") (teur+"e") (teur+"en") (teur+"er") ! c ;
+    AMod Weak (GSg g) c => case <g,c> of {
+      <_,Nom>    => teur+"e" ;
+      <Masc,Acc> => teur+"en" ;
+      <_,Acc>    => teur+"e" ;
+      _          => teur+"en" } ;
+    AMod Weak GPl c => teur+"en"
     } ;
 
--- To change the default auxiliary "haben" to "sein".
-
-  seinV : Verb -> Verb = \verb -> {
-    s = verb.s ;
-    aux = VSein
-    } ;
-
-
 -- For $Verb$.
 
   VP : Type = {
@@ -329,41 +252,31 @@ resource ResGer = ParamGer ** open Prelude in {
       } ;
 
   haben_V : Verb = 
-    let
+    mkV 
-      haben = mkV "haben" "hat" "hab" "hatte" "hätte" "gehabt" VHaben
+      "haben" "habe" "hast" "hat" "habt" "hab" 
-    in 
+      "hatte" "hattest" "hatten" "hattet" 
-    {s = table {
+      "hätte" "gehabt" 
-      VPresInd Sg P2 => "hast" ;
+      VHaben ;
-      v => haben.s ! v
-      } ;
-     aux = VHaben 
-    } ;
 
   werden_V : Verb = 
-    let
+    mkV 
-      werden = mkV "werden" "wird" "werd" "wurde" "würde" "geworden" VSein
+      "werden" "werde" "wirst" "wird" "werdet" "werd" 
-    in 
+      "wurde" "wurdest" "wurden" "wurdet" 
-    {s = table {
+      "würde" "geworden" 
-      VPresInd Sg P2 => "wirst" ;
+      VSein ;
-      v => werden.s ! v
-      } ;
-     aux = VSein
-    } ;
 
   sein_V : Verb = 
     let
-      sein = mkV "sein" "ist" "sei" "war" "wäre" "gewesen" VSein
+      sein = mkV 
+      "sein" "bin" "bist" "ist" "seid" "sei" 
+      "war"  "warst" "waren" "wart" 
+      "wäre" "gewesen" 
+      VSein
     in
     {s = table {
-      VPresInd Sg P1 => "bin" ;
+      VPresInd Pl (P1 | P3) => "sind" ;
-      VPresInd Sg P2 => "bist" ;
-      VPresInd Pl P2 => "seid" ;
-      VPresInd Pl _  => "sind" ;
-      VImper Sg    => "sei" ;
-      VImper Pl    => "seid" ;
-      VPresSubj Sg P1 => "sei" ;
       VPresSubj Sg P2 => (variants {"seiest" ; "seist"}) ;
-      VPresSubj Sg P3 => "sei" ;
+      VPresSubj Sg _  => "sei" ;
       VPresSubj Pl P2 => "seien" ;
       VPresSubj Pl _  => "seiet" ;
       VPresPart a => (regA "seiend").s ! Posit ! a ;
@@ -372,25 +285,13 @@ resource ResGer = ParamGer ** open Prelude in {
      aux = VSein
     } ;
 
-  wollen_V : Verb = 
+  auxVV : Verb -> Verb ** {part : Str} = \v -> v ** {part = []} ;
-    let
-      wollen = mkV "wollen" "will" "woll" "wollte" "wollte" "gewollen" VHaben
-    in 
-    {s = table {
-      VPresInd Sg P1 => "will" ;
-      VPresInd Sg P2 => "willst" ;
-      v => wollen.s ! v
-      } ;
-     aux = VHaben 
-    } ;
 
   negation : Polarity => Str = table {
       Pos => [] ;
       Neg => "nicht"
       } ;
 
-  auxVV : Verb -> Verb ** {part : Str} = \v -> v ** {part = []} ;
-
 -- Extending a verb phrase with new constituents.
 
   insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> {
@@ -417,7 +318,6 @@ resource ResGer = ParamGer ** open Prelude in {
     ext = vp.ext ++ ext
     } ;
 
-
 -- For $Sentence$.
 
   Clause : Type = {
@@ -453,7 +353,6 @@ resource ResGer = ParamGer ** open Prelude in {
     {n = Pl ; p = P3} => "sich"
     } ;
 
-
 -- For $Numeral$.
 --
 --  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} =