summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--opcode.h4
-rwxr-xr-xopcode.pl4
-rw-r--r--t/pragma/warn/op2
-rw-r--r--t/pragma/warn/sv2
4 files changed, 6 insertions, 6 deletions
diff --git a/opcode.h b/opcode.h
index f0fcba9fef..513343a52f 100644
--- a/opcode.h
+++ b/opcode.h
@@ -439,7 +439,7 @@ EXT char *PL_op_desc[] = {
"integer addition (+)",
"subtraction (-)",
"integer subtraction (-)",
- "concatenation (.)",
+ "concatenation (.) or string",
"string",
"left bitshift (<<)",
"right bitshift (>>)",
@@ -513,7 +513,7 @@ EXT char *PL_op_desc[] = {
"unpack",
"pack",
"split",
- "join",
+ "join or string",
"list",
"list slice",
"anonymous list ([])",
diff --git a/opcode.pl b/opcode.pl
index eb64e8dc14..1c1d9bf8d6 100755
--- a/opcode.pl
+++ b/opcode.pl
@@ -434,7 +434,7 @@ add addition (+) ck_null IfsT2 S S
i_add integer addition (+) ck_null ifsT2 S S
subtract subtraction (-) ck_null IfsT2 S S
i_subtract integer subtraction (-) ck_null ifsT2 S S
-concat concatenation (.) ck_concat fsT2 S S
+concat concatenation (.) or string ck_concat fsT2 S S
stringify string ck_fun fsT@ S
left_shift left bitshift (<<) ck_bitop fsT2 S S
@@ -533,7 +533,7 @@ hslice hash slice ck_null m@ H L
unpack unpack ck_fun @ S S
pack pack ck_fun mst@ S L
split split ck_split t@ S S S
-join join ck_join mst@ S L
+join join or string ck_join mst@ S L
# List operators.
diff --git a/t/pragma/warn/op b/t/pragma/warn/op
index 7368275a00..de326f8b0c 100644
--- a/t/pragma/warn/op
+++ b/t/pragma/warn/op
@@ -278,7 +278,7 @@ Useless use of hash element in void context at - line 29.
Useless use of hash slice in void context at - line 30.
Useless use of unpack in void context at - line 31.
Useless use of pack in void context at - line 32.
-Useless use of join in void context at - line 33.
+Useless use of join or string in void context at - line 33.
Useless use of list slice in void context at - line 34.
Useless use of sort in void context at - line 37.
Useless use of reverse in void context at - line 38.
diff --git a/t/pragma/warn/sv b/t/pragma/warn/sv
index 758137f2e8..2409589a8f 100644
--- a/t/pragma/warn/sv
+++ b/t/pragma/warn/sv
@@ -178,7 +178,7 @@ no warnings 'uninitialized' ;
$C = "" ;
$C .= $A ;
EXPECT
-Use of uninitialized value in concatenation (.) at - line 10.
+Use of uninitialized value in concatenation (.) or string at - line 10.
########
# sv.c
use warnings 'numeric' ;