X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/158beccad252a25c107551be283bdc27e2729d29..52c17dc66edf9b267b592425fbd10e39c5606e26:/feature.h

diff --git a/feature.h b/feature.h
index c98a5b3..0e15fb5 100644
--- a/feature.h
+++ b/feature.h
@@ -13,6 +13,8 @@
 #define FEATURE_BUNDLE_510	1
 #define FEATURE_BUNDLE_511	2
 #define FEATURE_BUNDLE_515	3
+#define FEATURE_BUNDLE_523	4
+#define FEATURE_BUNDLE_527	5
 #define FEATURE_BUNDLE_CUSTOM	(HINT_FEATURE_MASK >> HINT_FEATURE_SHIFT)
 
 #define CURRENT_HINTS \
@@ -31,7 +33,8 @@
 
 #define FEATURE_FC_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("fc")) \
     )
@@ -39,7 +42,7 @@
 #define FEATURE_SAY_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("say")) \
     )
@@ -47,7 +50,7 @@
 #define FEATURE_STATE_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("state")) \
     )
@@ -55,22 +58,24 @@
 #define FEATURE_SWITCH_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("switch")) \
     )
 
-#define FEATURE_EVALBYTES_IS_ENABLED \
+#define FEATURE_BITWISE_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_527 \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
-	 FEATURE_IS_ENABLED("evalbytes")) \
+	 FEATURE_IS_ENABLED("bitwise")) \
     )
 
-#define FEATURE_POSTDEREF_IS_ENABLED \
+#define FEATURE_EVALBYTES_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
-	 FEATURE_IS_ENABLED("postderef") \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
+     || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("evalbytes")) \
     )
 
 #define FEATURE_ARYBASE_IS_ENABLED \
@@ -80,36 +85,52 @@
 	 FEATURE_IS_ENABLED("arybase")) \
     )
 
+#define FEATURE_SIGNATURES_IS_ENABLED \
+    ( \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("signatures") \
+    )
+
 #define FEATURE___SUB___IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("__SUB__")) \
     )
 
-#define FEATURE_LEXSUBS_IS_ENABLED \
+#define FEATURE_REFALIASING_IS_ENABLED \
     ( \
 	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
-	 FEATURE_IS_ENABLED("lexsubs") \
+	 FEATURE_IS_ENABLED("refaliasing") \
     )
 
 #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_527) \
+     || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("postderef_qq")) \
     )
 
 #define FEATURE_UNIEVAL_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("unieval")) \
     )
 
+#define FEATURE_MYREF_IS_ENABLED \
+    ( \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("myref") \
+    )
+
 #define FEATURE_UNICODE_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_511 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("unicode")) \
     )
@@ -124,6 +145,12 @@ S_enable_feature_bundle(pTHX_ SV *ver)
     SV *comp_ver = sv_newmortal();
     PL_hints = (PL_hints &~ HINT_FEATURE_MASK)
 	     | (
+		  (sv_setnv(comp_ver, 5.027),
+		   vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
+			? FEATURE_BUNDLE_527 :
+		  (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 :