fixed fields in armenian

This commit is contained in:
EkaterinaVoloshina
2026-04-10 15:49:30 +02:00
parent f630f6ef29
commit 44acdbd350
5 changed files with 444 additions and 445 deletions

View File

@@ -46,7 +46,7 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
lincat Ord = {s : Str} ;
lincat PN = {s : Str} ;
lincat Predet = {s : Str} ;
lincat Prep = {s : Str; c : Case; lock_Prep : {}; isPre : Bool} ;
lincat Prep = {s : Str; c : Case; lock_Prep : {}} ;
lincat Pron = {s : Str} ;
lincat QCl = {s : Str} ;
lincat QS = {s : Str} ;
@@ -60,73 +60,73 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
lincat Subj = {s : Str} ;
lincat V = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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} ;
lincat V2 = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}} ;
lincat V2A = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
lincat V2Q = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
lincat V2S = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
lincat V2V = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
lincat V3 = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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;
c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
lincat VA = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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} ;
lincat VP = {s : Case => Number => Str;
conditional : Aspect => Person => Number => Case => Number => Str;
converb : {Imperfective : Case => Number => Str;
FutCon1 : Case => Number => Str; FutCon2 : Case => Number => Str;
Negative : Case => Number => Str;
Perfective : Case => Number => Str;
Simultaneous : Case => Number => Str};
converb : {imperfective : Case => Number => Str;
futCon1 : Case => Number => Str; FutCon2 : Case => Number => Str;
negative : Case => Number => Str;
perfective : Case => Number => Str;
simultaneous : Case => Number => Str};
imperative : Number => Number => Str;
passive : Case => Number => Str;
past : Person => Number => Case => Number => Str;
@@ -134,29 +134,29 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
subjunctive : Aspect => Person => Number => Case => Number => Str} ;
lincat VPSlash = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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; lock_V : {}} ;
lincat VQ = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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} ;
lincat VS = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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} ;
lincat VV = {s : Str; causative : Str;
conditional : Aspect => Person => Number => Str;
converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str;
Negative : Str; Perfective : Str; Simultaneous : 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} ;

View File

