From f5c48cb49b66dfa997ad2b7ec6a7caedfb2daf47 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 2 Dec 2008 08:49:04 +0000 Subject: [PATCH] added slavic to some paths in Bulgaria, and Inanimate to one place in SymbolBul, to be able to compile them --- next-lib/src/bulgarian/AllBul.gf | 2 +- next-lib/src/bulgarian/SymbolBul.gf | 6 ++++-- next-lib/src/german/NounGer.gf | 7 +++++-- next-lib/src/russian/AllRus.gf | 2 +- next-lib/src/scandinavian/ExtraScand.gf | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/next-lib/src/bulgarian/AllBul.gf b/next-lib/src/bulgarian/AllBul.gf index 80ad02165..8efb34903 100644 --- a/next-lib/src/bulgarian/AllBul.gf +++ b/next-lib/src/bulgarian/AllBul.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../common:prelude +--# -path=.:../abstract:../common:../slavic concrete AllBul of AllBulAbs = LangBul, diff --git a/next-lib/src/bulgarian/SymbolBul.gf b/next-lib/src/bulgarian/SymbolBul.gf index 814cbbf71..609badfba 100644 --- a/next-lib/src/bulgarian/SymbolBul.gf +++ b/next-lib/src/bulgarian/SymbolBul.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common:../slavic concrete SymbolBul of Symbol = CatBul ** open Prelude, ResBul in { @@ -15,7 +15,9 @@ lin a = agrP3 (gennum cn.g Sg) } ; CNSymbNP det cn xs = { - s = \\c => det.s ! False ! cn.g ! RSubj ++ cn.s ! NF det.n Indef ++ xs.s ; + s = \\c => + det.s ! False ! cn.g ! Inanimate ! RSubj ++ ---- AR 2/12: Inanimate + cn.s ! NF det.n Indef ++ xs.s ; a = agrP3 (gennum cn.g det.n) } ; CNNumNP cn i = { diff --git a/next-lib/src/german/NounGer.gf b/next-lib/src/german/NounGer.gf index 02252afbd..a25167d72 100644 --- a/next-lib/src/german/NounGer.gf +++ b/next-lib/src/german/NounGer.gf @@ -10,7 +10,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in { } ; DetNP det = { - s = \\c => det.s ! Neutr ! c ; ---- genders + s = \\c => det.sp ! Neutr ! c ; ---- genders a = agrP3 det.n ; isPron = False } ; @@ -99,7 +99,10 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in { Pl => \\_,_ => [] } } ; - sp = \\_,g,c => "ein" + pronEnding ! GSg g ! c ; ---- plural ; einer + sp = table { + Sg => \\g,c => "ein" + pronEnding ! GSg g ! c ; + Pl => \\_ => caselist "einige" "einige" "einigen" "einiger" + } ; a = Strong } ; diff --git a/next-lib/src/russian/AllRus.gf b/next-lib/src/russian/AllRus.gf index 024ce67e1..33140569c 100644 --- a/next-lib/src/russian/AllRus.gf +++ b/next-lib/src/russian/AllRus.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../common:prelude +--# -path=.:../abstract:../common:../slavic concrete AllRus of AllRusAbs = LangRus, diff --git a/next-lib/src/scandinavian/ExtraScand.gf b/next-lib/src/scandinavian/ExtraScand.gf index 5e6594235..32ec58bc2 100644 --- a/next-lib/src/scandinavian/ExtraScand.gf +++ b/next-lib/src/scandinavian/ExtraScand.gf @@ -2,7 +2,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand ** open CommonScand,Coordination,ResScand in { lin GenNP np = { - s = \\n,_,_,g => np.s ! NPPoss (gennum g n) ; + s,sp = \\n,_,_,g => np.s ! NPPoss (gennum g n) ; det = DDef Indef } ;