mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
fixed names of fields
This commit is contained in:
@@ -1,25 +1,132 @@
|
|||||||
concrete CatSqi of Cat = CommonX ** open ParamX, Prelude, ResSqi in {
|
concrete CatSqi of Cat = CommonX ** open ParamX,Prelude,ResSqi in {
|
||||||
|
flags
|
||||||
lincat N = Noun ;
|
coding = "UTF-8" ;
|
||||||
lincat N2 = Noun ** {c2 : Compl} ;
|
lincat A = {s : Case => Gender => Number => Str; clit : Bool} ;
|
||||||
lincat N3 = Noun ** {c2,c3 : Compl} ;
|
lincat A2 = {s : Case => Gender => Number => Str; clit : Bool;
|
||||||
lincat A = Adj ;
|
c2 : {s : Str}} ;
|
||||||
lincat A2 = Adj ** {c2 : Compl} ;
|
lincat ACard = {s : Str} ;
|
||||||
lincat V, VA, VV, VS, VQ = Verb ;
|
lincat AP = {s : Case => Gender => Number => Str; isPre : Bool} ;
|
||||||
lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ;
|
lincat CN = {s : Species => Case => Number => Case => Str;
|
||||||
lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
|
g : Gender} ;
|
||||||
lincat Prep = Compl ;
|
lincat Card = {s : Str} ;
|
||||||
|
lincat Cl = {s : Str} ;
|
||||||
lincat Numeral = {s : Str} ;
|
lincat ClSlash = {s : Str} ;
|
||||||
lincat Digits = {s : Str; n : Number; tail : DTail} ;
|
lincat Comp = {s : Str} ;
|
||||||
lincat Decimal = {s : Str; n : Number; hasDot : Bool} ;
|
lincat Conj = {s : Str} ;
|
||||||
|
lincat DAP = {s : Str} ;
|
||||||
lincat AP = {s: Species => Case => Gender => Number => Str} ;
|
lincat Decimal = {s : Str; n : Number; hasDot : Bool} ;
|
||||||
lincat CN = Noun ;
|
lincat Det = {s : Str; n : Number; sp : Species} ;
|
||||||
lincat Num = {s : Str; n : Number} ;
|
lincat Digits = {s : Str; n : Number; tail : DTail} ;
|
||||||
lincat Quant = {s : Case => Gender => Number => Str; spec : Species} ;
|
lincat GN = {s : Str} ;
|
||||||
lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ;
|
lincat IComp = {s : Str} ;
|
||||||
lincat NP = {s: Case => Str; a : Agr} ;
|
lincat IDet = {s : Str} ;
|
||||||
lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
|
lincat IP = {s : Str} ;
|
||||||
|
lincat IQuant = {s : Str} ;
|
||||||
}
|
lincat Imp = {s : Str} ;
|
||||||
|
lincat LN = {s : Str} ;
|
||||||
|
lincat N = {s : Species => Case => Number => Str; g : Gender} ;
|
||||||
|
lincat N2 = {s : Species => Case => Number => Str; g : Gender;
|
||||||
|
c2 : {s : Str}} ;
|
||||||
|
lincat N3 = {s : Species => Case => Number => Str; g : Gender;
|
||||||
|
c2 : {s : Str}; c3 : {s : Str}} ;
|
||||||
|
lincat NP = {s : Case => Str; g : Gender} ;
|
||||||
|
lincat Num = {s : Str; n : Number} ;
|
||||||
|
lincat Numeral = {s : Str} ;
|
||||||
|
lincat Ord = {s : Str} ;
|
||||||
|
lincat PN = {s : Str} ;
|
||||||
|
lincat Predet = {s : Str} ;
|
||||||
|
lincat Prep = {s : Str} ;
|
||||||
|
lincat Pron = {s : Case => Str; acc_clit : Str; dat_clit : Str;
|
||||||
|
a : {gn : GenNum; p : Person}} ;
|
||||||
|
lincat QCl = {s : Str} ;
|
||||||
|
lincat QS = {s : Str} ;
|
||||||
|
lincat Quant = {s : Str; sp : Species} ;
|
||||||
|
lincat RCl = {s : Str} ;
|
||||||
|
lincat RP = {s : Str} ;
|
||||||
|
lincat RS = {s : Str} ;
|
||||||
|
lincat S = {s : Str} ;
|
||||||
|
lincat SN = {s : Str} ;
|
||||||
|
lincat SSlash = {s : Str} ;
|
||||||
|
lincat Subj = {s : Str} ;
|
||||||
|
lincat V = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
lincat V2 = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str}} ;
|
||||||
|
lincat V2A = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str};
|
||||||
|
c3 : {s : Str}} ;
|
||||||
|
lincat V2Q = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str}} ;
|
||||||
|
lincat V2S = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str}} ;
|
||||||
|
lincat V2V = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str};
|
||||||
|
c3 : {s : Str}} ;
|
||||||
|
lincat V3 = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str; c2 : {s : Str};
|
||||||
|
c3 : {s : Str}} ;
|
||||||
|
lincat VA = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
lincat VP = {indicative : Tense => Number => Person => Case => Str;
|
||||||
|
participle : Case => Str;
|
||||||
|
pres_optative : Number => Person => Case => Str;
|
||||||
|
perf_optative : Number => Person => Case => Str;
|
||||||
|
pres_admirative : Number => Person => Case => Str;
|
||||||
|
imperf_admirative : Number => Person => Case => Str} ;
|
||||||
|
lincat VPSlash = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
lincat VQ = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
lincat VS = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
lincat VV = {indicative : Tense => Number => Person => Str;
|
||||||
|
imperative : Number => Str; participle : Str;
|
||||||
|
pres_optative : Number => Person => Str;
|
||||||
|
perf_optative : Number => Person => Str;
|
||||||
|
pres_admirative : Number => Person => Str;
|
||||||
|
imperf_admirative : Number => Person => Str} ;
|
||||||
|
}
|
||||||
@@ -51,32 +51,32 @@ lin InflectionV = \x -> {
|
|||||||
t="fl" ;
|
t="fl" ;
|
||||||
s1=heading1 "Folje" ;
|
s1=heading1 "Folje" ;
|
||||||
s2=frameTable (
|
s2=frameTable (
|
||||||
tr (intagAttr "th" "rowspan=\"24\"" "Indicative" ++ intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Pres ! Sg ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"24\"" "Indicative" ++ intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Pres ! Sg ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Pres ! Sg ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Pres ! Sg ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Pres ! Sg ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Pres ! Sg ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Pres ! Pl ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Pres ! Pl ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Pres ! Pl ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Pres ! Pl ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Pres ! Pl ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Pres ! Pl ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"6\"" "Past" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Past ! Sg ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"6\"" "Past" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Past ! Sg ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Past ! Sg ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Past ! Sg ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Past ! Sg ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Past ! Sg ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Past ! Pl ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Past ! Pl ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Past ! Pl ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Past ! Pl ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Past ! Pl ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Past ! Pl ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"6\"" "Aorist" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Aorist ! Sg ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"6\"" "Aorist" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Aorist ! Sg ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Aorist ! Sg ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Aorist ! Sg ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Aorist ! Sg ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Aorist ! Sg ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Aorist ! Pl ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Aorist ! Pl ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Aorist ! Pl ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Aorist ! Pl ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Aorist ! Pl ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Aorist ! Pl ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"6\"" "Imperfect" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Sg ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"6\"" "Imperfect" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Imperfect ! Sg ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Imperfect ! Sg ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Imperfect ! Sg ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Imperfect ! Sg ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Imperfect ! Sg ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Pl ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Imperfect ! Pl ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.Indicative ! Imperfect ! Pl ! P2)) ++
|
tr (th "P2" ++ td (x.indicative ! Imperfect ! Pl ! P2)) ++
|
||||||
tr (th "P3" ++ td (x.Indicative ! Imperfect ! Pl ! P3)) ++
|
tr (th "P3" ++ td (x.indicative ! Imperfect ! Pl ! P3)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"2\"" "Imperative" ++ th "Sg" ++ td (x.Imperative ! Sg)) ++
|
tr (intagAttr "th" "rowspan=\"2\"" "Imperative" ++ th "Sg" ++ td (x.imperative ! Sg)) ++
|
||||||
tr (th "Pl" ++ td (x.Imperative ! Pl)) ++
|
tr (th "Pl" ++ td (x.imperative ! Pl)) ++
|
||||||
tr (th "participle" ++ td (x.participle)) ++
|
tr (th "participle" ++ td (x.participle)) ++
|
||||||
tr (intagAttr "th" "rowspan=\"6\"" "pres_optative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.pres_optative ! Sg ! P1)) ++
|
tr (intagAttr "th" "rowspan=\"6\"" "pres_optative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.pres_optative ! Sg ! P1)) ++
|
||||||
tr (th "P2" ++ td (x.pres_optative ! Sg ! P2)) ++
|
tr (th "P2" ++ td (x.pres_optative ! Sg ! P2)) ++
|
||||||
|
|||||||
@@ -104,10 +104,10 @@ oper mkAdj : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Bool -> Adj =
|
|||||||
|
|
||||||
|
|
||||||
param Tense = Pres | Past | Imperfect | Aorist ;
|
param Tense = Pres | Past | Imperfect | Aorist ;
|
||||||
oper Verb = {Indicative: Tense => Number => Person => Str; Imperative: Number => Str; participle: Str; pres_optative: Number => Person => Str; perf_optative: Number => Person => Str; pres_admirative: Number => Person => Str; imperf_admirative: Number => Person => Str} ; -- 758
|
oper Verb = {indicative: Tense => Number => Person => Str; imperative: Number => Str; participle: Str; pres_optative: Number => Person => Str; perf_optative: Number => Person => Str; pres_admirative: Number => Person => Str; imperf_admirative: Number => Person => Str} ; -- 758
|
||||||
oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb =
|
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,f44,f45,f46,f47,f48,f49,f50,f51 ->
|
\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,f44,f45,f46,f47,f48,f49,f50,f51 ->
|
||||||
{ Indicative = table {
|
{ indicative = table {
|
||||||
Pres => table {
|
Pres => table {
|
||||||
Sg => table {
|
Sg => table {
|
||||||
P1 => f1 ;
|
P1 => f1 ;
|
||||||
@@ -157,7 +157,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
Imperative = table {
|
imperative = table {
|
||||||
Sg => f25 ;
|
Sg => f25 ;
|
||||||
Pl => f26
|
Pl => f26
|
||||||
} ;
|
} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user