From a28341b24d4d34775400795baa96ecf9180cc2d1 Mon Sep 17 00:00:00 2001 From: KennyMcFly <35669096+KennyMcFly@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:15:51 +0200 Subject: [PATCH] disam, func og dep --- src/cg3/dep_KalEng.cg3 | 6 +++--- src/cg3/disambiguator.cg3 | 19 +++++++++++++++---- src/cg3/functions.cg3 | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/cg3/dep_KalEng.cg3 b/src/cg3/dep_KalEng.cg3 index 470c7084b..b96d62707 100644 --- a/src/cg3/dep_KalEng.cg3 +++ b/src/cg3/dep_KalEng.cg3 @@ -11152,9 +11152,9 @@ SETPARENT:M9970FA @N< + (Abs Sg) IF (NOT p (*)) TO (*1 3SgO BARRIER (*) - Adv LINK *-1 _TARGET_ + (/TUQ\ Der/vn\ N/l) LINK *-1A (Abs Sg) - ADJEKTIVISK - Der/vn BARRIER (*) - CONT - OBLIQUE); #PL20230118 Imaq qatsungalluni aqerlumut kuisamut EQQAANARSIINNARSIMASOQ suli kusanarnerulersinniarlugu seqernup qinngussaminik kissartunik qinngorfigalugu sølvitut qillaruummisaartuinnanngortissimavaa, taamaallunilu tasamannga qeqertarpassuit tungaannaannit imeqqutaallat piaqqiorlualersimasut erinarsorpalaavat tutsiutiimmeraraaq: -#SETPARENT:M9970FD @N< + TUQ + $$KASUS + $$NUMERUS -#(NOT p (*)) -#TO (*-1 N + $$KASUS + $$NUMERUS BARRIER (*) - CONT - OBLIQUE); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ. +SETPARENT:M9970FD @N< + TUQ + $$KASUS + $$NUMERUS +(NOT p (*)) +TO (*-1 N + $$KASUS + $$NUMERUS LINK 1 V); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ. SETPARENT:M9970FE @ADVL> + (/INNAQ\ Der/vn\ N\ Abs\ Sg/l) (NOT p (*)) diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3 index 8a8484dac..647880a0a 100644 --- a/src/cg3/disambiguator.cg3 +++ b/src/cg3/disambiguator.cg3 @@ -2469,12 +2469,17 @@ REMOVE:MorfIrniar0001 (*) - iSem/Aich - iSem/B - iSem/Btree - (/iSem/cloH.*/r) - #KKUMINAR #LIAR REMOVE:MorfLoc0001 (*) - LOCN (0 LocVr) -(NEGATE 0 (/Dial/.*/r)) ; #Jude 20231013 +(NEGATE 0 (/Dial/.*/r)) #Jude 20231013 +(NEGATE 0 iProp) #KW16102023 #Sukkut tamaana Ilimmarfiliartarpunga. +(NEGATE 0 ("ikili")); #KW16102023 #Ikiaroornartulerisup nukappiaraatai amerliartortillugit suliassakka IKILIARTORPUT. REMOVE:MorfLoc0002 (*) - LOCSEM (0 LocVr) -(NEGATE 0 (/Dial/.*/r)) ; #Jude 20231013 +(NEGATE 0 (/Dial/.*/r)) #Jude 20231013 +(NEGATE 0 ("ikili")); #KW16102023 #Ikiaroornartulerisup nukappiaraatai amerliartortillugit suliassakka IKILIARTORPUT. REMOVE:MorfLoc0003 (*) - LocLex (0 LocVr) ; #Jude 20231013 REMOVE:MorfLoc0004 (*) - LOCSEM (1 LocVr) ; #Jude 20231013 -REMOVE:MorfLoc0005 (*) - LocSuf (0 LocVr) ; #Jude 20231013 +REMOVE:MorfLoc0005 (*) - LocSuf (0 LocVr) #Jude 20231013 +(NEGATE 0 iProp) #KW16102023 #Sukkut tamaana Ilimmarfiliartarpunga. +(NEGATE 0 ("ikili")); #KW16102023 #Ikiaroornartulerisup nukappiaraatai amerliartortillugit suliassakka IKILIARTORPUT. REMOVE:MorfLoc0006 (*) - SEM/L (1 LocB) ; #Jude 20231013 REMOVE:MorfLoc0007 (*) - iProp (0 LocVr) ; #Jude 20231013 REMOVE:MorfLoc0008 SEM/inst (0 SEM/Hprof + LocSuf + LocVr) ; #Jude 20231013 @@ -2764,6 +2769,9 @@ REMOVE:tidlig0014 ("kiisa" Adv LU) IF (0 ("kiisalu")); #En radikal regel baseret REMOVE:tidlig0015 (/"ili"\ Gram/TV\ QQU/l) IF (0 ("ileqqoq")); +REMOVE:tidlig0016 GE IF (0 Par + 3Sg + 3SgO LINK NOT *0 VFIN)(*0W Par LINK NOT *0 VFIN - GE)(@1< (*)) #Anaanap glassi ERRORTORAA. Glassi ILIGAA. Imeq kuuttoq. Qapuk. Qaqortoq. Qapuk qaqortoq. Glassi allarteraa. Nipaa.. #må stå før reglerne der fjerner Par +(NEGATE 0 ("ila") + GE); #fordi sidste del af reglen ikke virker i regressionen + REMOVE:tidlig0019A Abs (0 Rel) (1 ("kinguneq") OR ("kingorna")) (NOT 0 TUQ) ; REMOVE:tidlig0019B1 ("kingorna") + Pali IF (0 (/"kinguneq"\ N\ Abs\ Sg\ 3SgPoss/l) LINK -1 Rel + Sg); @@ -3631,6 +3639,7 @@ SUBSTITUTE:adv5lix LI ADV-LI TARGET LI IF (0 Abs + SEASON) #upernaarli (NEGATE -1 KOMMA)# .. atorfinippoq, UKIORLI ataaseq qaangiuttoq .. ; SUBSTITUTE:adv6lix LI ADV-LI TARGET LI IF (0 Aeq - ("taama") - ("ima")) #Titartagarali kingulleq ILAATULLI aamma tassa naammaginngilaa. +(NEGATE 0 (/LI\ Der/vv/l)) (NEGATE -1 KOMMA)#Kiisa palasi ilungersuanermit qaamigut aallilerpoq, soormimiuna aamma niuertussap taama isigitigigaani, ALLATULLI ajornaqimmat iluarisaannarminik oqalulluni aallartippoq. ; SUBSTITUTE:adv7lix LI ADV-LI TARGET LI IF (0 (/NIQ\ Der/vn\ N\ Abl/l) LINK *1 V) @@ -11652,6 +11661,8 @@ REMOVE:9969BM ("taama") + IP + Gram/TV IF (0 Gram/IV + $$PN LINK *1 V + $$PN); # SELECT:9969BN V + 1Sg + 2SgO IF (*0 VFIN + 1Sg + 2SgO); #Immineerpakkit ASAGAKKIT. +SELECT:9969BO Par IF (*-1 ("soorlu") + Conj BARRIER Par OR Abs); #Soorlu atorsinnaanngitsumik QIVIAGAQARTOQ. #må ikke ramme @N< som i "soorlu uumasoq miaggoortoq" + ################################################## #Specifikke regler til disambiguering af Gram/Db vs. Gram/Db @@ -11826,7 +11837,7 @@ SELECT:9975E Nom + $$PN IF (*-1W $$PN); #Anaanapalaajuvutit! Kisivit! REMOVE:9975F Par IF (0 TUQ LINK NOT *0 V LINK *-1 BOS LINK *-1W N LINK NOT *0 V); #Asanninnipalaavik asanninnipalaaq! MAQAASITITSISOQ. SUMIGINNAASOQ. KISERLIORTITSISOQ. Anaq! Sooq uanga?? Neriuutaaruppunga. -REMOVE:9975G Par IF (0 TUQ LINK NOT *0 V LINK *-1 BOS LINK *-1W (*) LINK NOT *0 Par); #fjern Par når det kan være @HNOUN og der ikke er andre Par i sætningerne ved siden af, hvor det her ellers kunne være en elliptisk fortsættelse. #kan man skrive reglen mere praktisk? +REMOVE:9975G Par IF (0 TUQ LINK NOT *0 V)(@1< (*) LINK NOT *0 Par); #fjern Par når det kan være @HNOUN og der ikke er andre Par i sætningerne ved siden af, hvor det her ellers kunne være en elliptisk fortsættelse. SELECT:9975H 2Pl IF (0 2Sg LINK *-1W 2Pl LINK NOT *0 2Sg); #Suliaqartariaqarpusi, taamannarsuarmi akissarsiaqarpusi! Iluamik SULLITTARIAQARPATSIGUT!” diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3 index 14c0ae770..6e6a836be 100644 --- a/src/cg3/functions.cg3 +++ b/src/cg3/functions.cg3 @@ -11068,7 +11068,7 @@ MAP:M9970FC @N< TARGET SUAR + Gram/Exclm; #Meerakasik atorfissaqanngitsoq SIANII #SUBSTITUTE:S9970C (@ADVL>) (@MIK-OBJ>) TARGET Trm IF (1 HTR + MUT-OBJ_SUBSTANDARD LINK NEGATE *-1 (/@\(i-\)?MIK-OBJ>/r) BARRIER VFIN); -#MAP:M9970FD @N< TARGET TUQ + $$KASUS + $$NUMERUS (*-1 N + $$KASUS + $$NUMERUS BARRIER (*) - CONT - OBLIQUE); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ. +MAP:M9970FD @N< TARGET TUQ + $$KASUS + $$NUMERUS (*-1 N + $$KASUS + $$NUMERUS LINK 1 V); #Arsugap poortugaq takuaa nerriviup QAAVANIITTOQ. MAP:M9970FE @ADVL> TARGET (/INNAQ\ Der/vn\ N\ Abs\ Sg/l) (*1 V); #Igaffimmut aallarama TOQQAANNAQ kissaaviup tungaanut aallarpunga.