From fc4bf051826be0bf40b5482bb18dd9b62aa58565 Mon Sep 17 00:00:00 2001 From: planggard <63806188+planggard@users.noreply.github.com> Date: Sat, 28 Oct 2023 19:12:29 +0200 Subject: [PATCH] Ryddet to regressionsproblemer --- src/cg3/dependency.cg3 | 7 ++++++- src/cg3/functions.cg3 | 5 ++++- src/fst/affixes/derivations-inflections.lexc | 2 +- src/fst/stems/nouns.lexc | 2 +- src/fst/stems/verbs.lexc | 4 ++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/cg3/dependency.cg3 b/src/cg3/dependency.cg3 index 905f2d613..2592df178 100644 --- a/src/cg3/dependency.cg3 +++ b/src/cg3/dependency.cg3 @@ -10524,11 +10524,16 @@ TO (@0 (*)); #MAP:M9968AB @PRED TARGET CONT + NUM + NNGUR IF ( -1 CONT + 3PlO LINK -1 Abs + Pl LINK *-1 CONJ-C OR KOMMA); #Coronavirusimillu toqquteqartutut nalunaarsorneqartut pingasunik ilapput, coronavirusimik toqquteqartut katillugit 697-INNGORLUTIK. -SETPARENT:M9968AN @CL-CIT> + Par + &&IV_SUBJ& +SETPARENT:M9968AH @CL-CIT> + Par + &&IV_SUBJ& (NOT p (*)) TO (1 KOMMA LINK *1A OQARPOQ + VFIN) (*-1 Abs + &&IV_SUBJ& BARRIER (*) - Rel - OBLIQUE)#Amigartooruteqarnissamik saqqummiussineq coronap ilungersunartorsiortitsineranik PEQQUTEQARTOQ, naalakkersuisoq siusinnerusukkut oqarpoq. ; +SETPARENT:M9968AI @CL-CIT> + Par + &&IV_SUBJ& IF +(NOT p (*)) +(*-1 @SUBJ> + &&IV_SUBJ& BARRIER VERB-NOTCONT) +TO (*1 @SUBJ> + Sg BARRIER VERB-NOTCONT LINK *1A OQARPOQ + 3Sg BARRIER VERB-NOTCONT); #Aalajangernerlu ajugaanertut annertuutut OQAATIGISARIAQARTOQ Martin Ben Shalmi oqarpoq. + SETPARENT:M9968AO @i-ADVL> + CONT + TRANSVERB TO (1 VFIN + NIQAR); #Aallakaatitassat siullermik qallunaatuinnaq aallakaatinneqariarlutik kingusinnerusukkut kalaallisut ALLAGARTALERSORLUGIT aallakaatinneqassapput. NB, der må laves noget mere generelt for inderiveringer ved passiver #En snæver MAP-regel, der blokerer Con som inquit ved inquit længere til venstre diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3 index 93280a525..b1eb86e36 100644 --- a/src/cg3/functions.cg3 +++ b/src/cg3/functions.cg3 @@ -10570,8 +10570,11 @@ REMOVE:9968AF @POSS> IF (0 @PRED2 LINK *-1 BOS BARRIER (*) - Adv)(*1 @OBJ> LINK REMOVE:9968AG @SUBJ> + 1Pl IF (*-1 DIRTALESTART LINK *1 _TARGET_ + Par + (/[12][SP][gl]/r)); #Aa, Mosemununa PISUTTUALAARNIARTUGUT, Eskild Emilielu ataatsikkut akipput. -MAP:M9968AN @CL-CIT> TARGET Par + &&IV_SUBJ& IF (1 KOMMA LINK *1 OQARPOQ + VFIN) (*-1 Abs + &&IV_SUBJ& BARRIER (*) - Rel - OBLIQUE)#Amigartooruteqarnissamik saqqummiussineq coronap ilungersunartorsiortitsineranik PEQQUTEQARTOQ, naalakkersuisoq siusinnerusukkut oqarpoq. +MAP:M9968AH @CL-CIT> TARGET Par + &&IV_SUBJ& IF (1 KOMMA LINK *1 OQARPOQ + VFIN) (*-1 Abs + &&IV_SUBJ& BARRIER (*) - Rel - OBLIQUE)#Amigartooruteqarnissamik saqqummiussineq coronap ilungersunartorsiortitsineranik PEQQUTEQARTOQ, naalakkersuisoq siusinnerusukkut oqarpoq. ; + +MAP:M9968AI @CL-CIT> TARGET Par + &&IV_SUBJ& IF (*-1 @SUBJ> + &&IV_SUBJ& BARRIER VERB-NOTCONT)(*1 @SUBJ> + Sg BARRIER VERB-NOTCONT LINK *1 OQARPOQ + 3Sg BARRIER VERB-NOTCONT); #Aalajangernerlu ajugaanertut annertuutut OQAATIGISARIAQARTOQ Martin Ben Shalmi oqarpoq. + MAP:M9968AO @i-ADVL> TARGET CONT + TRANSVERB IF (1 VFIN + NIQAR); #Aallakaatitassat siullermik qallunaatuinnaq aallakaatinneqariarlutik kingusinnerusukkut kalaallisut ALLAGARTALERSORLUGIT aallakaatinneqassapput. NB, der må laves noget mere generelt for inderiveringer ved passiver #En snæver MAP-regel, der blokerer Con som inquit ved inquit længere til venstre MAP:M9968AP @CL-sor HTR_schwa_SAQ_nnip ; +TAAR+Der/vv:%>taar flex-iv ; !+TAAR+Der/vv:%>saar flex-iv ; !PL 20180430 må være forkert i IV_r og kun eksistere i IV_ir -+TAR+Der/vv:%>tar flex-iv ; +!+TAR+Der/vv:%>tar flex-iv ; PL20231028 udkommenteret +TAR+Der/vv+GALLAR+Der/vv:%>tarallar gallar-iv ; +TAR+Der/vv+GALUAR+Der/vv:%>taraluar IV-mod_C ; +TAR+Der/vv+GALUAR+Der/vv+QE+Der/vv:%>taralua%TRUNCq IV-mod_qe ; diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc index 13c8e97e3..2beef8a59 100644 --- a/src/fst/stems/nouns.lexc +++ b/src/fst/stems/nouns.lexc @@ -11148,7 +11148,7 @@ imerpala+Gram/IV+TUUQ+Der/vn:imerpalasooq Z1Zmorf ; imersunnissoq Z1Zmorf ; imertaasisartoq Z1Zmorf ; imertar+Gram/IV+UTE+Der/vn:imertaat tptmorf ; -imertarfeeraq Z1+qaZmorf ; +!imertarfeeraq Z1+qaZmorf ; imertarfinnaaq Z1Zmorf ; imerterut tptmorf ; imeruersaat tptmorf ; diff --git a/src/fst/stems/verbs.lexc b/src/fst/stems/verbs.lexc index c17f80a0e..80b4480b1 100644 --- a/src/fst/stems/verbs.lexc +++ b/src/fst/stems/verbs.lexc @@ -385,6 +385,7 @@ aarsaarnialersar IV_r ; aarsaarusior IV_r ; aarsaarutitaar IV_long ; aasaap HTR_UTE_SSAQ_ssi ; +aasaq+GIP+Der/nv+SI+Der/vv:aasarissi XIi_voqXmorf_stem ; aasaq+GIP+Der/nv+SI+Der/vv+RUTTUR+Der/vv:aasarisseruttor TV-mod_r ; aasaq+GIP+Der/nv+Gram/IV+Gram/IV+TUQ+Der/vn+U+Der/nv+Gram/IV+GE+Der/vv:aasarissuug HTR_schwa_SAQ_nnip ; !De to følgende medtaget som upper-under, da ingen andre ex med aasakkut+U PL 20180422 @@ -4301,6 +4302,7 @@ imerajussi XIi_voqXmorf_stem ; imeratsip XIiXmorf_stem ; imer HTR_r_GAQ_i ; imer IV_r_stem ; !agentiv +imer+Gram/IV+TAR+Der/vv+Gram/IV+VIK+Der/vn+ARAQ+Der/nn+TUR+Der/nv:imertarfeerartor IV_r_stem ; imeriilip XIiXmorf_stem ; imeriilitsip HTR_C_TAQ_tsi ; imerip XIiXmorf_stem ; @@ -4414,6 +4416,7 @@ immeraatige:immeraatig HTR_schwa_SAQ_nnip ; immeraataa IV_voq_stem ; immialler XIirXmorf_stem ; immialaalior IV_r_stem ; +immiaq+TUR+Der/nv+Gram/IV+Gram/IV+VIK+Der/vn+TUR+Der/nv:immiartorfittor IV_r_stem ; immiarsiare:immiarsiar HTR_schwa_SAQ_nnip ; immiarsi XIi_voqXmorf_stem ; immiare:immiar HTR_schwa_SAQ_nnip ; @@ -6096,6 +6099,7 @@ iveruser XIirXmorf_stem ; iverutaarser XIirXmorf_stem ; iver XIirXmorf_stem ; iviangeersip XIitX_stem ; +iviangeq+TUR+Der/nv:ivangertor IV_r_stem ; iviangersior HTR_r_GAQ_i ; ivigar IV_r_stem ; ivigartariar IV_r_stem ;