Skip to content

Commit

Permalink
Revert "fiksa matching av numeralfraserettinger"
Browse files Browse the repository at this point in the history 
This reverts commit b523a7b.

No longer needed, since MAP:LOCK_READING after SUBSTITUTE fixes it
  • Loading branch information
@unhammer
unhammer committed Jun 24, 2024
1 parent 383c9bf commit 2a0e418
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions tools/grammarcheckers/grammarchecker.cg3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4091,10 +4091,10 @@ ADD:xmsyn-numphrase-sgine (&msyn-numphrase-sgine) TARGET (Pl Ine) OR (Sg Com) IF
## Mij lip NSRan  guhkev juo berustam, ja ájn berustip, nannit aktijvuodav sámij gaskan divna niellja rijkajn duola degu konkrehtalasj aktisasjbargo baktu.
## makkár rahtjamusá li nielje sámegielajn

ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Pl Ine) OR (Sg Com) OR (Pl Gen) OR (Pl Com) IF ((0 N) OR (0 NUMUNIT LINK NOT 1 N - Sem/Plc)) (*-1 (Num Sg Ine) OR (Num Arab Ine) OR (Num Pl Nom) OR (Num Sg Acc) OR (Num Sg Nom) OR (Num Sg Gen) OR (Num Sg Com) OR ("moadda" Indef Acc) BARRIER NOT-Attr - Gen LINK NOT 0 (N Coll Nom) OR Sem/Year OR Sem/Time OR Sem/Date LINK NEGATE -1 Sem/Curr) (NEGATE 0 PL-PAIR-N LINK *-1 (Num Pl) BARRIER NOT-Attr) (NEGATE -1 Sem/Time) (NEGATE 0 NUMUNIT LINK 1 N) (NEGATE *-1 (Num Sg Ine) BARRIER NOT-NPMOD) (NEGATE 1 Po OR (N Ill) OR (N Nom)) (NEGATE 1 (N Gen) LINK 1 Po) (NEGATE *1 Po BARRIER (*) - CC - Gen - (N Pl Nom)) (NEGATE 0 (Pl Com) LINK -1 (Sg Gen) LINK *-1 (Num Sg Nom) OR (Num Sg Acc) BARRIER NOT-NPMOD) (NEGATE 0 (Sg Com) LINK -1 (Num Sg Com) LINK NOT -1 Dem);
ADD:xmsyn-numphrase-sgine (&msyn-numphrase-sgcom) TARGET (Pl Ine) OR (Sg Com) OR (Pl Gen) OR (Pl Com) IF ((0 N) OR (0 NUMUNIT LINK NOT 1 N - Sem/Plc)) (*-1 (Num Sg Ine) OR (Num Arab Ine) OR (Num Pl Nom) OR (Num Sg Acc) OR (Num Sg Nom) OR (Num Sg Gen) OR (Num Sg Com) OR ("moadda" Indef Acc) BARRIER NOT-Attr - Gen LINK NOT 0 (N Coll Nom) OR Sem/Year OR Sem/Time OR Sem/Date LINK NEGATE -1 Sem/Curr) (NEGATE 0 PL-PAIR-N LINK *-1 (Num Pl) BARRIER NOT-Attr) (NEGATE -1 Sem/Time) (NEGATE 0 NUMUNIT LINK 1 N) (NEGATE *-1 (Num Sg Ine) BARRIER NOT-NPMOD) (NEGATE 1 Po OR (N Ill) OR (N Nom)) (NEGATE 1 (N Gen) LINK 1 Po) (NEGATE *1 Po BARRIER (*) - CC - Gen - (N Pl Nom)) (NEGATE 0 (Pl Com) LINK -1 (Sg Gen) LINK *-1 (Num Sg Nom) OR (Num Sg Acc) BARRIER NOT-NPMOD) (NEGATE 0 (Sg Com) LINK -1 (Num Sg Com) LINK NOT -1 Dem);
#$ Sámedikkeráde doarjju guokta julevsáme giellaprosjevta {rudáj}.

ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Pl Com) IF ((0 N) OR (0 NUMUNIT LINK NOT 1 N - Sem/Plc)) (*-1 (Num Sg Com) BARRIER NOT-Attr - Gen LINK NOT 0 (N Coll Nom) OR Sem/Year OR Sem/Time OR Sem/Date LINK NEGATE -1 Sem/Curr) (NEGATE 0 PL-PAIR-N LINK *-1 (Num Pl) BARRIER NOT-Attr) (NEGATE -1 Sem/Time) (NEGATE 0 NUMUNIT LINK 1 N) (NEGATE *-1 (Num Sg Ine) BARRIER NOT-NPMOD) (NEGATE 1 Po OR (N Ill) OR (N Nom)) (NEGATE 1 (N Gen) LINK 1 Po) (NEGATE *1 Po BARRIER (*) - CC - Gen - (N Pl Nom));
ADD:xmsyn-numphrase-sgine (&msyn-numphrase-sgcom) TARGET (Pl Com) IF ((0 N) OR (0 NUMUNIT LINK NOT 1 N - Sem/Plc)) (*-1 (Num Sg Com) BARRIER NOT-Attr - Gen LINK NOT 0 (N Coll Nom) OR Sem/Year OR Sem/Time OR Sem/Date LINK NEGATE -1 Sem/Curr) (NEGATE 0 PL-PAIR-N LINK *-1 (Num Pl) BARRIER NOT-Attr) (NEGATE -1 Sem/Time) (NEGATE 0 NUMUNIT LINK 1 N) (NEGATE *-1 (Num Sg Ine) BARRIER NOT-NPMOD) (NEGATE 1 Po OR (N Ill) OR (N Nom)) (NEGATE 1 (N Gen) LINK 1 Po) (NEGATE *1 Po BARRIER (*) - CC - Gen - (N Pl Nom));

