mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
revert the addition of pot5art
This commit is contained in:
@@ -63,7 +63,6 @@ data
|
|||||||
|
|
||||||
pot51 : Sub1000000000000 ; -- a billion instead of one billion
|
pot51 : Sub1000000000000 ; -- a billion instead of one billion
|
||||||
pot5 : Sub1000 -> Sub1000000000000 ; -- m * 1000000000
|
pot5 : Sub1000 -> Sub1000000000000 ; -- m * 1000000000
|
||||||
pot5art : Sub1000000000000 ; -- a/an instead of one
|
|
||||||
pot5plus : Sub1000 -> Sub1000000000 -> Sub1000000000000 ; -- m * 1000000000 + n
|
pot5plus : Sub1000 -> Sub1000000000 -> Sub1000000000000 ; -- m * 1000000000 + n
|
||||||
pot5decimal : Decimal -> Sub1000000000000 ; -- 3.5 billion
|
pot5decimal : Decimal -> Sub1000000000000 ; -- 3.5 billion
|
||||||
|
|
||||||
|
|||||||
@@ -146,10 +146,6 @@ lin pot5 n = {
|
|||||||
} ;
|
} ;
|
||||||
n = Pl
|
n = Pl
|
||||||
} ;
|
} ;
|
||||||
lin pot5art = {
|
|
||||||
s = \\o,_ => "" ;
|
|
||||||
n = Sg
|
|
||||||
} ;
|
|
||||||
lin pot5plus n1 n2 = {
|
lin pot5plus n1 n2 = {
|
||||||
s = \\o,f => (pot5 n1).s ! o ! f ++ "и" ++ n2.s ! o ! f;
|
s = \\o,f => (pot5 n1).s ! o ! f ++ "и" ++ n2.s ! o ! f;
|
||||||
n = Pl
|
n = Pl
|
||||||
|
|||||||
@@ -86,10 +86,6 @@ lin pot5 n = {
|
|||||||
s = \\d,o,c => n.s ! d ! NCard ! Nom ++ pot51.s ! True ! o ! c ;
|
s = \\d,o,c => n.s ! d ! NCard ! Nom ++ pot51.s ! True ! o ! c ;
|
||||||
n = Pl
|
n = Pl
|
||||||
} ;
|
} ;
|
||||||
lin pot5art = {
|
|
||||||
s = \\d,o,c => case d of {True => []; False => artIndef};
|
|
||||||
n = Sg
|
|
||||||
} ;
|
|
||||||
lin pot5plus n1 n2 = {
|
lin pot5plus n1 n2 = {
|
||||||
s = \\d,o,c => n1.s ! d ! NCard ! Nom ++ pot51.s ! True ! NCard ! Nom ++ "and" ++ n2.s ! True ! o ! c;
|
s = \\d,o,c => n1.s ! d ! NCard ! Nom ++ pot51.s ! True ! NCard ! Nom ++ "and" ++ n2.s ! True ! o ! c;
|
||||||
n = Pl
|
n = Pl
|
||||||
|
|||||||
@@ -65,13 +65,6 @@ lin
|
|||||||
numPl (\\g => d.s ! NCard Utr ++ cardOrd "miljoner" "miljonde" ! g) ;
|
numPl (\\g => d.s ! NCard Utr ++ cardOrd "miljoner" "miljonde" ! g) ;
|
||||||
|
|
||||||
pot51 = numPl (cardOrd "miljard" "miljarde") ;
|
pot51 = numPl (cardOrd "miljard" "miljarde") ;
|
||||||
pot5art = {
|
|
||||||
s = table {
|
|
||||||
NCard g => case g of {Neutr => "ett" ; _ => "en"} ;
|
|
||||||
_ => "första"
|
|
||||||
} ;
|
|
||||||
n = Sg
|
|
||||||
} ;
|
|
||||||
pot5 n =
|
pot5 n =
|
||||||
numPl (\\g => n.s ! NCard Utr ++
|
numPl (\\g => n.s ! NCard Utr ++
|
||||||
cardOrd (case n.n of {
|
cardOrd (case n.n of {
|
||||||
|
|||||||
Reference in New Issue
Block a user