Remove co& prefix from tests where they make no difference to outputs

unhammer · unhammer · commit e165577baf10 · 2024-12-12T09:09:06.000+01:00
diff --git a/test/suggest/input.demote-err-to-co.cg b/test/suggest/input.demote-err-to-co.cg
@@ -1,13 +1,13 @@
 "<da>"
 	"dat" Pron <smj> <smj> Dem Pl Nom <W:0.0> &msyn-numphrase-sggen ID:7
-	"dat" Pron <smj> <smj> Dem <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:7
+	"dat" Pron <smj> <smj> Dem <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:7
 : 
 "<guokta>"
 	"guokta" Num Sg Acc <W:0.0> &msyn-numphrase-sggen ID:8
-	"guokta" Num <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:8
+	"guokta" Num <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:8
 	"guokta" Num Sg Nom <W:0.0> &msyn-numphrase-sggen ID:8
 : 
 "<ásadusáj>"
 	"ásadus" N <smj> <smj> Sem/Org Pl Gen <W:0.0> &msyn-numphrase-sggen ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8
-	"ásadus" N <smj> <smj> Sem/Org <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8
+	"ásadus" N <smj> <smj> Sem/Org <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8
 :
diff --git a/test/suggest/input.move-after.cg b/test/suggest/input.move-after.cg
@@ -2,7 +2,7 @@
 	"før" pr
 : 
 "<nabs>"
-	"nabs" N Abs Sg &syn-abs-wordorder &ADDED co&syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32
+	"nabs" N Abs Sg &syn-abs-wordorder &ADDED &syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32
 "<Nrel>"
 	"Nrel" N Rel
 : 
diff --git a/test/suggest/input.move.cg b/test/suggest/input.move.cg
@@ -1,5 +1,5 @@
 "<nabs>"
-	"nabs" N Abs Sg &syn-abs-wordorder &ADDED co&syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32
+	"nabs" N Abs Sg &syn-abs-wordorder &ADDED &syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32
 "<Nrel>"
 	"Nrel" N Rel
 : 
diff --git a/test/suggest/input.multiple-alternatives-co.cg b/test/suggest/input.multiple-alternatives-co.cg
@@ -8,5 +8,5 @@
 : 
 "<boađán>"
 	"boahtit" <mv> V <ala-V> <rasta> <badjel> <birra> <atnui> <sisa> <guossái> <veahkkin> <BE-Ill-Ani><veahkkin> <johtui> <IN-Com-Veh> <SO-luhtte-Ani> <DE-Ill-Plc> <DE-sisa-Build> <DE-lusa-Ani> <PT-Gen-Plc><DE-Ill-Any> <PT-Gen-Plc> <PT-rastá-Plc> <PT-meaddel-Plc> <PT-čađa-Plc> <PT-bokte-Plc> <SO-Loc-*Ani><DE-Ill-*Ani> <SO-Loc-*Ani> <CO-mielde-Ani> <DE-Ill-Plc><PU-Inf> <BE-Ill-Ani><PU-Ess-Any> <PU-Inf> <TH-Acc-Any><MA-Ill-áigi> <RO-Ess-Any> <Inf> IV Ind Prs Sg1 <W:0.0> @+FMAINV ID:3
-	"boahtit" V IV Inf co&syn-soahtit-vfin+inf ID:3
-	"boahtit" V IV Ind Prs Sg1 co&syn-kánske ID:3
+	"boahtit" V IV Inf &syn-soahtit-vfin+inf ID:3
+	"boahtit" V IV Ind Prs Sg1 &syn-kánske ID:3
diff --git a/test/suggest/input.multiple-alternatives-crossing.cg b/test/suggest/input.multiple-alternatives-crossing.cg
@@ -3,13 +3,13 @@
 : 
 "<soaitá>"
 	"soaitit" <mv> V <copula> <DE-Ill-Plc> <AktioEss> <Inf> IV Ind Prs Sg3 <W:0.0> @+FMAINV &syn-soahtit-vfin+inf ID:2 R:RIGHT:3