ADD:xmsyn-numphrase-sgine (&msyn-numphrase-sgine &msyn-numphrase-sgcom) TARGET (Pl Ine) OR (Sg Com) IF ((0 N) OR (0 NUMUNIT LINK NOT 1 N - Sem/Plc)) (*-1 (Num Sg Acc) OR (Num Arab Ine) BARRIER NOT-NPMOD LINK NOT 0 (N Coll Nom) OR Sem/Year OR Sem/Time OR Sem/Date LINK NOT -1 Sem/Curr LINK *-1 ("liehket" Ind) BARRIER (*) - Num - Dem)(NEGATE 0 PL-PAIR-N LINK *-1 (Num Pl) BARRIER NOT-Attr) (NEGATE -1 Sem/Time) (NEGATE 0 NUMUNIT LINK 1 N) (NEGATE 1 Po) ;
# this rule may go to a copy rule that suggests both Sg Ine and Sg Com
Expand Down Expand Up @@ -4180,20 +4180,19 @@ ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Sg Ill) IF (0 N - Á-A



COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Ine co&msyn-numphrase-sgine) TARGET (Ine &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT) (NEGATE *-1 (Num Sg Ine) OR (Num Sg Ine Attr) BARRIER NOT-NPMOD) ;
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Ine) TARGET (Ine &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT) (NEGATE *-1 (Num Sg Ine) OR (Num Sg Ine Attr) BARRIER NOT-NPMOD) ;

COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Ill co&msyn-numphrase-sgine) TARGET (N Ill &msyn-numphrase-sgcom) ; # homonomy beetween pl com and sg ill
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Ill) TARGET (N Ill &msyn-numphrase-sgcom) ; # homonomy beetween pl com and sg ill

COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Com co&msyn-numphrase-sgine) OR (Pl Gen co&msyn-numphrase-sgine) TARGET (Pl Com &msyn-numphrase-sgcom) OR (Pl Gen &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT) ;
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Com) OR (Pl Gen) TARGET (Pl Com &msyn-numphrase-sgcom) OR (Pl Gen &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT) ;
## Manáv judosdåktårij guokta gusáj. # Pl Com not same as sg ill

COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Com co&msyn-numphrase-sgine) TARGET (Sg Com &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT)(*-1 &msyn-numphrase-sgcom BARRIER S-BOUNDARY) ;
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Com) TARGET (Sg Com &msyn-numphrase-sgcom) IF (0 N OR NUMUNIT)(*-1 &msyn-numphrase-sgcom BARRIER S-BOUNDARY) ;
# maybe we need to put a stricter Barrier

LIST co&msyn-numphrase-sgine = co&msyn-numphrase-sgine ;

