GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-20 00:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed numeral agreement and some French verbs

Browse Source
This commit is contained in:
aarne
2005-03-14 09:46:22 +00:00
parent 049e8deca9
commit 4ee07b156e
18 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/resource/swedish/MorphoSwe.gf
View File

@@ -1246,4 +1246,7 @@ oper
regTal : Str -> LinDigit = \fem ->
mkTal fem (fem + "ton") (fem + "tio") ;
numPl : Str -> {s : Gender => Str ; n : Number} = \n ->
{s = \\_ => n ; n = Pl} ;
}

33
lib/resource/swedish/NumeralsSwe.gf
View File

@@ -1,9 +1,12 @@
concrete NumeralsSwe of Numerals = open MorphoSwe, Prelude in {
lincat
Numeral = { s : Str } ;
Numeral = {s : Gender => Str ; n : Number} ;
Digit = {s : DForm => Str} ;
Sub10 = {s : DForm => Str} ;
Sub10 = {s : DForm => Gender => Str ; n : Number} ;
Sub100 = {s : Gender => Str ; n : Number} ;
Sub1000 = {s : Gender => Str ; n : Number} ;
Sub1000000 = {s : Gender => Str ; n : Number} ;
lin
num x = x ;
@@ -17,19 +20,19 @@ lin
n8 = mkTal "åtta" "arton" "åttio" ;
n9 = mkTal "nio" "nitton" "nittio" ;
pot01 = {s = table {f => "ett"}} ;
pot0 d = {s = table {f => d.s ! f}} ;
pot110 = ss "tio" ;
pot111 = ss "elva" ;
pot1to19 d = ss (d.s ! ton) ;
pot0as1 n = ss (n.s ! ental) ;
pot1 d = ss (d.s ! tiotal) ;
pot1plus d e = ss (d.s ! tiotal ++ e.s ! ental) ;
pot01 = {s = table {f => table {Neutr => "ett" ; _ => "en"}} ; n = Sg} ;
pot0 d = {s = \\f,g => d.s ! f ; n = Pl} ;
pot110 = numPl "tio" ;
pot111 = numPl "elva" ;
pot1to19 d = numPl (d.s ! ton) ;
pot0as1 n = {s = n.s ! ental ; n = n.n} ;
pot1 d = numPl (d.s ! tiotal) ;
pot1plus d e = {s = \\g => d.s ! tiotal ++ e.s ! ental ! g ; n = Pl} ;
pot1as2 n = n ;
pot2 d = ss (d.s ! ental ++ "hundra") ;
pot2plus d e = ss (d.s ! ental ++ "hundra" ++ e.s) ;
pot2 d = numPl (d.s ! ental ! Neutr ++ "hundra") ;
pot2plus d e = {s = \\g => d.s ! ental ! Neutr ++ "hundra" ++ e.s ! g ; n = Pl} ;
pot2as3 n = n ;
pot3 n = ss (n.s ++ "tusen") ;
pot3plus n m = ss (n.s ++ "tusen" ++ m.s) ;
pot3 n = numPl (n.s ! Neutr ++ "tusen") ;
pot3plus n m = {s = \\g => n.s ! Neutr ++ "tusen" ++ m.s ! g ; n = Pl} ;
}
}

3
lib/resource/swedish/StructuralSwe.gf
View File

@@ -12,7 +12,8 @@ concrete StructuralSwe of Structural =
lin
UseNumeral i = {s = table {Nom => i.s ; Gen => i.s ++ "s"}} ; ---
UseNumeral i = {s = \\g => table {Nom => i.s ! g ; Gen => i.s ! g ++
"s"} ; n = i.n} ; ---
above_Prep = ss "ovanför" ;
after_Prep = ss "efter" ;