fixup! [parser] package - deduplicate coupled call sequence

Branislav Zahradník · Branislav Zahradník · commit caa5a368f3a0 · 2025-10-20T07:54:34.000+02:00
diff --git a/embed.fnc b/embed.fnc
@@ -2559,7 +2559,7 @@ px	|OP *	|op_unscope	|NULLOK OP *o
 ARdpx	|OP *	|op_wrap_finally|NN OP *block				\
 				|NN OP *finally
 : Used in perly.y
-p	|void	|package	|NN OP *o				\
+pd	|void	|package	|NN OP *o				\
 				|NULLOK OP *v
 Adp	|void	|packlist	|NN SV *cat				\
 				|NN const char *pat			\
diff --git a/op.c b/op.c
@@ -8242,7 +8242,7 @@ Perl_newPVOP(pTHX_ I32 type, I32 flags, char *pv)
 }
 
 STATIC void
-S_package(pTHX_ OP *o)
+S_set_package_name(pTHX_ OP *o)
 {
     SV *const sv = cSVOPo->op_sv;
 
@@ -8260,7 +8260,7 @@ S_package(pTHX_ OP *o)
 }
 
 STATIC void
-S_package_version( pTHX_ OP *v )
+S_set_package_version( pTHX_ OP *v )
 {
     U32 savehints = PL_hints;
 
@@ -8285,9 +8285,9 @@ Perl_package (pTHX_ OP *o, OP *v)
 {
     PERL_ARGS_ASSERT_PACKAGE;
 
-    S_package (aTHX_ o);
+    S_set_package_name (aTHX_ o);
     if (v)
-        S_package_version (aTHX_ v);
+        S_set_package_version (aTHX_ v);
 }
 
 /* Extract the first two components of a "version" object as two 8bit integers

Original file line number	Diff line number	Diff line change
`@@ -8242,7 +8242,7 @@ Perl_newPVOP(pTHX_ I32 type, I32 flags, char *pv)`
`8242`	`8242`	`}`
`8243`	`8243`
`8244`	`8244`	`STATIC void`
`8245`		`-S_package(pTHX_ OP *o)`
	`8245`	`+S_set_package_name(pTHX_ OP *o)`
`8246`	`8246`	`{`
`8247`	`8247`	`SV *const sv = cSVOPo->op_sv;`
`8248`	`8248`
`@@ -8260,7 +8260,7 @@ S_package(pTHX_ OP *o)`
`8260`	`8260`	`}`
`8261`	`8261`
`8262`	`8262`	`STATIC void`
`8263`		`-S_package_version( pTHX_ OP *v )`
	`8263`	`+S_set_package_version( pTHX_ OP *v )`
`8264`	`8264`	`{`
`8265`	`8265`	`U32 savehints = PL_hints;`
`8266`	`8266`
`@@ -8285,9 +8285,9 @@ Perl_package (pTHX_ OP o, OP v)`
`8285`	`8285`	`{`
`8286`	`8286`	`PERL_ARGS_ASSERT_PACKAGE;`
`8287`	`8287`
`8288`		`- S_package (aTHX_ o);`
	`8288`	`+ S_set_package_name (aTHX_ o);`
`8289`	`8289`	`if (v)`
`8290`		`- S_package_version (aTHX_ v);`
	`8290`	`+ S_set_package_version (aTHX_ v);`
`8291`	`8291`	`}`
`8292`	`8292`
`8293`	`8293`	`/* Extract the first two components of a "version" object as two 8bit integers`