adjustments in Phrasebook

This commit is contained in:
aarne
2010-05-27 20:44:39 +00:00
parent 27ff25e82d
commit 327ffc420e
7 changed files with 34 additions and 23 deletions

View File

@@ -82,8 +82,8 @@ concrete NounFin of Noun = CatFin ** open ResFin, MorphoFin, Prelude in {
} ;
DetQuantOrd quant num ord = {
s1 = \\c => quant.s1 ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase Pl c ;
sp = \\c => quant.sp ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase Pl c ;
s1 = \\c => quant.s1 ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase num.n c ;
sp = \\c => quant.sp ! num.n ! c ++ num.s ! Sg ! c ++ ord.s ! NCase num.n c ;
s2 = quant.s2 ;
n = num.n ;
isNum = num.isNum ;

View File

@@ -385,7 +385,8 @@ mkV2 : overload {
regA : Str -> A = \a -> case a of {
teu + "er" => mk3A a (teu + "rer") (teu + "reste") ;
_ + "e" => mk3A a (a + "r") (a + "ste") ;
_ => mk3A a (a + "er") (a + "este")
_ + ("t" | "d" | "s" | "sch" | "z") => mk3A a (a + "er") (a + "este") ;
_ => mk3A a (a + "er") (a + "ste")
} ;
invarA = \s -> {s = \\_,_ => s ; lock_A = <>} ; ---- comparison

View File

@@ -320,7 +320,12 @@ resource ResGer = ParamX ** open Prelude in {
mkN wein wein wein weines weine weinen ;
regA : Str -> Adjective = \blau ->
mkA blau blau (blau + "er") (blau + "est") ;
let blauest : Str = case blau of {
_ + ("t" | "d" | "s" | "sch" | "z") => blau + "est" ;
_ => blau + "st"
}
in
mkA blau blau (blau + "er") blauest ;
regV : Str -> Verb = \legen ->
let