-	"soaitit" <mv> V <copula> <DE-Ill-Plc> <AktioEss> <Inf> IV Ind Prs <W:0.0> @+FMAINV Sg1 co&syn-soahtit-vfin+inf SUGGEST ID:2 R:RIGHT:3
+	"soaitit" <mv> V <copula> <DE-Ill-Plc> <AktioEss> <Inf> IV Ind Prs <W:0.0> @+FMAINV Sg1 &syn-soahtit-vfin+inf SUGGEST ID:2 R:RIGHT:3
 	"kánske" Adv &syn-kánske SUGGEST ID:2 R:RIGHT:3
 : 
 "<boađán>"
 	"boahtit" <mv> V <ala-V> <rasta> <badjel> <birra> <atnui> <sisa> <guossái> <veahkkin> <BE-Ill-Ani><veahkkin> <johtui> <IN-Com-Veh> <SO-luhtte-Ani> <DE-Ill-Plc> <DE-sisa-Build> <DE-lusa-Ani> <PT-Gen-Plc><DE-Ill-Any> <PT-Gen-Plc> <PT-rastá-Plc> <PT-meaddel-Plc> <PT-čađa-Plc> <PT-bokte-Plc> <SO-Loc-*Ani><DE-Ill-*Ani> <SO-Loc-*Ani> <CO-mielde-Ani> <DE-Ill-Plc><PU-Inf> <BE-Ill-Ani><PU-Ess-Any> <PU-Inf> <TH-Acc-Any><MA-Ill-áigi> <RO-Ess-Any> <Inf> IV Ind Prs Sg1 <W:0.0> @+FMAINV &syn-soahtit-vfin+inf ID:3 R:LEFT:2
-	"boahtit" V IV Inf co&syn-soahtit-vfin+inf SUGGEST ID:3 R:LEFT:2
-	"boahtit" V IV Ind Prs Sg1 co&syn-kánske SUGGEST ID:3 R:LEFT:2
+	"boahtit" V IV Inf &syn-soahtit-vfin+inf SUGGEST ID:3 R:LEFT:2
+	"boahtit" V IV Ind Prs Sg1 &syn-kánske SUGGEST ID:3 R:LEFT:2
 
 # > soaittán (V Sg1) boahtit (Inf)
 # > kánske (Adv) boađán (V Sg1)
diff --git a/test/suggest/input.multiple-overlapping.cg b/test/suggest/input.multiple-overlapping.cg
@@ -1,8 +1,8 @@
 "<we>"
 	"we" Prn &agr ID:1 R:RIGHT:2
-	"he" Prn SUGGEST co&agr-typo ID:1 R:RIGHT:2
+	"he" Prn SUGGEST &agr-typo ID:1 R:RIGHT:2
 : 
 "<was>"
 	"be" V 3Sg &agr-typo ID:2 R:LEFT:1
-	"be" V 3Pl co&agr SUGGEST ID:2 R:LEFT:1
+	"be" V 3Pl &agr SUGGEST ID:2 R:LEFT:1
 :\n
diff --git a/test/suggest/input.relations-multi.cg b/test/suggest/input.relations-multi.cg
@@ -4,7 +4,7 @@
 : 
 "<guokta>"
 	"guokta" Num Sg Acc <W:0.0> &msyn-numphrase-sgill ID:22
-	"guokta" Num Sg Gen <W:0.0> co&msyn-numphrase-sgill SUGGEST ID:22
+	"guokta" Num Sg Gen <W:0.0> &msyn-numphrase-sgill SUGGEST ID:22
 	"guokta" Num Sg Nom <W:0.0> &msyn-numphrase-sgill ID:22
 : 
 "<ássjijda>"

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`"<da>"`
`2`	`2`	`"dat" Pron <smj> <smj> Dem Pl Nom <W:0.0> &msyn-numphrase-sggen ID:7`
`3`		`- "dat" Pron <smj> <smj> Dem <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:7`
	`3`	`+ "dat" Pron <smj> <smj> Dem <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:7`
