replaced Locale.ENGLISH by Locale.ROOT

raydac · raydac · commit 59870fd4439c · 2025-08-21T13:50:43.000+03:00
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/InfoHelper.java b/jcp/src/main/java/com/igormaznitsa/jcp/InfoHelper.java
@@ -189,7 +189,7 @@ private static String makeFunctionReference(final AbstractFunction func) {
     final String description = func.getReference();
 
     final StringBuilder variants = new StringBuilder("  [");
-    final String result = func.getResultType().getSignature().toUpperCase(Locale.ENGLISH);
+    final String result = func.getResultType().getSignature().toUpperCase(Locale.ROOT);
 
     int variantIndex = 0;
     for (ValueType[] signature : func.getAllowedArgumentTypes()) {
@@ -201,7 +201,7 @@ private static String makeFunctionReference(final AbstractFunction func) {
         if (i > 0) {
           variants.append(',');
         }
-        variants.append(signature[i].getSignature().toUpperCase(Locale.ENGLISH));
+        variants.append(signature[i].getSignature().toUpperCase(Locale.ROOT));
       }
       variants.append(')');
       variantIndex++;
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/JcpPreprocessor.java b/jcp/src/main/java/com/igormaznitsa/jcp/JcpPreprocessor.java
@@ -560,7 +560,7 @@ List<File> processConfigFiles() throws IOException {
             throwPreprocessorException("Wrong variable definition", trimmed, file, readStringIndex,
                 null);
           }
-          final String name = split[0].trim().toLowerCase(Locale.ENGLISH);
+          final String name = split[0].trim().toLowerCase(Locale.ROOT);
           final String expression = split[1].trim();
           if (name.isEmpty()) {
             throwPreprocessorException("Empty variable name detected", trimmed, file,
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/ant/PreprocessTask.java b/jcp/src/main/java/com/igormaznitsa/jcp/ant/PreprocessTask.java
@@ -262,7 +262,7 @@ private Map<String, Value> fillAntVariables() {
         final String keyStr = key.toString();
         final String value = theProject.getProperty(keyStr);
         if (value != null) {
-          result.put("ant." + keyStr.toLowerCase(Locale.ENGLISH), Value.valueOf(value));
+          result.put("ant." + keyStr.toLowerCase(Locale.ROOT), Value.valueOf(value));
         }
       }
     }
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ActionPreprocessorExtensionHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ActionPreprocessorExtensionHandler.java
@@ -18,7 +18,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       if (tail.isEmpty()) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/DestinationDirectoryHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/DestinationDirectoryHandler.java
@@ -45,7 +45,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String name = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
       if (!name.isEmpty()) {
         final String path = PreprocessorUtils.extractTail(ARG_NAME, key);
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ExcludeFoldersHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ExcludeFoldersHandler.java
@@ -44,7 +44,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       if (!tail.isEmpty()) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ExcludedFileExtensionsHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ExcludedFileExtensionsHandler.java
@@ -47,7 +47,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String extensions = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
       if (!extensions.isEmpty()) {
         context.setExcludeExtensions(
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/FileExtensionsHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/FileExtensionsHandler.java
@@ -46,7 +46,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String extensions = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       if (!extensions.isEmpty()) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/GlobalVariableHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/GlobalVariableHandler.java
@@ -46,7 +46,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
 
       final String nameAndExpression = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/HelpHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/HelpHandler.java
@@ -43,7 +43,7 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
     boolean result = false;
     if (!key.isEmpty()) {
 
-      final String argUpperCase = key.trim().toUpperCase(Locale.ENGLISH);
+      final String argUpperCase = key.trim().toUpperCase(Locale.ROOT);
 
       for (final String str : ARG_NAMES) {
         if (str.equals(argUpperCase)) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/InCharsetHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/InCharsetHandler.java
@@ -51,7 +51,7 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
 
     boolean result = false;
 
-    if (key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String value = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       if (!value.isEmpty() && Charset.isSupported(value)) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/KeepCommentsHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/KeepCommentsHandler.java
@@ -48,7 +48,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       final CommentRemoverType mode;
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/OutCharsetHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/OutCharsetHandler.java
@@ -51,7 +51,7 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
 
     boolean result = false;
 
-    if (key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String value = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
 
       if (!value.isEmpty()) {
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/SourceDirectoryHandler.java b/jcp/src/main/java/com/igormaznitsa/jcp/cmdline/SourceDirectoryHandler.java
@@ -51,7 +51,7 @@ public String getDescription() {
   public boolean processCommandLineKey(final String key, final PreprocessorContext context) {
     boolean result = false;
 
-    if (!key.isEmpty() && key.toUpperCase(Locale.ENGLISH).startsWith(ARG_NAME)) {
+    if (!key.isEmpty() && key.toUpperCase(Locale.ROOT).startsWith(ARG_NAME)) {
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
       if (!tail.isEmpty()) {
         context.setSources(
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/context/EnvironmentVariableProcessor.java b/jcp/src/main/java/com/igormaznitsa/jcp/context/EnvironmentVariableProcessor.java
@@ -46,7 +46,7 @@ public EnvironmentVariableProcessor() {
     final Properties properties = System.getProperties();
 
     for (final String key : properties.stringPropertyNames()) {
-      env.put(PREFIX + key.toLowerCase(Locale.ENGLISH).replace(' ', '_'),
+      env.put(PREFIX + key.toLowerCase(Locale.ROOT).replace(' ', '_'),
           Value.valueOf(properties.getProperty(key)));
     }
 
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java b/jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java
@@ -570,7 +570,7 @@ ExpressionItem nextItem(final PushbackReader reader, final PreprocessorContext c
         }
         break;
         case OPERATOR: {
-          final String operatorLC = builder.toString().toLowerCase(Locale.ENGLISH);
+          final String operatorLC = builder.toString().toLowerCase(Locale.ROOT);
           for (final AbstractOperator operator : AbstractOperator.getAllOperators()) {
             if (operator.getKeyword().equals(operatorLC)) {
               result = operator;
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionBINFILE.java b/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionBINFILE.java
@@ -96,15 +96,15 @@ private static String convertTo(final File file, final Type type, final boolean
           switch (type) {
             case BYTEARRAY: {
               result.append("(byte)0x")
-                  .append(Integer.toHexString(b & 0xFF).toUpperCase(Locale.ENGLISH));
+                  .append(Integer.toHexString(b & 0xFF).toUpperCase(Locale.ROOT));
             }
             break;
             case UINT8: {
-              result.append(Integer.toString(b & 0xFF).toUpperCase(Locale.ENGLISH));
+              result.append(Integer.toString(b & 0xFF).toUpperCase(Locale.ROOT));
             }
             break;
             case INT8: {
-              result.append(Integer.toString(b).toUpperCase(Locale.ENGLISH));
+              result.append(Integer.toString(b).toUpperCase(Locale.ROOT));
             }
             break;
             default:
@@ -231,7 +231,7 @@ private enum Type {
     public static Type find(final String name) {
       Type result = null;
       if (name != null) {
-        final String normalized = name.toLowerCase(Locale.ENGLISH).trim();
+        final String normalized = name.toLowerCase(Locale.ROOT).trim();
         for (final Type t : values()) {
           if (normalized.startsWith(t.name)) {
             result = t;
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionESC.java b/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionESC.java
@@ -72,7 +72,7 @@ public Value executeStr(final PreprocessorContext context, final Value source) {
           break;
         default: {
           if (chr > 0x7F || Character.isISOControl(chr)) {
-            String hexCode = Integer.toHexString(chr).toUpperCase(Locale.ENGLISH);
+            String hexCode = Integer.toHexString(chr).toUpperCase(Locale.ROOT);
             if (hexCode.length() < 4) {
               hexCode = "0000".substring(0, 4 - hexCode.length()) + hexCode;
             }
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/maven/MavenPropertiesImporter.java b/jcp/src/main/java/com/igormaznitsa/jcp/maven/MavenPropertiesImporter.java
@@ -87,7 +87,7 @@ public MavenPropertiesImporter(final PreprocessorContext context,
     this.session = session;
     this.project = project;
     for (final String paramName : TO_IMPORT) {
-      final String varName = "mvn." + paramName.toLowerCase(Locale.ENGLISH);
+      final String varName = "mvn." + paramName.toLowerCase(Locale.ROOT);
       final String value = getProperty(this.project, paramName);
       addVariableIntoInsideMap(context, varName, Value.valueOf(value), logAddedProperties);
     }
@@ -106,7 +106,7 @@ public MavenPropertiesImporter(final PreprocessorContext context,
     // add properties
     for (final String propertyName : this.project.getProperties().stringPropertyNames()) {
       final String varName =
-              "mvn.project.property." + propertyName.toLowerCase(Locale.ENGLISH).replace(' ', '_');
+              "mvn.project.property." + propertyName.toLowerCase(Locale.ROOT).replace(' ', '_');
       final String value = this.findPropertyValue(propertyName);
       if (value!= null) {
         addVariableIntoInsideMap(context, varName, Value.valueOf(value), logAddedProperties);
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/utils/PreprocessorUtils.java b/jcp/src/main/java/com/igormaznitsa/jcp/utils/PreprocessorUtils.java
@@ -130,7 +130,7 @@ public static PreprocessorExtension findAndInstantiatePreprocessorExtensionForCl
   public static CommentRemoverType findCommentRemoverForId(final String text) {
     CommentRemoverType result = null;
     if (text != null && !text.isEmpty()) {
-      final String normalized = text.trim().toUpperCase(Locale.ENGLISH);
+      final String normalized = text.trim().toUpperCase(Locale.ROOT);
       if (normalized.equals("TRUE")) {
         result = KEEP_ALL;
       } else if (normalized.equals("FALSE")) {
@@ -437,7 +437,7 @@ public static String normalizeVariableName(final String name) {
       return null;
     }
 
-    return name.trim().toLowerCase(Locale.ENGLISH);
+    return name.trim().toLowerCase(Locale.ROOT);
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ List<File> processConfigFiles() throws IOException {`
`560`	`560`	`throwPreprocessorException("Wrong variable definition", trimmed, file, readStringIndex,`
`561`	`561`	`null);`
`562`	`562`	`}`
`563`		`- final String name = split[0].trim().toLowerCase(Locale.ENGLISH);`
	`563`	`+ final String name = split[0].trim().toLowerCase(Locale.ROOT);`
`564`	`564`	`final String expression = split[1].trim();`
`565`	`565`	`if (name.isEmpty()) {`
`566`	`566`	`throwPreprocessorException("Empty variable name detected", trimmed, file,`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ private Map<String, Value> fillAntVariables() {`
`262`	`262`	`final String keyStr = key.toString();`
`263`	`263`	`final String value = theProject.getProperty(keyStr);`
`264`	`264`	`if (value != null) {`
`265`		`- result.put("ant." + keyStr.toLowerCase(Locale.ENGLISH), Value.valueOf(value));`
	`265`	`+ result.put("ant." + keyStr.toLowerCase(Locale.ROOT), Value.valueOf(value));`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`	`}`