added AdvCN ; some German morpho bug fixes

This commit is contained in:
aarne
2006-01-18 17:27:52 +00:00
parent ae956d0805
commit 399e92c8f7
7 changed files with 26 additions and 10 deletions

View File

@@ -41,7 +41,7 @@ lin
buy_V2 = dirV2 (regV "kaufen") ;
camera_N = reg2N "Kamera" "Kameras" feminine ;
cap_N = regN "Mütze" ;
car_N = reg2N "Wagen" "Wagen" masculine ;
car_N = regN "Wagen" ;
carpet_N = regN "Teppich" ;
cat_N = regN "Katze" ;
ceiling_N = reg2N "Dach" "Dächer" neuter ;

View File

@@ -34,7 +34,8 @@ oper
_ => hund + variants {"s" ; "es"}
} ;
pluralN : Str -> Str = \hund -> case hund of {
_ + ("el" | "en" | "er" | "e") => hund + "n" ;
_ + ("el" | "er" | "e") => hund + "n" ;
_ + "en" => hund ;
_ => hund + "en"
} ;
dativE : Str -> Str = \hund -> case hund of {

View File

@@ -132,4 +132,9 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
g = cn.g
} ;
AdvCN cn s = {
s = \\a,n,c => cn.s ! a ! n ! c ++ s.s ;
g = cn.g
} ;
}

View File

@@ -260,8 +260,8 @@ oper
regN : Str -> N = \hund -> case hund of {
_ + "e" => mkN hund hund hund hund (hund + "n") (hund + "n") Fem ;
_ + ("ion" | "ung") => mkN hund hund hund hund (hund + "en") (hund + "en") Fem ;
_ + ("er" | "en" | "el") => mkN hund hund hund (genitS hund) hund (hund + "n") Masc ;
_ => mkN hund hund hund (genitS hund) (hund + "e") (hund + "en") Masc
_ + ("er" | "en" | "el") => mkN hund hund hund (genitS hund) hund (pluralN hund) Masc ;
_ => mkN hund hund hund (genitS hund) (hund + "e") (pluralN hund) Masc
} ;
reg2N : (x1,x2 : Str) -> Gender -> N = \hund,hunde,g ->