Skip to content

Commit 6ceb5e3

Browse files
committed
toke.c: Change name of static function
'uni' commonly is short for Unicode. Here, it was short for 'unary', which I found highly confusing. This also changes the name of a formal parameter to also not be 'uni' when 'unary' is meant.
1 parent 1b20140 commit 6ceb5e3

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

toke.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,7 @@ Perl_skipspace_flags(pTHX_ char *s, U32 flags)
20702070
}
20712071

20722072
/*
2073-
* S_check_uni
2073+
* S_check_unary
20742074
* Check the unary operators to ensure there's no ambiguity in how they're
20752075
* used. An ambiguous piece of code would be:
20762076
* rand + 5
@@ -2079,7 +2079,7 @@ Perl_skipspace_flags(pTHX_ char *s, U32 flags)
20792079
*/
20802080

20812081
STATIC void
2082-
S_check_uni(pTHX)
2082+
S_check_unary(pTHX)
20832083
{
20842084
const char *s;
20852085

@@ -5998,7 +5998,7 @@ yyl_hyphen(pTHX_ char *s)
59985998
}
59995999
else {
60006000
if (isSPACE(*s) || !isSPACE(*PL_bufptr))
6001-
check_uni();
6001+
check_unary();
60026002
OPERATOR(PERLY_MINUS); /* unary minus */
60036003
}
60046004
}
@@ -6027,7 +6027,7 @@ yyl_plus(pTHX_ char *s)
60276027
}
60286028
else {
60296029
if (isSPACE(*s) || !isSPACE(*PL_bufptr))
6030-
check_uni();
6030+
check_unary();
60316031
OPERATOR(PERLY_PLUS);
60326032
}
60336033
}
@@ -6762,7 +6762,7 @@ yyl_slash(pTHX_ char *s)
67626762
|| memNE(PL_last_uni, "study", 5)
67636763
|| isWORDCHAR_lazy_if_safe(PL_last_uni+5, PL_bufend, UTF)
67646764
))
6765-
check_uni();
6765+
check_unary();
67666766
s = scan_pat(s,OP_MATCH);
67676767
TERM(sublex_start());
67686768
}
@@ -6853,7 +6853,7 @@ yyl_leftpointy(pTHX_ char *s)
68536853

68546854
if (PL_expect != XOPERATOR) {
68556855
if (s[1] != '<' && !memchr(s,'>', PL_bufend - s))
6856-
check_uni();
6856+
check_unary();
68576857
if (s[1] == '<' && s[2] != '>')
68586858
s = scan_heredoc(s);
68596859
else
@@ -8901,7 +8901,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct
89018901
}
89028902
Mop(OP_REPEAT);
89038903
}
8904-
check_uni();
8904+
check_unary();
89058905
return yyl_just_a_word(aTHX_ s, len, orig_keyword, c);
89068906

89078907
case KEY_xor:
@@ -10378,7 +10378,7 @@ Perl_scan_word(pTHX_ char *s, char *dest, char * dest_end, int allow_package, ST
1037810378
* specific variable name.
1037910379
*/
1038010380
STATIC char *
10381-
S_scan_ident(pTHX_ char *s, char *dest, char *dest_end, I32 ck_uni)
10381+
S_scan_ident(pTHX_ char *s, char *dest, char *dest_end, I32 chk_unary)
1038210382
{
1038310383
I32 herelines = PL_parser->herelines;
1038410384
SSize_t bracket = -1;
@@ -10511,8 +10511,8 @@ S_scan_ident(pTHX_ char *s, char *dest, char *dest_end, I32 ck_uni)
1051110511
/* Warn about ambiguous code after unary operators if {...} notation isn't
1051210512
used. There's no difference in ambiguity; it's merely a heuristic
1051310513
about when not to warn. */
10514-
else if (ck_uni && bracket == -1)
10515-
check_uni();
10514+
else if (chk_unary && bracket == -1)
10515+
check_unary();
1051610516

1051710517
if (bracket != -1) {
1051810518
bool skip;

0 commit comments

Comments
 (0)