mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
how8much_IAdv in Structural; changed parameter name Place in Numerals
This commit is contained in:
@@ -48,6 +48,7 @@ abstract Structural = Cat ** {
|
||||
here7from_Adv : Adv ; -- from here
|
||||
how_IAdv : IAdv ;
|
||||
how8many_IDet : IDet ;
|
||||
how8much_IAdv : IAdv ;
|
||||
i_Pron : Pron ;
|
||||
if_Subj : Subj ;
|
||||
in8front_Prep : Prep ; -- in front of
|
||||
|
||||
@@ -48,6 +48,7 @@ concrete StructuralEng of Structural = CatEng **
|
||||
here7to_Adv = mkAdv ["to here"] ;
|
||||
here7from_Adv = mkAdv ["from here"] ;
|
||||
how_IAdv = ss "how" ;
|
||||
how8much_IAdv = ss "how much" ;
|
||||
how8many_IDet = mkDeterminer plural ["how many"] ;
|
||||
if_Subj = ss "if" ;
|
||||
in8front_Prep = mkPrep ["in front of"] ;
|
||||
|
||||
@@ -46,6 +46,7 @@ concrete StructuralFin of Structural = CatFin **
|
||||
here7to_Adv = ss "tänne" ;
|
||||
here7from_Adv = ss "täältä" ;
|
||||
how_IAdv = ss "miten" ;
|
||||
how8much_IAdv = ss "kuinka paljon" ;
|
||||
how8many_IDet =
|
||||
{s = \\c => "kuinka" ++ (mkN "moni" "monia").s ! NCase Sg c ; n = Sg ; isNum = False} ;
|
||||
if_Subj = ss "jos" ;
|
||||
|
||||
@@ -37,13 +37,13 @@ oper
|
||||
} ;
|
||||
|
||||
param DForm = unit | teen | jten | ten | tenplus ;
|
||||
param Place = indep | postpo | attr ;
|
||||
param Placement = indep | postpo | attr ;
|
||||
|
||||
lincat
|
||||
Digit = {s : CardOrd => DForm => Str ; inh : DForm ; n : Number} ;
|
||||
Sub10 = {s : CardOrd => (DForm * Place) => Str ; inh : Number} ;
|
||||
Sub100 = {s : CardOrd => Place => Str ; n : Number} ;
|
||||
Sub1000 = {s : CardOrd => Place => Str ; n : Number} ;
|
||||
Sub10 = {s : CardOrd => (DForm * Placement) => Str ; inh : Number} ;
|
||||
Sub100 = {s : CardOrd => Placement => Str ; n : Number} ;
|
||||
Sub1000 = {s : CardOrd => Placement => Str ; n : Number} ;
|
||||
Sub1000000 = {s : CardOrd => Str ; n : Number} ;
|
||||
|
||||
lin num x0 = x0 ;
|
||||
|
||||
@@ -53,6 +53,7 @@ lin
|
||||
here7to_Adv = ss "ici" ;
|
||||
here_Adv = ss "ici" ;
|
||||
how_IAdv = ss "comment" ;
|
||||
how8much_IAdv = ss "combien" ;
|
||||
how8many_IDet = {s = \\_,c => prepCase c ++ "combien" ++ elisDe ; n = Pl} ;
|
||||
if_Subj = ss elisSi ** {m = Indic} ;
|
||||
in8front_Prep = mkPreposition "devant" ;
|
||||
|
||||
@@ -4,13 +4,13 @@ concrete NumeralRon of Numeral = CatRon **
|
||||
flags coding = utf8 ;
|
||||
|
||||
param DForm = unit | teen | ten | teen_inf ;
|
||||
param Place = indep | attr ;
|
||||
param Placement = indep | attr ;
|
||||
|
||||
lincat Digit = {s : CardOrd => DForm => Str ; size : Size} ;
|
||||
lincat Sub10 = {s : CardOrd => DForm => Place => Str ; size : Size} ;
|
||||
lincat Sub100 = {s : CardOrd => NumF => Place => Str ; size : Size} ;
|
||||
lincat Sub1000 = {s : CardOrd => NumF => Place => Str ; size : Size} ;
|
||||
lincat Sub1000000 = { s : CardOrd => NumF => Place => Str; size : Size } ;
|
||||
lincat Sub10 = {s : CardOrd => DForm => Placement => Str ; size : Size} ;
|
||||
lincat Sub100 = {s : CardOrd => NumF => Placement => Str ; size : Size} ;
|
||||
lincat Sub1000 = {s : CardOrd => NumF => Placement => Str ; size : Size} ;
|
||||
lincat Sub1000000 = { s : CardOrd => NumF => Placement => Str; size : Size } ;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -48,6 +48,7 @@ lin
|
||||
here7to_Adv = ss "până aici" ;
|
||||
here_Adv = ss "aici" ;
|
||||
how_IAdv = ss "cum" ;
|
||||
how8much_IAdv = ss "cât" ; ---- ? AR
|
||||
how8many_IDet = {s = \\g,c => case <g,c> of
|
||||
{ <Fem,AGenDat> => "câtor"; <Fem,_> => "câte" ;
|
||||
<Masc,AGenDat> => "câtor" ; _ => "câţi"
|
||||
|
||||
Reference in New Issue
Block a user