From a6fc60e2d3a9563519f638da80ed86940dab6993 Mon Sep 17 00:00:00 2001
From: Roman Suzi <roman.suzi@talentadore.com>
Date: Sat, 1 Aug 2020 10:25:11 +0300
Subject: [PATCH] Fixed ear; fixed ComplSlash complement

---
 src/russian/LexiconRus.gf        | 2 +-
 src/russian/StructuralRus.gf     | 2 +-
 src/russian/VerbRus.gf           | 2 +-
 src/russian/test_result.treebank | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf
index 31fb259d8..6a0af2f9b 100644
--- a/src/russian/LexiconRus.gf
+++ b/src/russian/LexiconRus.gf
@@ -87,7 +87,7 @@ lin
   dry_A = mkA "сухой" "" "3b/c'";
   dull_A = mkA "скучный" ;
   dust_N = mkN "пыль" ;
-  ear_N = mkN "ухо" ;
+  ear_N = (mkNplus (mkN "ухо" neuter inanimate "3e")) ** {pnom="уши";pgen="ушей";pdat="ушам";pacc="уши";pins="ушами";pprep="ушах"} ;
   earth_N = mkN "земля" feminine inanimate "2*d" ;
   easy_A2V = mkA2 (mkA "лёгкий" "легче" "3*a/b") for_Prep ;
   eat_V2 = mkV2 (mkV imperfective "кушать" "кушаю");
diff --git a/src/russian/StructuralRus.gf b/src/russian/StructuralRus.gf
index 07696c4e8..8e52b9686 100644
--- a/src/russian/StructuralRus.gf
+++ b/src/russian/StructuralRus.gf
@@ -60,7 +60,7 @@ lin
   in_Prep = mkPrep "в" Loc ;
   on_Prep = mkPrep "на" Loc ;
   part_Prep = {s="" ; c=Ptv ; hasPrep=False } ;
-  possess_Prep = {s="" ; c=Gen ; hasPrep=False} ;
+  possess_Prep = {s="у" ; c=Gen ; hasPrep=False} ;
   through_Prep = mkPrep "через" Acc ;
   to_Prep = mkPrep "к" Dat ;
   under_Prep = mkPrep "под" Ins ;
diff --git a/src/russian/VerbRus.gf b/src/russian/VerbRus.gf
index 3f013c9be..ce394169d 100644
--- a/src/russian/VerbRus.gf
+++ b/src/russian/VerbRus.gf
@@ -111,7 +111,7 @@ lin
 
   -- : VPSlash -> NP -> VP ; -- love it
   ComplSlash vps np = vps ** {
-    compl=\\a => vps.compl ! np.a ++ (applyPrep vps.c np)      -- hasPrep? order? compl agr lost?
+    compl=\\a => vps.compl ! a ++ (applyPrep vps.c np)
     } ;
 
   -- : VV -> VPSlash -> VPSlash ;       -- want to buy
diff --git a/src/russian/test_result.treebank b/src/russian/test_result.treebank
index 87ba6ef6c..1500d05a8 100644
--- a/src/russian/test_result.treebank
+++ b/src/russian/test_result.treebank
@@ -728,3 +728,6 @@ AllRus: надеяться , что не его имя Иван
 AllRusAbs: ComplVS hope_VS (UseCl (TTAnt TPres AAnter) PPos (have_name_Cl (UsePron he_Pron) (UsePN john_PN)))
 AllRus: надеяться , что его имя Иван
 
+AllRusAbs: UseCl (TTAnt TPast ASimul) PPos (ImpersCl (ComplSlash (VPSlashPrep ill_VP possess_Prep) (UsePron we_Pron)))
+AllRus: бы &+ ло больно у нас
+