added pronouns

src/armenian/CatHye.gf

@@ -32,7 +32,7 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
   lincat PN = {s : Str} ;
   lincat Predet = {s : Str} ;
   lincat Prep = Compl ;
-  lincat Pron = {s : Str; a : Agr} ;
+  lincat Pron = {s : Str; empty : Str; a : Agr} ;
   lincat QCl = {s : Str} ;
   lincat QS = {s : Str} ;
   lincat Quant = {s : Str; sp : Species} ;

src/armenian/GrammarHye.gf

@@ -2,5 +2,6 @@ concrete GrammarHye of Grammar =
   TenseX,
   PhraseHye,
   NounHye,
-  AdjectiveHye ** {
+  AdjectiveHye,
+  StructuralHye ** {
 }

src/armenian/LexiconHye.gf

@@ -1,2 +1,5 @@
 concrete LexiconHye of Lexicon = CatHye ** open ParadigmsHye in {
+lin apple_N = mkN001 "խնձոր" ;
+lin man_N = mkN047 "տղամարդ" ;
+lin woman_N = mkN034 "կին" ;
 }

src/armenian/NounHye.gf

@@ -11,7 +11,7 @@ concrete NounHye of Noun = CatHye ** open ResHye in {
   lin IndefArt = {s = []; sp = Indef} ;
   lin NumPl = {s = []; n = Pl} ;
   lin NumSg = {s = []; n = Sg} ;
-  lin PossPron pron = {s = pron.s; sp = Poss pron.a.p} ;
+  lin PossPron pron = {s = pron.empty; sp = Poss pron.a.p} ;
   lin UseN n = n ** {
         s = \\sp,c,num =>
                 case <sp,c> of {
@@ -22,4 +22,5 @@ concrete NounHye of Noun = CatHye ** open ResHye in {
                   _         => n.s ! c ! num
                 }
       } ;
+  lin UsePron pron = {s = \\c => pron.s; a=pron.a} ;
 }

src/armenian/ParadigmsHye.gf

@@ -487,4 +487,10 @@ oper
   mkSN : Str -> SN = \s -> lin SN {s=s} ;
   mkPN : Str -> PN = \s -> lin PN {s=s} ;
 
+  mkPron : Str -> Number -> Person -> Pron = \s,n,p -> 
+    lin Pron {
+      s = s ;
+      empty = [] ;
+      a = {n = n; p = p}
+    } ;
 }

src/armenian/ResHye.gf

@@ -1,8 +1,6 @@
-resource ResHye = {
+resource ResHye = ParamX ** {
 
 param Aspect = Non_Past | Perfect ;
-param Person = P1 | P3 | P2 ;
-param Number = Sg | Pl ;
 param Case = Nom | Dat | Ablat | Instr | Loc ;
 param PartType = Resultative | Subject ;
 oper Verb = {s: Str; causative: Str; conditional: Aspect => Person => Number => Str; converb: {imperfective: Str; futCon1: Str; futCon2: Str; negative: Str; perfective: Str; simultaneous: Str}; imperative: Number => Str; passive: Str; past: Person => Number => Str; participle: PartType => Str; subjunctive: Aspect => Person => Number => Str} ; -- 898