@@ -15,50 +15,50 @@ lin
paragraph (x.s) ++
heading1 "Converb" ++
frameTable (
tr (th "Imperfective" ++ td (x.Converb.Imperfective)) ++
tr (th "Simultaneous" ++ td (x.Converb.Simultaneous)) ++
tr (th "Perfective" ++ td (x.Converb.Perfective)) ++
tr (th "Futute I" ++ td (x.Converb.FutCon1)) ++
tr (th "Futute II" ++ td (x.Converb.FutCon2)) ++
tr (th "Connegative" ++ td (x.Converb.Negative))) ++
tr (th "Imperfective" ++ td (x.converb.imperfective)) ++
tr (th "Simultaneous" ++ td (x.converb.simultaneous)) ++
tr (th "Perfective" ++ td (x.converb.perfective)) ++
tr (th "Futute I" ++ td (x.converb.futCon1)) ++
tr (th "Futute II" ++ td (x.converb.futCon2)) ++
tr (th "Connegative" ++ td (x.converb.negative))) ++
heading1 "Passive" ++
paragraph x.Passive ++
paragraph x.passive ++
heading1 "Participle" ++
frameTable (
tr (th "Resultative" ++ td (x.Participle ! Resultative)) ++
tr (th "Subject" ++ td (x.Participle ! Subject))) ++
tr (th "Resultative" ++ td (x.participle ! Resultative)) ++
tr (th "Subject" ++ td (x.participle ! Subject))) ++
heading1 "Past" ++
frameTable (
tr (th "" ++ th "Sg" ++ th "Pl") ++
tr (th "P1" ++ td (x.Past ! P1 ! Sg) ++ td (x.Past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.Past ! P2 ! Sg) ++ td (x.Past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.Past ! P3 ! Sg) ++ td (x.Past ! P3 ! Pl))) ++
tr (th "P1" ++ td (x.past ! P1 ! Sg) ++ td (x.past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.past ! P2 ! Sg) ++ td (x.past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.past ! P3 ! Sg) ++ td (x.past ! P3 ! Pl))) ++
heading1 "Subjunctive" ++
frameTable (
tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++
tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++
th "P1" ++ td (x.Subjunctive ! Perfect ! P1 ! Sg) ++ td (x.Subjunctive ! Perfect ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.Subjunctive ! Perfect ! P2 ! Sg) ++ td (x.Subjunctive ! Perfect ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.Subjunctive ! Perfect ! P3 ! Sg) ++ td (x.Subjunctive ! Perfect ! P3 ! Pl)) ++
th "P1" ++ td (x.subjunctive ! Perfect ! P1 ! Sg) ++ td (x.subjunctive ! Perfect ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.subjunctive ! Perfect ! P2 ! Sg) ++ td (x.subjunctive ! Perfect ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.subjunctive ! Perfect ! P3 ! Sg) ++ td (x.subjunctive ! Perfect ! P3 ! Pl)) ++
tr (intagAttr "th" "rowspan=\"3\"" "Non_Past" ++
th "P1" ++ td (x.Subjunctive ! Non_Past ! P1 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.Subjunctive ! Non_Past ! P2 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.Subjunctive ! Non_Past ! P3 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P3 ! Pl))) ++
th "P1" ++ td (x.subjunctive ! Non_Past ! P1 ! Sg) ++ td (x.subjunctive ! Non_Past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.subjunctive ! Non_Past ! P2 ! Sg) ++ td (x.subjunctive ! Non_Past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.subjunctive ! Non_Past ! P3 ! Sg) ++ td (x.subjunctive ! Non_Past ! P3 ! Pl))) ++
heading1 "Conditional" ++
frameTable (
tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++
tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++
th "P1" ++ td (x.Conditional ! Perfect ! P1 ! Sg) ++ td (x.Conditional ! Perfect ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.Conditional ! Perfect ! P2 ! Sg) ++ td (x.Conditional ! Perfect ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.Conditional ! Perfect ! P3 ! Sg) ++ td (x.Conditional ! Perfect ! P3 ! Pl)) ++
th "P1" ++ td (x.conditional ! Perfect ! P1 ! Sg) ++ td (x.conditional ! Perfect ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.conditional ! Perfect ! P2 ! Sg) ++ td (x.conditional ! Perfect ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.conditional ! Perfect ! P3 ! Sg) ++ td (x.conditional ! Perfect ! P3 ! Pl)) ++
tr (intagAttr "th" "rowspan=\"4\"" "Non_Past" ++
th "P1" ++ td (x.Conditional ! Non_Past ! P1 ! Sg) ++ td (x.Conditional ! Non_Past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.Conditional ! Non_Past ! P2 ! Sg) ++ td (x.Conditional ! Non_Past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.Conditional ! Non_Past ! P3 ! Sg) ++ td (x.Conditional ! Non_Past ! P3 ! Pl))) ++
th "P1" ++ td (x.conditional ! Non_Past ! P1 ! Sg) ++ td (x.conditional ! Non_Past ! P1 ! Pl)) ++
tr (th "P2" ++ td (x.conditional ! Non_Past ! P2 ! Sg) ++ td (x.conditional ! Non_Past ! P2 ! Pl)) ++
tr (th "P3" ++ td (x.conditional ! Non_Past ! P3 ! Sg) ++ td (x.conditional ! Non_Past ! P3 ! Pl))) ++
heading1 "Imperative" ++
frameTable (
tr (th "Sg" ++ th "Pl") ++
tr (td (x.Imperative_Jussive ! Sg) ++ td (x.Imperative_Jussive ! Pl))) ;
tr (td (x.imperative ! Sg) ++ td (x.imperative ! Pl))) ;
s3=[]
} ;
lin

File diff suppressed because it is too large Load Diff

View File

@@ -477,7 +477,6 @@ oper
mkSubj : Str -> Subj = \s -> lin Subj {s=s} ;
mkQuant : Str -> Quant = \s -> lin Quant {s=s} ;
mkPredet : Str -> Predet = \s -> lin Predet {s=s} ;
mkDet : Str -> Det = \s -> lin Det {s=s} ;
mkCard : Str -> Card = \s -> lin Card {s=s} ;
mkConj : Str -> Conj = \s -> lin Conj {s=s} ;
mkPConj : Str -> PConj = \s -> lin PConj {s=s} ;

View File

@@ -5,12 +5,12 @@ 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_Jussive: Number => Str; Passive: Str; Past: Person => Number => Str; Participle: PartType => Str; Subjunctive: Aspect => Person => Number => Str} ; -- 898
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
oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb =
\f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43 ->
{ s = f1 ;
Causative = f2 ;
Conditional = table {
causative = f2 ;
conditional = table {
Perfect => table {
P1 => table {
Sg => f3 ;
@@ -40,19 +40,19 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_
}
}
} ;
Converb = { Imperfective = f15 ;
FutCon1 = f16 ;
FutCon2 = f17 ;
Negative = f18 ;
Perfective = f19 ;
Simultaneous = f20
converb = { imperfective = f15 ;
futCon1 = f16 ;
futCon2 = f17 ;
negative = f18 ;
perfective = f19 ;
simultaneous = f20
} ;
Imperative_Jussive = table {
imperative = table {
Sg => f21 ;
Pl => f22
} ;
Passive = f23 ;
Past = table {
passive = f23 ;
past = table {
P1 => table {
Sg => f24 ;
Pl => f25
@@ -66,11 +66,11 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_
Pl => f29
}
} ;
Participle = table {
participle = table {
Resultative => f30 ;
Subject => f31
} ;
Subjunctive = table {
subjunctive = table {
Perfect => table {
P1 => table {
Sg => f32 ;