This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove things added to v5.23.0 delta but meant for v5.23.1
[perl5.git]
/
feature.h
diff --git
a/feature.h
b/feature.h
index
c6c71e3
..
dd98058
100644
(file)
--- a/
feature.h
+++ b/
feature.h
@@
-13,6
+13,7
@@
#define FEATURE_BUNDLE_510 1
#define FEATURE_BUNDLE_511 2
#define FEATURE_BUNDLE_515 3
#define FEATURE_BUNDLE_510 1
#define FEATURE_BUNDLE_511 2
#define FEATURE_BUNDLE_515 3
+#define FEATURE_BUNDLE_523 4
#define FEATURE_BUNDLE_CUSTOM (HINT_FEATURE_MASK >> HINT_FEATURE_SHIFT)
#define CURRENT_HINTS \
#define FEATURE_BUNDLE_CUSTOM (HINT_FEATURE_MASK >> HINT_FEATURE_SHIFT)
#define CURRENT_HINTS \
@@
-31,7
+32,8
@@
#define FEATURE_FC_IS_ENABLED \
( \
#define FEATURE_FC_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+ (CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("fc")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("fc")) \
)
@@
-39,7
+41,7
@@
#define FEATURE_SAY_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
#define FEATURE_SAY_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
15
) \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
23
) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("say")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("say")) \
)
@@
-47,7
+49,7
@@
#define FEATURE_STATE_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
#define FEATURE_STATE_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
15
) \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
23
) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("state")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("state")) \
)
@@
-55,22
+57,30
@@
#define FEATURE_SWITCH_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
#define FEATURE_SWITCH_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
15
) \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
23
) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("switch")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("switch")) \
)
+#define FEATURE_BITWISE_IS_ENABLED \
+ ( \
+ CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+ FEATURE_IS_ENABLED("bitwise") \
+ )
+
#define FEATURE_EVALBYTES_IS_ENABLED \
( \
#define FEATURE_EVALBYTES_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+ (CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("evalbytes")) \
)
#define FEATURE_POSTDEREF_IS_ENABLED \
( \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("evalbytes")) \
)
#define FEATURE_POSTDEREF_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
- FEATURE_IS_ENABLED("postderef") \
+ CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_523 \
+ || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+ FEATURE_IS_ENABLED("postderef")) \
)
#define FEATURE_ARYBASE_IS_ENABLED \
)
#define FEATURE_ARYBASE_IS_ENABLED \
@@
-88,15
+98,16
@@
#define FEATURE___SUB___IS_ENABLED \
( \
#define FEATURE___SUB___IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+ (CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("__SUB__")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("__SUB__")) \
)
-#define FEATURE_
LVREF
_IS_ENABLED \
+#define FEATURE_
REFALIASING
_IS_ENABLED \
( \
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
( \
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
- FEATURE_IS_ENABLED("
lvref
") \
+ FEATURE_IS_ENABLED("
refaliasing
") \
)
#define FEATURE_LEXSUBS_IS_ENABLED \
)
#define FEATURE_LEXSUBS_IS_ENABLED \
@@
-107,13
+118,15
@@
#define FEATURE_POSTDEREF_QQ_IS_ENABLED \
( \
#define FEATURE_POSTDEREF_QQ_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
- FEATURE_IS_ENABLED("postderef_qq") \
+ CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_523 \
+ || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+ FEATURE_IS_ENABLED("postderef_qq")) \
)
#define FEATURE_UNIEVAL_IS_ENABLED \
( \
)
#define FEATURE_UNIEVAL_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+ (CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("unieval")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("unieval")) \
)
@@
-121,7
+134,7
@@
#define FEATURE_UNICODE_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_511 && \
#define FEATURE_UNICODE_IS_ENABLED \
( \
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_511 && \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
15
) \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_5
23
) \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("unicode")) \
)
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED("unicode")) \
)
@@
-136,6
+149,9
@@
S_enable_feature_bundle(pTHX_ SV *ver)
SV *comp_ver = sv_newmortal();
PL_hints = (PL_hints &~ HINT_FEATURE_MASK)
| (
SV *comp_ver = sv_newmortal();
PL_hints = (PL_hints &~ HINT_FEATURE_MASK)
| (
+ (sv_setnv(comp_ver, 5.023),
+ vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
+ ? FEATURE_BUNDLE_523 :
(sv_setnv(comp_ver, 5.015),
vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
? FEATURE_BUNDLE_515 :
(sv_setnv(comp_ver, 5.015),
vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
? FEATURE_BUNDLE_515 :