Refactor xxpipeassign to use checkTooManyPlaceholders helper

hughjonesd · hughjonesd · commit ed7a20d0ae1b · 2025-12-07T08:08:58.000Z
diff --git a/src/main/gram.c b/src/main/gram.c
@@ -3697,11 +3697,9 @@ static SEXP xxpipeassign(SEXP lhs, SEXP rhs, YYLTYPE *lloc_lhs, YYLTYPE *lloc_rh
 		    raiseParseError("placeholderNotNamed", rhs,
 			NO_VALUE, NULL, lloc_rhs,
 			_("pipe placeholder can only be used as a named argument (%s:%d:%d)"));
-		if (placeholder_found != NULL)
-		    raiseParseError("tooManyPlaceholders", rhs,
-			NO_VALUE, NULL, lloc_rhs,
-			_("pipe placeholder may only appear once (%s:%d:%d)"));
+		checkTooManyPlaceholders(rhs, CDR(a), lloc_rhs);
 		placeholder_found = a;
+		break;
 	    }
 	}
 
diff --git a/src/main/gram.y b/src/main/gram.y
@@ -1368,11 +1368,9 @@ static SEXP xxpipeassign(SEXP lhs, SEXP rhs, YYLTYPE *lloc_lhs, YYLTYPE *lloc_rh
 		    raiseParseError("placeholderNotNamed", rhs,
 			NO_VALUE, NULL, lloc_rhs,
 			_("pipe placeholder can only be used as a named argument (%s:%d:%d)"));
-		if (placeholder_found != NULL)
-		    raiseParseError("tooManyPlaceholders", rhs,
-			NO_VALUE, NULL, lloc_rhs,
-			_("pipe placeholder may only appear once (%s:%d:%d)"));
+		checkTooManyPlaceholders(rhs, CDR(a), lloc_rhs);
 		placeholder_found = a;
+		break;
 	    }
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3697,11 +3697,9 @@ static SEXP xxpipeassign(SEXP lhs, SEXP rhs, YYLTYPE lloc_lhs, YYLTYPE lloc_rh`
`3697`	`3697`	`raiseParseError("placeholderNotNamed", rhs,`
`3698`	`3698`	`NO_VALUE, NULL, lloc_rhs,`
`3699`	`3699`	`_("pipe placeholder can only be used as a named argument (%s:%d:%d)"));`
`3700`		`- if (placeholder_found != NULL)`
`3701`		`- raiseParseError("tooManyPlaceholders", rhs,`
`3702`		`- NO_VALUE, NULL, lloc_rhs,`
`3703`		`- _("pipe placeholder may only appear once (%s:%d:%d)"));`
	`3700`	`+ checkTooManyPlaceholders(rhs, CDR(a), lloc_rhs);`
`3704`	`3701`	`placeholder_found = a;`
	`3702`	`+ break;`
`3705`	`3703`	`}`
`3706`	`3704`	`}`
`3707`	`3705`
Original file line number	Diff line number	Diff line change
`@@ -1368,11 +1368,9 @@ static SEXP xxpipeassign(SEXP lhs, SEXP rhs, YYLTYPE lloc_lhs, YYLTYPE lloc_rh`
`1368`	`1368`	`raiseParseError("placeholderNotNamed", rhs,`
`1369`	`1369`	`NO_VALUE, NULL, lloc_rhs,`
`1370`	`1370`	`_("pipe placeholder can only be used as a named argument (%s:%d:%d)"));`
`1371`		`- if (placeholder_found != NULL)`
`1372`		`- raiseParseError("tooManyPlaceholders", rhs,`
`1373`		`- NO_VALUE, NULL, lloc_rhs,`
`1374`		`- _("pipe placeholder may only appear once (%s:%d:%d)"));`
	`1371`	`+ checkTooManyPlaceholders(rhs, CDR(a), lloc_rhs);`
`1375`	`1372`	`placeholder_found = a;`
	`1373`	`+ break;`
`1376`	`1374`	`}`
`1377`	`1375`	`}`
`1378`	`1376`