From 4af8cf36171af49882009f1f15d2ce7cd6a1c220 Mon Sep 17 00:00:00 2001 From: krasimir Date: Thu, 27 Nov 2008 14:08:50 +0000 Subject: further refactoring in Russian --- next-lib/src/russian/QuestionRus.gf | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'next-lib/src/russian/QuestionRus.gf') diff --git a/next-lib/src/russian/QuestionRus.gf b/next-lib/src/russian/QuestionRus.gf index 369a29089..86633b5f0 100644 --- a/next-lib/src/russian/QuestionRus.gf +++ b/next-lib/src/russian/QuestionRus.gf @@ -29,21 +29,18 @@ concrete QuestionRus of Question = CatRus ** open ResRus, Prelude in { AdvIP ip adv = { s = \\c => ip.s ! c ++ adv.s ; - n = ip.n; p=ip.p; g=ip.g; anim=ip.anim; pron=ip.pron + a = ip.a; anim=ip.anim } ; IdetCN kakoj okhotnik = {s = \\pf => case kakoj.c of { Nom => - kakoj.s ! AF (extCase pf) okhotnik.anim (gNum okhotnik.g kakoj.n) ++ + kakoj.s ! AF (extCase pf) okhotnik.anim (gennum okhotnik.g kakoj.n) ++ okhotnik.s ! NF kakoj.n (extCase pf) ; _ => - kakoj.s ! AF (extCase pf) okhotnik.anim (gNum okhotnik.g kakoj.n) ++ + kakoj.s ! AF (extCase pf) okhotnik.anim (gennum okhotnik.g kakoj.n) ++ okhotnik.s ! NF kakoj.n kakoj.c }; - n = kakoj.n ; - p = P3 ; - pron = False; - g = kakoj.g ; + a = agrP3 kakoj.n kakoj.g ; anim = okhotnik.anim } ; @@ -51,10 +48,7 @@ concrete QuestionRus of Question = CatRus ** open ResRus, Prelude in { IdetIP kakoj = let anim = Inanimate in {s = \\pf => kakoj.s ! AF (extCase pf) anim (pgNum kakoj.g kakoj.n) ; - n = kakoj.n ; - p = P3 ; - pron = False; - g = kakoj.g ; + a = agrP3 kakoj.n kakoj.g ; anim = anim } ; -- cgit v1.2.3