diff --git a/tools/grammarcheckers/grammarchecker.cg3 b/tools/grammarcheckers/grammarchecker.cg3 index 7fc54e33f..18279e5a6 100644 --- a/tools/grammarcheckers/grammarchecker.cg3 +++ b/tools/grammarcheckers/grammarchecker.cg3 @@ -238,7 +238,6 @@ LIST Der/hat = Der/hat ; LIST Der/meahttun = Der/meahttun ; LIST Der/muš = Der/muš ; -LIST Der/NomAct = Der/NomAct ; LIST Der/st = Der/st ; LIST Der/stuvva = Der/stuvva ; LIST Der/upmi = Der/upmi ; @@ -680,74 +679,76 @@ LIST <0> = <0> ; LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -769,26 +770,26 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; LIST = ; #CHECK @@ -796,10 +797,9 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -810,6 +810,7 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -820,23 +821,20 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -845,56 +843,39 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -904,16 +885,16 @@ LIST = ; #CHECK LIST = ; LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -923,36 +904,38 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -960,51 +943,59 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK +LIST <árvvus> = <árvvus> ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -1012,22 +1003,31 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -1038,35 +1038,32 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK -LIST <árvvus> = <árvvus> ; #CHECK -LIST <árvvus> = <árvvus> ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -1075,18 +1072,17 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK @@ -1095,11 +1091,12 @@ LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK -LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK LIST = ; #CHECK +LIST = ; #CHECK +LIST <árvvus> = <árvvus> ; #CHECK LIST = ; LIST = ; @@ -1355,8 +1352,6 @@ LIST SG-PX = PxSg1 PxSg2 PxSg3 ; LIST DU-PX = PxDu1 PxDu2 PxDu3 ; LIST PL-PX = PxPl1 PxPl2 PxPl3 ; -LIST PX = PxSg1 PxDu1 PxPl1 PxSg2 PxDu2 PxPl2 PxSg3 PxDu3 PxPl3 ; - LIST DU-NR = Du1 Du2 Du3 ; SET NOT-SG-PRON = DU-PRON OR PL-PRON ; @@ -1440,8 +1435,6 @@ SET PRE-A-N = (Pron Pers Gen) OR (Pron Pers Acc) OR (Pron Indef) OR Num OR ( SET NOT-PRE-A-N = WORD - PRE-A-N ; -LIST PUNCT-LEFT = (PUNCT LEFT) ; -LIST PUNCT-RIGHT = (PUNCT RIGHT) ;