From 5cb67dadbfbb0ccaae959b93f6cff4a783f13990 Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Thu, 28 Aug 2025 19:35:49 +0200 Subject: [PATCH] NON_EXISTANT -> nonExist --- src/latvian/AdverbLav.gf | 2 +- src/latvian/IdiomLav.gf | 4 +- src/latvian/ParadigmsAdjectivesLav.gf | 6 +- src/latvian/ParadigmsNounsLav.gf | 10 ++-- src/latvian/ParadigmsPronounsLav.gf | 22 +++---- src/latvian/ParadigmsVerbsLav.gf | 82 +++++++++++++-------------- src/latvian/RelativeLav.gf | 2 +- src/latvian/ResLav.gf | 2 - src/latvian/SentenceLav.gf | 2 +- src/latvian/StructuralLav.gf | 12 ++-- src/latvian/VerbLav.gf | 2 +- 11 files changed, 72 insertions(+), 74 deletions(-) diff --git a/src/latvian/AdverbLav.gf b/src/latvian/AdverbLav.gf index c7f65c8c..5fcce560 100644 --- a/src/latvian/AdverbLav.gf +++ b/src/latvian/AdverbLav.gf @@ -43,7 +43,7 @@ lin AdnCAdv cadv = { s = case cadv.deg of { Posit => cadv.s ++ cadv.prep ; - _ => NON_EXISTENT + _ => nonExist } } ; diff --git a/src/latvian/IdiomLav.gf b/src/latvian/IdiomLav.gf index 81261282..4758a1b6 100644 --- a/src/latvian/IdiomLav.gf +++ b/src/latvian/IdiomLav.gf @@ -57,7 +57,7 @@ lin } ; -- FIXME: placeholder - CleftNP np rs = { s = \\_,_ => NON_EXISTENT } ; - CleftAdv ad s = { s = \\_,_ => NON_EXISTENT } ; + CleftNP np rs = { s = \\_,_ => nonExist } ; + CleftAdv ad s = { s = \\_,_ => nonExist } ; } diff --git a/src/latvian/ParadigmsAdjectivesLav.gf b/src/latvian/ParadigmsAdjectivesLav.gf index 30c74666..53dfbf44 100644 --- a/src/latvian/ParadigmsAdjectivesLav.gf +++ b/src/latvian/ParadigmsAdjectivesLav.gf @@ -8,7 +8,7 @@ oper -- ADJECTIVES - -- TODO: Parameters and paradigms should be redesigned due to the many NON_EXISTENT forms..? + -- TODO: Parameters and paradigms should be redesigned due to the many nonExist forms..? -- To keep the code and user interface (parameters) simple, Masc lemmas are expected. @@ -56,7 +56,7 @@ oper s + "ais" => mkAdjective_Pos lemma Def ! g ! n ! c ; _ => mkAdjective_Pos lemma Indef ! g ! n ! c } ; - AAdj _ _ _ _ _ => NON_EXISTENT ; + AAdj _ _ _ _ _ => nonExist ; AAdv d => mkAdjective_Adverb lemma ! d } }; @@ -69,7 +69,7 @@ oper mkAdjective_Participle : Verb -> Voice -> Adjective = \v,p -> { s = table { AAdj Posit Indef g n c => v.s ! Pos ! (VPart p g n c) ; - _ => NON_EXISTENT + _ => nonExist } }; diff --git a/src/latvian/ParadigmsNounsLav.gf b/src/latvian/ParadigmsNounsLav.gf index 5085dcca..f2d764ec 100644 --- a/src/latvian/ParadigmsNounsLav.gf +++ b/src/latvian/ParadigmsNounsLav.gf @@ -257,7 +257,7 @@ oper in { s = table { Sg => case stem of { - #exception_D6 => \\_ => NON_EXISTENT ; + #exception_D6 => \\_ => nonExist ; _ => table { Nom => stem + "s" ; Gen => stem + "s" ; @@ -288,17 +288,17 @@ oper Sg => table { Nom => stem + "šanās" ; Gen => stem + "šanās" ; - Dat => NON_EXISTENT ; + Dat => nonExist ; Acc => stem + "šanos" ; - Loc => NON_EXISTENT ; + Loc => nonExist ; Voc => stem + "šanās" } ; Pl => table { Nom => stem + "šanās" ; Gen => stem + "šanos" ; - Dat => NON_EXISTENT ; + Dat => nonExist ; Acc => stem + "šanās" ; - Loc => NON_EXISTENT ; + Loc => nonExist ; Voc => stem + "šanās" } } ; diff --git a/src/latvian/ParadigmsPronounsLav.gf b/src/latvian/ParadigmsPronounsLav.gf index c2e1d87c..0fcc696a 100644 --- a/src/latvian/ParadigmsPronounsLav.gf +++ b/src/latvian/ParadigmsPronounsLav.gf @@ -17,7 +17,7 @@ oper Dat => "man" ; Acc => "mani" ; Loc => "manī" ; - Voc => NON_EXISTENT + Voc => nonExist } ; agr = AgrP1 Sg gend ; poss = table { @@ -68,7 +68,7 @@ oper Dat => "mums" ; Acc => "mūs" ; Loc => "mūsos" ; - Voc => NON_EXISTENT + Voc => nonExist } ; agr = AgrP1 Pl gend ; poss = \\_,_,_ => "mūsu" ; @@ -188,7 +188,7 @@ oper Dat => stem + "am" ; Acc => stem + "u" ; Loc => stem + "ā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => table { Nom => stem + "i" ; @@ -196,7 +196,7 @@ oper Dat => stem + "iem" ; Acc => stem + "us" ; Loc => stem + "os" ; - Voc => NON_EXISTENT + Voc => nonExist } } ; Fem => table { @@ -206,7 +206,7 @@ oper Dat => stem + "ai" ; Acc => stem + "u" ; Loc => stem + "ā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => table { Nom => stem + "as" ; @@ -214,7 +214,7 @@ oper Dat => stem + "ām" ; Acc => stem + "as" ; Loc => stem + "ās" ; - Voc => NON_EXISTENT + Voc => nonExist } } } ; @@ -236,7 +236,7 @@ oper Dat => stem + suff1 + "m" ; Acc => stem + "o" ; Loc => stem + "ajā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => table { Nom => stem + "ie" ; @@ -244,7 +244,7 @@ oper Dat => stem + "iem" ; Acc => stem + "os" ; Loc => stem + "ajos" ; - Voc => NON_EXISTENT + Voc => nonExist } } ; Fem => table { @@ -254,7 +254,7 @@ oper Dat => stem + "ai" ; Acc => stem + "o" ; Loc => stem + "ajā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => table { Nom => stem + suff2 + "s" ; @@ -262,7 +262,7 @@ oper Dat => stem + suff2 + "m" ; Acc => stem + suff2 + "s" ; Loc => stem + "ajās" ; - Voc => NON_EXISTENT + Voc => nonExist } } } ; @@ -278,7 +278,7 @@ oper Dat => case stem of { "kaut" => stem ++ "kam" ; _ => stem + "kam" } ; Acc => case stem of { "kaut" => stem ++ "ko" ; _ => stem + "ko" } ; Loc => case stem of { "kaut" => stem ++ "kur" ; _ => stem + "kur" } ; - Voc => NON_EXISTENT + Voc => nonExist } ! c ; agr = AgrP3 Sg Masc ; poss = \\_,_,_ => case stem of { "kaut" => stem ++ "kā" ; _ => stem + "kā" } ; diff --git a/src/latvian/ParadigmsVerbsLav.gf b/src/latvian/ParadigmsVerbsLav.gf index e387625e..7eff7417 100644 --- a/src/latvian/ParadigmsVerbsLav.gf +++ b/src/latvian/ParadigmsVerbsLav.gf @@ -54,8 +54,8 @@ oper filter_Neg : Verb_TMP -> Verb_TMP = \full -> { s = table { - VDeb => NON_EXISTENT ; - VDebRel => NON_EXISTENT ; + VDeb => nonExist ; + VDebRel => nonExist ; x => full.s ! x } } ; @@ -96,8 +96,8 @@ oper VRel Pres => stem2 + "ot" ; VRel Fut => pal_C1_1 stem3 stem1 + "šot" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => "jā" + stem2 ; VDebRel => "jā" + stem2 + "ot" ; @@ -142,8 +142,8 @@ oper VRel Pres => stem + "jot" ; VRel Fut => stem + "šot" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => "jā" + stem ; VDebRel => "jā" + stem + "jot" ; @@ -188,8 +188,8 @@ oper VRel Pres => pal_C3_1 stem + "ot" ; VRel Fut => stem + "šot" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => pal_C3_3 stem ; VDebRel => pal_C3_3 stem + "ot" ; @@ -238,8 +238,8 @@ oper VRel Pres => stem2 + "oties" ; VRel Fut => pal_C1_1 stem3 stem1 + "šoties" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => "jā" + stem2 + "as" ; VDebRel => "jā" + stem2 + "oties" ; @@ -284,8 +284,8 @@ oper VRel Pres => stem + "joties" ; VRel Fut => stem + "šoties" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => "jā" + stem + "jas" ; VDebRel => "jā" + stem + "joties" ; @@ -330,8 +330,8 @@ oper VRel Pres => pal_C3_1 stem + "oties" ; VRel Fut => stem + "šoties" ; - VRel Past => NON_EXISTENT ; - VRel Cond => NON_EXISTENT ; + VRel Past => nonExist ; + VRel Cond => nonExist ; VDeb => pal_C3_6 stem + "s" ; VDebRel => pal_C3_6 stem + "oties" ; @@ -372,8 +372,8 @@ oper VInd P2 Sg Pres => "neesi" ; VInd P3 _ Pres => "nav" ; - VDeb => NON_EXISTENT ; - VDebRel => NON_EXISTENT ; + VDeb => nonExist ; + VDebRel => nonExist ; x => (mkVerb_C1 "nebūt" "neesu" "nebiju").s ! x -- the incorrect 'neesu' will be overriden } @@ -392,8 +392,8 @@ oper } ; Neg => table { VInd P3 _ Pres => "ne" + pref + "iet" ; - VDeb => NON_EXISTENT ; - VDebRel => NON_EXISTENT ; + VDeb => nonExist ; + VDebRel => nonExist ; x => (mkVerb_C1 ("ne" + pref + "iet") ("ne" + pref + "eju") ("ne" + pref + "gāju")).s ! x } } ; @@ -422,9 +422,9 @@ oper VRel Pres => (mkVerb_C3 "neguļēt").s ! VRel Pres ; - VDeb => NON_EXISTENT ; + VDeb => nonExist ; - VDebRel => NON_EXISTENT ; + VDebRel => nonExist ; x => (mkVerb_C3 "negulēt").s ! x } @@ -557,7 +557,7 @@ oper Dat => stem + "ušam" ; Acc => stem + "ušu" ; Loc => stem + "ušā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => case c of { Nom => stem + "uši" ; @@ -565,7 +565,7 @@ oper Dat => stem + "ušiem" ; Acc => stem + "ušus" ; Loc => stem + "ušos" ; - Voc => NON_EXISTENT + Voc => nonExist } } ; Fem => case n of { @@ -575,7 +575,7 @@ oper Dat => stem + "ušai" ; Acc => stem + "ušu" ; Loc => stem + "ušā" ; - Voc => NON_EXISTENT + Voc => nonExist } ; Pl => case c of { Nom => stem + "ušas" ; @@ -583,7 +583,7 @@ oper Dat => stem + "ušām" ; Acc => stem + "ušas" ; Loc => stem + "ušās" ; - Voc => NON_EXISTENT + Voc => nonExist } } } ; @@ -597,7 +597,7 @@ oper Dat => stem + "tam" ; Acc => stem + "tu" ; Loc => stem + "tā" ; - Voc => NON_EXISTENT -- FIXME: -tais ? + Voc => nonExist -- FIXME: -tais ? } ; Pl => case c of { Nom => stem + "ti" ; @@ -605,7 +605,7 @@ oper Dat => stem + "tiem" ; Acc => stem + "tus" ; Loc => stem + "tos" ; - Voc => NON_EXISTENT -- FIXME: -tie ? + Voc => nonExist -- FIXME: -tie ? } } ; Fem => case n of { @@ -615,7 +615,7 @@ oper Dat => stem + "tai" ; Acc => stem + "tu" ; Loc => stem + "tā" ; - Voc => NON_EXISTENT -- FIXME: -tā ? + Voc => nonExist -- FIXME: -tā ? } ; Pl => case c of { Nom => stem + "tas" ; @@ -623,7 +623,7 @@ oper Dat => stem + "tām" ; Acc => stem + "tas" ; Loc => stem + "tās" ; - Voc => NON_EXISTENT -- FIXME: -tās ? + Voc => nonExist -- FIXME: -tās ? } } } ; @@ -633,37 +633,37 @@ oper Masc => case n of { Sg => case c of { Nom => stem + "ies" ; - Gen => NON_EXISTENT ; - Dat => NON_EXISTENT ; + Gen => nonExist ; + Dat => nonExist ; Acc => stem + "ušos" ; - Loc => NON_EXISTENT ; - Voc => NON_EXISTENT + Loc => nonExist ; + Voc => nonExist } ; Pl => case c of { Nom => stem + "ušies" ; Gen => stem + "ušos" ; - Dat => NON_EXISTENT ; + Dat => nonExist ; Acc => stem + "ušos" ; - Loc => NON_EXISTENT ; - Voc => NON_EXISTENT + Loc => nonExist ; + Voc => nonExist } } ; Fem => case n of { Sg => case c of { Nom => stem + "usies" ; Gen => stem + "ušās" ; - Dat => NON_EXISTENT ; + Dat => nonExist ; Acc => stem + "ušos" ; - Loc => NON_EXISTENT ; - Voc => NON_EXISTENT + Loc => nonExist ; + Voc => nonExist } ; Pl => case c of { Nom => stem + "ušās" ; Gen => stem + "ušos" ; - Dat => NON_EXISTENT ; + Dat => nonExist ; Acc => stem + "ušos" ; - Loc => NON_EXISTENT ; - Voc => NON_EXISTENT + Loc => nonExist ; + Voc => nonExist } } } ; diff --git a/src/latvian/RelativeLav.gf b/src/latvian/RelativeLav.gf index 9190bede..77cc05f7 100644 --- a/src/latvian/RelativeLav.gf +++ b/src/latvian/RelativeLav.gf @@ -63,7 +63,7 @@ lin Dat => "kam" ; Acc => "ko" ; Loc => "kur" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } } ; diff --git a/src/latvian/ResLav.gf b/src/latvian/ResLav.gf index fc96defe..50528e8f 100644 --- a/src/latvian/ResLav.gf +++ b/src/latvian/ResLav.gf @@ -160,6 +160,4 @@ oper prefix : pattern Str = #("aiz"|"ap"|"at"|"ie"|"iz"|"no"|"pa"|"pār"|"pie"|"sa"|"uz") ; - NON_EXISTENT : Str = "NON_EXISTENT" ; - } diff --git a/src/latvian/SentenceLav.gf b/src/latvian/SentenceLav.gf index 8c7c8c57..1248c1ec 100644 --- a/src/latvian/SentenceLav.gf +++ b/src/latvian/SentenceLav.gf @@ -62,7 +62,7 @@ lin UseSlash t p slash = { s = t.s ++ p.s ++ slash.s ! (Ind t.a t.t) ! p.p ; prep = slash.prep } ; -- FIXME: placeholder - AdvS a s = { s = NON_EXISTENT } ; + AdvS a s = { s = nonExist } ; oper -- TODO: PassV2 verbs jāsaskaņo ar objektu, nevis subjektu (by8means_Prep: AgP3 Sg Masc) diff --git a/src/latvian/StructuralLav.gf b/src/latvian/StructuralLav.gf index 577ff1ef..ff5ef842 100644 --- a/src/latvian/StructuralLav.gf +++ b/src/latvian/StructuralLav.gf @@ -176,7 +176,7 @@ lin Dat => "kuram" ; Acc => "kuru" ; Loc => "kurā" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } ; num = Sg } ; @@ -188,7 +188,7 @@ lin Dat => "kuriem" ; Acc => "kurus" ; Loc => "kuros" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } ; num = Pl } ; @@ -200,7 +200,7 @@ lin Dat => "kam" ; Acc => "ko" ; Loc => "kur" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } ; num = Sg } ; @@ -212,7 +212,7 @@ lin Dat => "kam" ; Acc => "ko" ; Loc => "kur" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } ; num = Pl } ; @@ -271,12 +271,12 @@ lin oper reflPron : Case => Str = table { - Nom => NON_EXISTENT ; + Nom => nonExist ; Gen => "sevis" ; Dat => "sev" ; Acc => "sevi" ; Loc => "sevī" ; - ResLav.Voc => NON_EXISTENT + ResLav.Voc => nonExist } ; lai_Subj = ss "lai" ; diff --git a/src/latvian/VerbLav.gf b/src/latvian/VerbLav.gf index f936e78e..7353e695 100644 --- a/src/latvian/VerbLav.gf +++ b/src/latvian/VerbLav.gf @@ -330,7 +330,7 @@ oper Ind Anter tense => (mkV "būt").s ! finalPol ! (VInd agr.pers agr.num tense) ++ part ; --# notpresent -- FIXME(?): Rel _ Past => ... - Rel _ Past => NON_EXISTENT ; --# notpresent + Rel _ Past => nonExist ; --# notpresent Rel Simul tense => v.s ! finalPol ! (VRel tense) ; --# notpresent Rel Anter tense => (mkV "būt").s ! finalPol ! (VRel tense) ++ part ; --# notpresent