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

swadesh adjustments

Browse Source
This commit is contained in:
aarne
2006-02-24 10:12:49 +00:00
parent 9834a25196
commit 94c8a836b2
13 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/stoneage1/StoneageI.gf
View File

@@ -85,7 +85,7 @@ lin
Few = DetCN few_Det ; Few = DetCN few_Det ;
Other = DetCN other_Det ; Other = DetCN other_Det ;
One = DetCN (DetSg one_Quant NoOrd) ; One = DetCN one_Det ;
Two = DetCN (DetPl (PlQuant IndefArt) two_Num NoOrd) ; Two = DetCN (DetPl (PlQuant IndefArt) two_Num NoOrd) ;
Three = DetCN (DetPl (PlQuant IndefArt) three_Num NoOrd) ; Three = DetCN (DetPl (PlQuant IndefArt) three_Num NoOrd) ;
Four = DetCN (DetPl (PlQuant IndefArt) four_Num NoOrd) ; Four = DetCN (DetPl (PlQuant IndefArt) four_Num NoOrd) ;

10
lib/resource-1.0/finnish/MorphoFin.gf
View File

@@ -652,7 +652,6 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
reg2VerbH : (soutaa,souti : Str) -> VerbH = \soutaa,souti -> reg2VerbH : (soutaa,souti : Str) -> VerbH = \soutaa,souti ->
let let
---- soudat = regVerbH soutaa ;
soudan = weakGrade (init soutaa) + "n" ; soudan = weakGrade (init soutaa) + "n" ;
soudin = weakGrade souti + "n" ; soudin = weakGrade souti + "n" ;
souden = init souti + "en" ; souden = init souti + "en" ;
@@ -666,8 +665,8 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
"ata" | "ätä" => vPalkata soutaa souti ; "ata" | "ätä" => vPalkata soutaa souti ;
"ota" | "ötä" => vPudota soutaa souti ; "ota" | "ötä" => vPudota soutaa souti ;
"sta" | "stä" => vJuosta soutaa souden (juo + o+u+"t") (juo + "t"+u) ; "sta" | "stä" => vJuosta soutaa souden (juo + o+u+"t") (juo + "t"+u) ;
_ + ("da" | "dä") => vJuoda soutaa souti _ + ("da" | "dä") => vJuoda soutaa souti ;
---- _ => soudat _ => regVerbH soutaa
} ; } ;
reg3VerbH : (_,_,_ : Str) -> VerbH = \soutaa,soudan,souti -> reg3VerbH : (_,_,_ : Str) -> VerbH = \soutaa,soudan,souti ->
@@ -679,11 +678,10 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
a = last taa ; a = last taa ;
u = ifTok Str a "a" "u" "y" ; u = ifTok Str a "a" "u" "y" ;
soudin = souti + "n" ; ----weakGrade souti + "n" ; soudin = souti + "n" ; ----weakGrade souti + "n" ;
----soudat = reg2VerbH soutaa souti ;
in case taa of { in case taa of {
"lla" | "llä" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ; "lla" | "llä" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ;
"taa" | "tää" => vHuoltaa soutaa soudan souti soudin "taa" | "tää" => vHuoltaa soutaa soudan souti soudin ;
---- _ => soudat _ => reg2VerbH soutaa souti
} ; } ;
-- For "harppoa", "hukkua", "löytyä", with grade alternation. -- For "harppoa", "hukkua", "löytyä", with grade alternation.

2
lib/resource-1.0/italian/LexiconIta.gf
View File

@@ -114,7 +114,7 @@ lin
lose_V2 = dirV2 (verboV (perdere_62 "perdere")) ; lose_V2 = dirV2 (verboV (perdere_62 "perdere")) ;
love_N = regN "amore" ; love_N = regN "amore" ;
love_V2 = dirV2 (regV "amare") ; love_V2 = dirV2 (regV "amare") ;
man_N = regN "uomo" ; man_N = mkN "uomo" "uomini" masculine ;
married_A2 = mkA2 (regA "sposato") dative ; married_A2 = mkA2 (regA "sposato") dative ;
meat_N = femN (regN "carne") ; meat_N = femN (regN "carne") ;
milk_N = regN "latte" ; milk_N = regN "latte" ;

2
lib/resource-1.0/swadesh/Swadesh.gf
View File

@@ -50,7 +50,7 @@ abstract Swadesh = Cat ** {
-- Numerals -- Numerals
one_Num : Num ; one_Det : Det ;
two_Num : Num ; two_Num : Num ;
three_Num : Num ; three_Num : Num ;
four_Num : Num ; four_Num : Num ;

2
lib/resource-1.0/swadesh/SwadeshEng.gf
View File

@@ -52,7 +52,7 @@ concrete SwadeshEng of Swadesh = CatEng
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshFin.gf
View File

@@ -61,7 +61,7 @@ concrete SwadeshFin of Swadesh = CatFin
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshFre.gf
View File

@@ -57,7 +57,7 @@ concrete SwadeshFre of Swadesh = CatFre
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshGer.gf
View File

@@ -52,7 +52,7 @@ concrete SwadeshGer of Swadesh = CatGer
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshIta.gf
View File

@@ -56,7 +56,7 @@ concrete SwadeshIta of Swadesh = CatIta
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshNor.gf
View File

@@ -50,7 +50,7 @@ concrete SwadeshNor of Swadesh = CatNor
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshRus.gf
View File

@@ -52,7 +52,7 @@ flags coding=utf8 ;
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshSpa.gf
View File

@@ -59,7 +59,7 @@ concrete SwadeshSpa of Swadesh = CatSpa
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;

2
lib/resource-1.0/swadesh/SwadeshSwe.gf
View File

@@ -52,7 +52,7 @@ concrete SwadeshSwe of Swadesh = CatSwe
-- Numerals -- Numerals
one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; one_Det = DetSg one_Quant NoOrd ;
two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;