# Num
ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Num Sg Gen) - co&msyn-numphrase-sgine OR (Num Pl Nom) - co&msyn-numphrase-sgine OR (Num Sg Nom) - co&msyn-numphrase-sgine OR (Num Sg Com) - co&msyn-numphrase-sgine OR ("moadda" Indef Acc) - co&msyn-numphrase-sgine OR (Num Arab) - co&msyn-numphrase-sgine IF (*1 (N Pl Ine) OR (N Sg Com) OR (N Pl Com &msyn-numphrase-sgcom) OR NUMUNIT + &msyn-numphrase-sgcom BARRIER (*) - (A Attr) LINK NEGATE 0 (N Coll Nom) LINK NOT 0 Acc)(NEGATE 0 (N Coll Nom) OR Sem/Year OR Sem/Date OR Sem/Time-clock) (NEGATE 0 &msyn-numeral-parcasecongr) (NEGATE 0 (Sg Com) LINK 1 (N Sg Com) LINK NOT -2 Dem);
ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Num Sg Gen) OR (Num Pl Nom) OR (Num Sg Nom) OR (Num Sg Com) OR ("moadda" Indef Acc) OR (Num Arab) IF (*1 (N Pl Ine) OR (N Sg Com) OR (N Pl Com &msyn-numphrase-sgcom) OR NUMUNIT + &msyn-numphrase-sgcom BARRIER (*) - (A Attr) LINK NEGATE 0 (N Coll Nom) LINK NOT 0 Acc)(NEGATE 0 (N Coll Nom) OR Sem/Year OR Sem/Date OR Sem/Time-clock) (NEGATE 0 &msyn-numeral-parcasecongr) (NEGATE 0 (Sg Com) LINK 1 (N Sg Com) LINK NOT -2 Dem);
## Sievedusnummar mij e-faktura-sjiehtadussaj aneduvvá le divutmáksenummar {gudá} tállajn. --- what still needs to be fixed is that if there are two alternative fixes, we fix them separately, maybe by using LINK and ADDRELATION
## Valla jus ”Sáme Goadev” galggap tsieggigoahtet, ålles dáj {nielje} rijkajn, de diedon diehtet vierttip, makkár dähkága ja ådnårisá dasi buoremusát hiehpi.
## Akta nuvtagijn gærggi, ja nuppijn uddni gergav> avtajn nuvtagijn
Expand All @@ -4218,11 +4217,11 @@ ADD:xmsyn-numphrase-sgcom (&msyn-numphrase-sgcom) TARGET (Num Pl Ine) OR (Num Sg
ADDRELATION ($2 LEFT) (N &msyn-numphrase-sgcom) OR (N &msyn-numphrase-plcom) OR NUMUNIT + &msyn-numphrase-sgcom TO (*-1 (Num &msyn-numphrase-sgcom) OR ("moadda" Indef &msyn-numphrase-sgcom));


COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Gen co&msyn-numphrase-sgine) OR (Sg Acc co&msyn-numphrase-sgine) OR (Sg Nom co&msyn-numphrase-sgine) OR (Pl Ine co&msyn-numphrase-sgine) OR (Sg Ill Attr co&msyn-numphrase-sgine) TARGET (Num &msyn-numphrase-sgcom)(NEGATE 0 (Sg Com)) ;
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Pl Gen) OR (Sg Acc) OR (Sg Nom) OR (Pl Ine) OR (Sg Ill Attr) TARGET (Num &msyn-numphrase-sgcom)(NEGATE 0 (Sg Com)) ;

COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Gen co&msyn-numphrase-sgine) OR (Pl Nom co&msyn-numphrase-sgine) TARGET (Num &msyn-numphrase-sgcom) IF (0 (Sg Gen) OR (Pl Nom) LINK NOT 0 (&msyn-numphrase-sgcom));
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Gen) OR (Pl Nom) TARGET (Num &msyn-numphrase-sgcom) IF (0 (Sg Gen) OR (Pl Nom) LINK NOT 0 (&msyn-numphrase-sgcom));

COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Acc co&msyn-numphrase-sgine) OR (Sg Nom co&msyn-numphrase-sgine) TARGET ("moadda" Indef &msyn-numphrase-sgcom) ;
COPY:msyn-numphrase-sgcom (Sg Com SUGGEST) EXCEPT (Sg Acc) OR (Sg Nom) TARGET ("moadda" Indef &msyn-numphrase-sgcom) ;



Expand Down

0 comments on commit 2a0e418

Please sign in to comment.