X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/6389c77752f6ccdaf7373d97ae65079e9f58d270..2e8ea15a11326145a7df027b5b2507ff3d7483ba:/feature.h

diff --git a/feature.h b/feature.h
index 2d06450..838d648 100644
--- a/feature.h
+++ b/feature.h
@@ -13,23 +13,35 @@
 #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 \
     (PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints)
-#define CURRENT_FEATURE_BUNDLE	(CURRENT_HINTS >> HINT_FEATURE_SHIFT)
+#define CURRENT_FEATURE_BUNDLE \
+    ((CURRENT_HINTS & HINT_FEATURE_MASK) >> HINT_FEATURE_SHIFT)
 
+/* Avoid using ... && Perl_feature_is_enabled(...) as that triggers a bug in
+   the HP-UX cc on PA-RISC */
 #define FEATURE_IS_ENABLED(name)				        \
 	((CURRENT_HINTS							 \
 	   & HINT_LOCALIZE_HH)						  \
-	    && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)))
+	    ? Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)) : FALSE)
 /* The longest string we pass in.  */
-#define MAX_FEATURE_LEN (sizeof("evalbytes")-1)
+#define MAX_FEATURE_LEN (sizeof("postderef_qq")-1)
+
+#define FEATURE_FC_IS_ENABLED \
+    ( \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
+     || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("fc")) \
+    )
 
 #define FEATURE_SAY_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("say")) \
     )
@@ -37,7 +49,7 @@
 #define FEATURE_STATE_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("state")) \
     )
@@ -45,14 +57,21 @@
 #define FEATURE_SWITCH_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (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 \
     ( \
-	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")) \
     )
@@ -64,24 +83,51 @@
 	 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_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("__SUB__")) \
     )
 
+#define FEATURE_REFALIASING_IS_ENABLED \
+    ( \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("refaliasing") \
+    )
+
+#define FEATURE_POSTDEREF_QQ_IS_ENABLED \
+    ( \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_523 \
+     || (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_523) \
      || (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_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("unicode")) \
     )
@@ -96,6 +142,9 @@ S_enable_feature_bundle(pTHX_ SV *ver)
     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 :