fixed warnings in present compilation of resource, esp. unreached patterns

2 files changed, 57 insertions, 8 deletions

diff --git a/next-lib/src/russian/SentenceRus.gf b/next-lib/src/russian/SentenceRus.gf
index 0c15b3d5d..79d691ccd 100644
--- a/next-lib/src/russian/SentenceRus.gf
+++ b/next-lib/src/russian/SentenceRus.gf
@@ -97,24 +97,32 @@ concrete SentenceRus of Sentence = CatRus ** open Prelude, ResRus in {
 
     UseCl t p cl = {s = case t.t of { 
       Cond => cl.s! p.p ! ClCondit ; --# notpresent
-      Pres => cl.s! p.p ! ClIndic Present t.a ;  ---- AR work-around 13/12/2007
-      _ => cl.s! p.p ! ClIndic (getTense t.t) t.a}};
+      Pres => cl.s! p.p ! ClIndic Present t.a   ---- AR work-around 13/12/2007
+        ; --# notpresent
+      _ => cl.s! p.p ! ClIndic (getTense t.t) t.a --# notpresent
+      }
+    };
 
     UseQCl t p qcl= {s = case t.t of { 
       Cond => qcl.s! p.p ! ClCondit ; --# notpresent
-      Pres => qcl.s! p.p ! ClIndic Present t.a ;
-      _ => qcl.s!p.p! ClIndic (getTense t.t) t.a }};
+      Pres => qcl.s! p.p ! ClIndic Present t.a 
+       ; --# notpresent
+      _ => qcl.s!p.p! ClIndic (getTense t.t) t.a --# notpresent
+      }};
 
     UseRCl t p rcl ={s = \\gn,c,anim => case t.t of { 
       Cond => [", "] ++ rcl.s! p.p ! ClCondit ! gn !c !anim ; --# notpresent
-      Pres => [", "] ++ rcl.s! p.p ! ClIndic Present t.a !gn !c !anim;
-      _ => [", "] ++ rcl.s! p.p ! ClIndic (getTense t.t) t.a !gn !c !anim}};
+      Pres => [", "] ++ rcl.s! p.p ! ClIndic Present t.a !gn !c !anim
+      ; --# notpresent
+      _ => [", "] ++ rcl.s! p.p ! ClIndic (getTense t.t) t.a !gn !c !anim --# notpresent
+      }};
 
     UseSlash  t p cl = {
       s = case t.t of { 
         Cond => cl.s! p.p ! ClCondit ; --# notpresent
-        Pres => cl.s! p.p ! ClIndic Present t.a ;
-        _ => cl.s! p.p ! ClIndic (getTense t.t) t.a
+        Pres => cl.s! p.p ! ClIndic Present t.a 
+        ; --# notpresent
+        _ => cl.s! p.p ! ClIndic (getTense t.t) t.a --# notpresent
         } ;
       s2 = cl.s2 ;
       c = cl.c
diff --git a/next-lib/src/russian/SymbolRus.gf b/next-lib/src/russian/SymbolRus.gf
new file mode 100644
index 000000000..54355374a
--- /dev/null
+++ b/next-lib/src/russian/SymbolRus.gf
@@ -0,0 +1,41 @@
+--# -path=.:abstract:common
+
+concrete SymbolRus of Symbol = CatRus ** open Prelude, ResRus in {
+
+{- TODO!
+lin
+  SymbPN i = {s = addGenitiveS i.s ; g = Neutr} ;
+  IntPN i  = {s = addGenitiveS i.s ; g = Neutr} ;
+  FloatPN i = {s = addGenitiveS i.s ; g = Neutr} ;
+  NumPN i = {s = i.s ; g = Neutr} ;
+  CNIntNP cn i = {
+    s = \\c => cn.s ! Sg ! Nom ++ (addGenitiveS i.s) ! c ;
+    a = agrgP3 Sg cn.g
+    } ;
+  CNSymbNP det cn xs = {
+    s = \\c => det.s ++ cn.s ! det.n ! Nom ++ (addGenitiveS xs.s) ! c ; 
+    a = agrgP3 det.n cn.g
+    } ;
+  CNNumNP cn i = {
+    s = \\c => cn.s ! Sg ! Nom ++ i.s ! c ;
+    a = agrgP3 Sg cn.g
+    } ;
+
+  SymbS sy = sy ; 
+
+  SymbNum sy = { s = addGenitiveS sy.s ; n = Pl ; hasCard = True } ;
+  SymbOrd sy = { s = \\c => sy.s ++ (regGenitiveS "th")!c} ;
+-}
+
+lincat 
+
+  Symb, [Symb] = SS ;
+
+lin
+  MkSymb s = s ;
+
+--  BaseSymb = infixSS "and" ;
+  ConsSymb = infixSS "," ;
+
+
+}