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

Latvian: fixed some adjective paradigms, changed the default word order in ComplN2

Browse Source 
The issues were unveiled while testing AttemptoLav in a more realistic domain
This commit is contained in:
Normunds Gruzitis
2012-10-23 00:12:36 +00:00
parent c70c01745b
commit 6fb15ecc2f
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/src/latvian/ParadigmsAdjectivesLav.gf
View File

@@ -59,13 +59,13 @@ oper
-- Relative adjective: -ais (Def only); -s, -š (Indef and Def) -- Relative adjective: -ais (Def only); -s, -š (Indef and Def)
mkAdjective_Rel : Str -> Adj = \lemma -> { mkAdjective_Rel : Str -> Adj = \lemma -> {
s = table { s = table {
AAdj Posit Def g n c => mkAdjective_Pos lemma Def ! g ! n ! c; AAdj Posit Def g n c => mkAdjective_Pos lemma Def ! g ! n ! c ;
AAdj Posit Indef g n c => case lemma of { AAdj Posit Indef g n c => case lemma of {
s + "ais" => NON_EXISTENT ; s + "ais" => mkAdjective_Pos lemma Def ! g ! n ! c ;
_ => mkAdjective_Pos lemma Indef ! g ! n ! c _ => mkAdjective_Pos lemma Indef ! g ! n ! c
} ; } ;
AAdj _ _ _ _ _ => NON_EXISTENT ; AAdj _ _ _ _ _ => NON_EXISTENT ;
AAdv d => mkAdjective_Adverb lemma ! d AAdv d => mkAdjective_Adverb lemma ! d
} }
}; };
@@ -97,7 +97,7 @@ oper
Dat => stem + "am" ; Dat => stem + "am" ;
Acc => stem + "u" ; Acc => stem + "u" ;
Loc => stem + "ā" ; Loc => stem + "ā" ;
Voc => NON_EXISTENT Voc => stem + "ais"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "i" ; Nom => stem + "i" ;
@@ -105,7 +105,7 @@ oper
Dat => stem + "iem" ; Dat => stem + "iem" ;
Acc => stem + "us" ; Acc => stem + "us" ;
Loc => stem + "os" ; Loc => stem + "os" ;
Voc => NON_EXISTENT Voc => stem + "ie"
} }
} ; } ;
Fem => table { Fem => table {
@@ -115,7 +115,7 @@ oper
Dat => stem + "ai" ; Dat => stem + "ai" ;
Acc => stem + "u" ; Acc => stem + "u" ;
Loc => stem + "ā" ; Loc => stem + "ā" ;
Voc => NON_EXISTENT Voc => stem + "ā"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "as" ; Nom => stem + "as" ;
@@ -123,7 +123,7 @@ oper
Dat => stem + "ām" ; Dat => stem + "ām" ;
Acc => stem + "as" ; Acc => stem + "as" ;
Loc => stem + "ās" ; Loc => stem + "ās" ;
Voc => NON_EXISTENT Voc => stem + "ās"
} }
} }
} ; } ;
@@ -135,7 +135,7 @@ oper
Dat => case stem of {s + "ēj" => stem + "am" ; _ => stem + "ajam"} ; Dat => case stem of {s + "ēj" => stem + "am" ; _ => stem + "ajam"} ;
Acc => stem + "o" ; Acc => stem + "o" ;
Loc => case stem of {s + "ēj" => stem + "ā" ; _ => stem + "ajā"} ; Loc => case stem of {s + "ēj" => stem + "ā" ; _ => stem + "ajā"} ;
Voc => stem + "ais" Voc => stem + "ais"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "ie" ; Nom => stem + "ie" ;
@@ -143,7 +143,7 @@ oper
Dat => case stem of {s + "ēj" => stem + "iem" ; _ => stem + "ajiem"} ; Dat => case stem of {s + "ēj" => stem + "iem" ; _ => stem + "ajiem"} ;
Acc => stem + "os" ; Acc => stem + "os" ;
Loc => case stem of {s + "ēj" => stem + "os" ; _ => stem + "ajos"} ; Loc => case stem of {s + "ēj" => stem + "os" ; _ => stem + "ajos"} ;
Voc => stem + "ie" Voc => stem + "ie"
} }
} ; } ;
Fem => table { Fem => table {
@@ -153,7 +153,7 @@ oper
Dat => case stem of {s + "ēj" => stem + "ai" ; _ => stem + "ajai"} ; Dat => case stem of {s + "ēj" => stem + "ai" ; _ => stem + "ajai"} ;
Acc => stem + "o" ; Acc => stem + "o" ;
Loc => case stem of {s + "ēj" => stem + "ā" ; _ => stem + "ajā"} ; Loc => case stem of {s + "ēj" => stem + "ā" ; _ => stem + "ajā"} ;
Voc => stem + "ā" Voc => stem + "ā"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "ās" ; Nom => stem + "ās" ;
@@ -161,7 +161,7 @@ oper
Dat => case stem of {s + "ēj" => stem + "ām" ; _ => stem + "ajām"} ; Dat => case stem of {s + "ēj" => stem + "ām" ; _ => stem + "ajām"} ;
Acc => stem + "ās" ; Acc => stem + "ās" ;
Loc => case stem of {s + "ēj" => stem + "ās" ; _ => stem + "ajās"} ; Loc => case stem of {s + "ēj" => stem + "ās" ; _ => stem + "ajās"} ;
Voc => stem + "ās" Voc => stem + "ās"
} }
} }
} }
@@ -179,7 +179,7 @@ oper
Dat => stem + "ākam" ; Dat => stem + "ākam" ;
Acc => stem + "āku" ; Acc => stem + "āku" ;
Loc => stem + "ākā" ; Loc => stem + "ākā" ;
Voc => NON_EXISTENT Voc => stem + "ākais"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "āki" ; Nom => stem + "āki" ;
@@ -187,7 +187,7 @@ oper
Dat => stem + "ākiem" ; Dat => stem + "ākiem" ;
Acc => stem + "ākus" ; Acc => stem + "ākus" ;
Loc => stem + "ākos" ; Loc => stem + "ākos" ;
Voc => NON_EXISTENT Voc => stem + "ākie"
} }
} ; } ;
Fem => table { Fem => table {
@@ -197,7 +197,7 @@ oper
Dat => stem + "ākai" ; Dat => stem + "ākai" ;
Acc => stem + "āku" ; Acc => stem + "āku" ;
Loc => stem + "ākā" ; Loc => stem + "ākā" ;
Voc => NON_EXISTENT Voc => stem + "ākā"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "ākas" ; Nom => stem + "ākas" ;
@@ -205,7 +205,7 @@ oper
Dat => stem + "ākām" ; Dat => stem + "ākām" ;
Acc => stem + "ākas" ; Acc => stem + "ākas" ;
Loc => stem + "ākās" ; Loc => stem + "ākās" ;
Voc => NON_EXISTENT Voc => stem + "ākās"
} }
} }
} ; } ;
@@ -217,7 +217,7 @@ oper
Dat => stem + "ākajam" ; Dat => stem + "ākajam" ;
Acc => stem + "āko" ; Acc => stem + "āko" ;
Loc => stem + "ākajā" ; Loc => stem + "ākajā" ;
Voc => stem + "ākais" Voc => stem + "ākais"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "ākie" ; Nom => stem + "ākie" ;
@@ -225,7 +225,7 @@ oper
Dat => stem + "ākajiem" ; Dat => stem + "ākajiem" ;
Acc => stem + "ākos" ; Acc => stem + "ākos" ;
Loc => stem + "ākajos" ; Loc => stem + "ākajos" ;
Voc => stem + "ākie" Voc => stem + "ākie"
} }
} ; } ;
Fem => table { Fem => table {
@@ -235,7 +235,7 @@ oper
Dat => stem + "ākajai" ; Dat => stem + "ākajai" ;
Acc => stem + "āko" ; Acc => stem + "āko" ;
Loc => stem + "ākajā" ; Loc => stem + "ākajā" ;
Voc => stem + "ākā" Voc => stem + "ākā"
} ; } ;
Pl => table { Pl => table {
Nom => stem + "ākās" ; Nom => stem + "ākās" ;
@@ -243,7 +243,7 @@ oper
Dat => stem + "ākajām" ; Dat => stem + "ākajām" ;
Acc => stem + "ākās" ; Acc => stem + "ākās" ;
Loc => stem + "ākajās" ; Loc => stem + "ākajās" ;
Voc => stem + "ākās" Voc => stem + "ākās"
} }
} }
} }
@@ -255,12 +255,13 @@ oper
-- Adverbial form, all 3 degrees -- Adverbial form, all 3 degrees
mkAdjective_Adverb : Str -> Degree => Str = \lemma -> mkAdjective_Adverb : Str -> Degree => Str = \lemma ->
let stem : Str = case lemma of { let stem : Str = case lemma of {
s + "ais" => s ; s + "ais" => s ;
_ => Predef.tk 1 lemma _ => Predef.tk 1 lemma
} in table { } in table {
Posit => stem + "i"; Posit => stem + "i" ;
Compar => stem + "āk"; Compar => stem + "āk" ;
Superl => "vis" + stem + "āk" Superl => "vis" + stem + "āk"
}; } ;
} ; } ;

2
lib/src/latvian/ParadigmsLav.gf
View File

@@ -48,7 +48,7 @@ oper
} ; } ;
mkN2 = overload { mkN2 = overload {
mkN2 : N -> ResLav.Prep -> N2 = \n,p -> lin N2 n ** { p = p ; isPre = False } ; mkN2 : N -> ResLav.Prep -> N2 = \n,p -> lin N2 n ** { p = p ; isPre = True } ;
mkN2 : N -> ResLav.Prep -> Bool -> N2 = \n,p,isPre -> lin N2 n ** { p = p ; isPre = isPre } ; mkN2 : N -> ResLav.Prep -> Bool -> N2 = \n,p,isPre -> lin N2 n ** { p = p ; isPre = isPre } ;
} ; } ;