From e02e27f24b2cd3beb80319b4a1a0899600dcab70 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 27 Feb 2011 16:36:24 +0000 Subject: [PATCH] German verb form for haben; extended TryGer --- lib/src/api/Constructors.gf | 6 +++--- lib/src/api/TryGer.gf | 2 +- lib/src/german/IrregGer.gf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/api/Constructors.gf b/lib/src/api/Constructors.gf index 914ba2e01..e6012e6ee 100644 --- a/lib/src/api/Constructors.gf +++ b/lib/src/api/Constructors.gf @@ -1684,13 +1684,13 @@ oper "7" => n7 ; "8" => n8 ; "9" => n9 ; - _ => Predef.error ("not a valid digit" ++ s) + _ => Predef.error ("str2numeral: not a valid Digit" ++ s) } ; s2s10 : Str -> Sub10 = \s -> case s of { "1" => pot01 ; #idigit => pot0 (s2d s) ; - _ => Predef.error ("not a valid digit" ++ s) + _ => Predef.error ("str2numeral: not a valid Sub10" ++ s) } ; s2s100 : Str -> Sub100 = \s -> case s of { @@ -1744,7 +1744,7 @@ oper "7" => D_7 ; "8" => D_8 ; "9" => D_9 ; - _ => Predef.error ("not a valid digit" ++ s) + _ => Predef.error ("s2d: not a valid digit" ++ s) } ; } ; diff --git a/lib/src/api/TryGer.gf b/lib/src/api/TryGer.gf index 7b4d0ddb5..3c5ddd298 100644 --- a/lib/src/api/TryGer.gf +++ b/lib/src/api/TryGer.gf @@ -1,3 +1,3 @@ --# -path=.:alltenses:prelude -resource TryGer = SyntaxGer, LexiconGer, ParadigmsGer - [mkAdv] ; +resource TryGer = SyntaxGer, ExtraGer, LexiconGer, ParadigmsGer - [mkAdv], MakeStructuralGer ; diff --git a/lib/src/german/IrregGer.gf b/lib/src/german/IrregGer.gf index 9c35e5dc3..7dad19764 100644 --- a/lib/src/german/IrregGer.gf +++ b/lib/src/german/IrregGer.gf @@ -70,7 +70,7 @@ in { lin glimmen_V = irregV "glimmen" "glimmt" "glomm" "glimmte" "glömme" ; lin graben_V = irregV "graben" "gräbt" "grub" "grübe" "gegraben" ; lin greifen_V = irregV "greifen" "greift" "griff" "griffe" "gegriffen" ; - lin haben_V = irregV "haben" "hat" "hatte" "hatte" "gehabt" ; + lin haben_V = irregV "haben" "hat" "hatte" "hätte" "gehabt" ; lin halten_V = irregV "halten" "hält" "hielt" "hielte" "gehalten" ; lin hängen_V = irregV "hängen" "hängt" "hing" "hinge" "gehangen" ; lin hauen_V = irregV "hauen" "haut" (variants {"haute" ; "hieb"}) (variants {"haute" ; "hiebe"}) "gehauen" ;