Merge trunkcore-apn-init-refactor

5 files changed, 24 insertions, 24 deletions

diff --git a/generic/tclDate.c b/generic/tclDate.c
index 84824b6..0dfdb81 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -96,7 +96,8 @@
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4102 )
-#elif defined (__clang__)
+#elif defined (__clang__) && (__clang_major__ > 14)
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #elif (__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
@@ -719,14 +720,14 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   174,   174,   175,   179,   182,   185,   188,   192,   196,
-     199,   202,   206,   209,   214,   220,   226,   231,   235,   239,
-     243,   247,   251,   257,   258,   261,   265,   269,   273,   277,
-     281,   287,   293,   297,   302,   303,   308,   312,   317,   321,
-     326,   333,   337,   343,   343,   345,   350,   355,   357,   362,
-     364,   365,   373,   384,   399,   404,   407,   410,   413,   416,
-     419,   422,   427,   430,   435,   440,   445,   452,   455,   458,
-     463,   481,   484
+       0,   175,   175,   176,   180,   183,   186,   189,   193,   197,
+     200,   203,   207,   210,   215,   221,   227,   232,   236,   240,
+     244,   248,   252,   258,   259,   262,   266,   270,   274,   278,
+     282,   288,   294,   298,   303,   304,   309,   313,   318,   322,
+     327,   334,   338,   344,   344,   346,   351,   356,   358,   363,
+     365,   366,   374,   385,   400,   405,   408,   411,   414,   417,
+     420,   423,   428,   431,   436,   441,   446,   453,   456,   459,
+     464,   482,   485
 };
 #endif
 
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
index a86250f..2b71af4 100644
--- a/generic/tclGetDate.y
+++ b/generic/tclGetDate.y
@@ -45,7 +45,8 @@
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4102 )
-#elif defined (__clang__)
+#elif defined (__clang__) && (__clang_major__ > 14)
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #elif (__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
diff --git a/generic/tclIcu.c b/generic/tclIcu.c
index 6e59b29..a8edbb9 100644
--- a/generic/tclIcu.c
+++ b/generic/tclIcu.c
@@ -1098,9 +1098,9 @@ IcuConverttoObjCmd(
 	    Tcl_GetString(objv[objc-2]), strict, &dsOut) != TCL_OK) {
 	return TCL_ERROR;
     }
-    Tcl_SetObjResult(interp,
-	Tcl_NewByteArrayObj((unsigned char *)Tcl_DStringValue(&dsOut),
-			    Tcl_DStringLength(&dsOut)));
+    Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+	    (unsigned char *)Tcl_DStringValue(&dsOut),
+	    Tcl_DStringLength(&dsOut)));
     Tcl_DStringFree(&dsOut);
     return TCL_OK;
 }
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index cb60b00..67e8e03 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -503,9 +503,9 @@ TclListLimitExceededError(
      * in Tcl_Size.
      */
     if (interp != NULL) {
-	Tcl_SetObjResult(interp,
-	    Tcl_ObjPrintf("max length (%" TCL_SIZE_MODIFIER
-		"d) of a Tcl list exceeded", (Tcl_Size)LIST_MAX));
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"max length (%" TCL_SIZE_MODIFIER "d) of a Tcl list exceeded",
+		(Tcl_Size)LIST_MAX));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
     }
     return TCL_ERROR;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 703f39e..fce2b80 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -9160,8 +9160,7 @@ TestUtfToNormalizedCmd(
 	    return TCL_ERROR;
 	}
 	if (len > slen) {
-	    Tcl_SetObjResult(interp,
-		Tcl_ObjPrintf(
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "Passed length %" TCL_SIZE_MODIFIER
 		    "d is greater than string length %" TCL_SIZE_MODIFIER
 		    "d.", len, slen));
@@ -9181,8 +9180,8 @@ TestUtfToNormalizedCmd(
 	(Tcl_UnicodeNormalizationForm)normForm, profile, bufPtr, bufLen, &bufStored);
     if (result == TCL_OK) {
 	/* Return as raw bytes, not string */
-	Tcl_SetObjResult(interp,
-	    Tcl_NewByteArrayObj((unsigned char *)bufPtr, bufStored));
+	Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+		(unsigned char *)bufPtr, bufStored));
     }
     if (bufPtr != buffer) {
 	Tcl_Free(bufPtr);
@@ -9238,8 +9237,7 @@ TestUtfToNormalizedDStringCmd(
 	    return TCL_ERROR;
 	}
 	if (len > slen) {
-	    Tcl_SetObjResult(interp,
-		Tcl_ObjPrintf(
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "Passed length %" TCL_SIZE_MODIFIER
 		    "d is greater than string length %" TCL_SIZE_MODIFIER
 		    "d.", len, slen));
@@ -9252,8 +9250,8 @@ TestUtfToNormalizedDStringCmd(
 	(Tcl_UnicodeNormalizationForm)normForm, profile, &ds);
     if (result == TCL_OK) {
 	/* Return as raw bytes, not string */
-	Tcl_SetObjResult(interp,
-	    Tcl_NewByteArrayObj((unsigned char *)Tcl_DStringValue(&ds),
+	Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+		(unsigned char *)Tcl_DStringValue(&ds),
 		Tcl_DStringLength(&ds)));
 	Tcl_DStringFree(&ds);
     }