mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-25 18:58:56 -06:00
rename empty field to nonEmpty and fix the countabled
This commit is contained in:
@@ -36,8 +36,8 @@ concrete CatBul of Cat = CommonX ** open ResBul, Prelude in {
|
|||||||
CN = {s : NForm => Str; g : DGender} ;
|
CN = {s : NForm => Str; g : DGender} ;
|
||||||
NP, Pron = {s : Case => Str ; a : Agr} ;
|
NP, Pron = {s : Case => Str ; a : Agr} ;
|
||||||
Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ;
|
Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ;
|
||||||
Predet, Ord = {s : AForm => Str; empty : Bool} ;
|
Predet, Ord = {s : AForm => Str; nonEmpty : Bool} ;
|
||||||
Num = {s : DGenderSpecies => Str; n : Number; empty : Bool} ;
|
Num = {s : DGenderSpecies => Str; n : Number; nonEmpty : Bool} ;
|
||||||
Quant = {s : GenNum => Str; spec : Species} ;
|
Quant = {s : GenNum => Str; spec : Species} ;
|
||||||
|
|
||||||
-- Numeral
|
-- Numeral
|
||||||
|
|||||||
@@ -25,16 +25,16 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
|
|||||||
ord.s ! aform (gennum g Sg) quant.spec c ;
|
ord.s ! aform (gennum g Sg) quant.spec c ;
|
||||||
n = Sg ;
|
n = Sg ;
|
||||||
countable = False ;
|
countable = False ;
|
||||||
spec=case ord.empty of {True => quant.spec; _ => Indef}
|
spec=case ord.nonEmpty of {False => quant.spec; _ => Indef}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
DetPl quant num ord = {
|
DetPl quant num ord = {
|
||||||
s = \\g,c => quant.s ! gennum g num.n ++
|
s = \\g,c => quant.s ! gennum g num.n ++
|
||||||
num.s ! dgenderSpecies g quant.spec c ++
|
num.s ! dgenderSpecies g quant.spec c ++
|
||||||
ord.s ! aform (gennum g num.n) (case num.empty of {True => quant.spec; _ => Indef}) c ;
|
ord.s ! aform (gennum g num.n) (case num.nonEmpty of {False => quant.spec; _ => Indef}) c ;
|
||||||
n = num.n ;
|
n = num.n ;
|
||||||
countable = True ;
|
countable = num.nonEmpty ;
|
||||||
spec=case <num.empty,ord.empty> of {<True,True> => quant.spec; _ => Indef}
|
spec=case <num.nonEmpty,ord.nonEmpty> of {<False,False> => quant.spec; _ => Indef}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
PossPron p = {
|
PossPron p = {
|
||||||
@@ -42,11 +42,11 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
|
|||||||
spec = Indef
|
spec = Indef
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
NoNum = {s = \\_ => []; n = Pl; empty = True} ;
|
NoNum = {s = \\_ => []; n = Pl; nonEmpty = False} ;
|
||||||
NoOrd = {s = \\_ => []; empty = True} ;
|
NoOrd = {s = \\_ => []; nonEmpty = False} ;
|
||||||
|
|
||||||
NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; empty = False} ;
|
NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; nonEmpty = False} ;
|
||||||
OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform; empty = False} ;
|
OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform; nonEmpty = False} ;
|
||||||
|
|
||||||
DefArt = {
|
DefArt = {
|
||||||
s = \\_ => [] ;
|
s = \\_ => [] ;
|
||||||
|
|||||||
Reference in New Issue
Block a user