`4`	`4`	`:`
`5`	`5`	`"<guokta>"`
`6`	`6`	`"guokta" Num Sg Acc <W:0.0> &msyn-numphrase-sggen ID:8`
`7`		`- "guokta" Num <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:8`
	`7`	`+ "guokta" Num <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:8`
`8`	`8`	`"guokta" Num Sg Nom <W:0.0> &msyn-numphrase-sggen ID:8`
`9`	`9`	`:`
`10`	`10`	`"<ásadusáj>"`
`11`	`11`	`"ásadus" N <smj> <smj> Sem/Org Pl Gen <W:0.0> &msyn-numphrase-sggen ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8`
`12`		`- "ásadus" N <smj> <smj> Sem/Org <W:0.0> Sg Gen co&msyn-numphrase-sggen SUGGEST ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8`
	`12`	`+ "ásadus" N <smj> <smj> Sem/Org <W:0.0> Sg Gen &msyn-numphrase-sggen SUGGEST ID:9 R:$3:7 R:$2:8 R:LEFT:7 R:LEFT:8`
`13`	`13`	`:`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"før" pr`
`3`	`3`	`:`
`4`	`4`	`"<nabs>"`
`5`		`- "nabs" N Abs Sg &syn-abs-wordorder &ADDED co&syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32`
	`5`	`+ "nabs" N Abs Sg &syn-abs-wordorder &ADDED &syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32`
`6`	`6`	`"<Nrel>"`
`7`	`7`	`"Nrel" N Rel`
`8`	`8`	`:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`"<nabs>"`
`2`		`- "nabs" N Abs Sg &syn-abs-wordorder &ADDED co&syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32`
	`2`	`+ "nabs" N Abs Sg &syn-abs-wordorder &ADDED &syn-abs-wordorder ID:4 R:DELETE1:4 SPLITCOHORT:20 MOVE-AFTER:26:syn-abs-wordorder ADDRELATION(DELETE1):32`
`3`	`3`	`"<Nrel>"`
`4`	`4`	`"Nrel" N Rel`
`5`	`5`	`:`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`:`
`9`	`9`	`"<boađán>"`
`10`	`10`	`"boahtit" <mv> V <ala-V> <rasta> <badjel> <birra> <atnui> <sisa> <guossái> <veahkkin> <BE-Ill-Ani><veahkkin> <johtui> <IN-Com-Veh> <SO-luhtte-Ani> <DE-Ill-Plc> <DE-sisa-Build> <DE-lusa-Ani> <PT-Gen-Plc><DE-Ill-Any> <PT-Gen-Plc> <PT-rastá-Plc> <PT-meaddel-Plc> <PT-čađa-Plc> <PT-bokte-Plc> <SO-Loc-Ani><DE-Ill-Ani> <SO-Loc-*Ani> <CO-mielde-Ani> <DE-Ill-Plc><PU-Inf> <BE-Ill-Ani><PU-Ess-Any> <PU-Inf> <TH-Acc-Any><MA-Ill-áigi> <RO-Ess-Any> <Inf> IV Ind Prs Sg1 <W:0.0> @+FMAINV ID:3`
`11`		`- "boahtit" V IV Inf co&syn-soahtit-vfin+inf ID:3`
`12`		`- "boahtit" V IV Ind Prs Sg1 co&syn-kánske ID:3`
	`11`	`+ "boahtit" V IV Inf &syn-soahtit-vfin+inf ID:3`
	`12`	`+ "boahtit" V IV Ind Prs Sg1 &syn-kánske ID:3`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`:`
`5`	`5`	`"<guokta>"`
`6`	`6`	`"guokta" Num Sg Acc <W:0.0> &msyn-numphrase-sgill ID:22`
`7`		`- "guokta" Num Sg Gen <W:0.0> co&msyn-numphrase-sgill SUGGEST ID:22`
	`7`	`+ "guokta" Num Sg Gen <W:0.0> &msyn-numphrase-sgill SUGGEST ID:22`
`8`	`8`	`"guokta" Num Sg Nom <W:0.0> &msyn-numphrase-sgill ID:22`
`9`	`9`	`:`
`10`	`10`	`"<ássjijda>"`