small perfromacne improve for string analyse utils, finilizing mvn 1.3.8

Author: SimplyProgrammer

SerialX-core/pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>org.ugp.serialx</groupId>
   <artifactId>core</artifactId>
-  <version>1.3.7</version>
+  <version>1.3.8</version>
 
   <name>SerialX core</name>
   <description>Core of SerialX. Contains core features and utilities shared across the library.</description>

SerialX-core/src/main/java/org/ugp/serialx/Utils.java

@@ -466,7 +466,8 @@ public static StringBuilder multilpy(CharSequence str, int times)
 	 * @param s | String to split and check some syntax.
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters. More than one splitter in row will be take as 1. Each resulting token will be {@link String#trim() trim}<code>med</code>!
+	 * @return String splitted after splitters. More than one splitter in row will be take as 1. Each resulting token will be {@link String#trim() trim}<code>med</code>!<br>
+	 * Note: Splitting will only occur if splitter is not in object meaning it is not in string nor between '{' or '[' and ']' or '}
 	 * 
 	 * @since 1.0.0
 	 */
@@ -483,7 +484,8 @@ public static String[] splitValues(String s, char... splitter)
 	 * 	<b>If 2</b>, splitting will occur after any number of splitters, n number of splitters in row will be treated as 1!
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!<br>
+	 * Note: Splitting will only occur if splitter is not in object meaning it is not in string nor between '{' or '[' and ']' or '}'
 	 * 
 	 * @since 1.3.0
 	 */
@@ -501,7 +503,8 @@ public static String[] splitValues(String s, int limit, int splittingStrategy, c
 	 * @param splitBreaks | When some of these characters is encountered, splitting is terminated for the rest of the string! 
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!<br>
+	 * Note: Splitting will only occur if splitter is not in object meaning it is not in string nor between '{' or '[' and ']' or '}'
 	 * 
 	 * @since 1.3.5
 	 */
@@ -517,10 +520,11 @@ public static String[] splitValues(String s, int limit, int splittingStrategy, c
 	 * @param splittingStrategy | <b>If 0</b>, splitting will occur after each splitter! 
 	 * 	<b>If 1</b>, string will be splitted after only one splitter, more than one splitters in row will be ignored! 
 	 * 	<b>If 2</b>, splitting will occur after any number of splitters, n number of splitters in row will be treated as 1!
-	 * @param splitBreaks | When some of these characters is encountered, splitting is terminated for the rest of the string! 
+	 * @param splitBreaks | When some of these characters is encountered (not in object), splitting is terminated for the rest of the string! 
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!<br>
+	 * Note: Splitting will only occur if splitter is not in object meaning it is not in string nor between '{' or '[' and ']' or '}'
 	 * 
 	 * @since 1.3.8
 	 */
@@ -534,51 +538,47 @@ public static String[] splitValues(String s, int i, int limit, int splittingStra
 
 		List<String> result = new ArrayList<>();
 
-		int brackets = 0, lastIndex = 0, len = s.length();
+		int lastIndex = 0, len = s.length();
 		for (int count = 1, oldCh = 0; i < len && (limit <= 0 || count < limit); i++)
 		{
-			char ch = s.charAt(i);
+			int ch = s.charAt(i);
 			if (ch == '"')
 			{
 				do if (++i >= len)
 					throw new IllegalArgumentException("Unclosed or missing quotes in: " + s);
 				while (s.charAt(i) != '"');
 			}
-			else
+			else if ((ch | ' ') == '{')
 			{
-				if (isOneOf(ch, splitBreaks))
+				for (int brackets = 1; brackets != 0; )
 				{
-					brackets = 0;
-					break;
-				}
-				
-				if (brackets == 0 && isOneOf(ch, splitter) &&
-					(splittingStrategy != 1 || ch != oldCh && (i >= len-1 || !isOneOf(s.charAt(i+1), splitter))))
-				{	
-					String tok = s.substring(lastIndex, i).trim();
-					if (splittingStrategy < 2 || result.isEmpty() || !tok.isEmpty())
-					{
-						result.add(tok);
-						lastIndex = i + 1;
-						
-						count++;
-					}
+					if (++i >= len)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + s);
+					if ((ch = (s.charAt(i) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++i < len && s.charAt(i) != '"');
 				}
-				else if ((ch | ' ') == '{')
-					brackets++;
-				else if ((ch | ' ') == '}')
+			}
+			else if (isOneOf(ch, splitBreaks))
+				break;
+			else if (isOneOf(ch, splitter) &&
+				(splittingStrategy != 1 || ch != oldCh && (i >= len-1 || !isOneOf(s.charAt(i+1), splitter))))
+			{	
+				String tok = s.substring(lastIndex, i).trim();
+				if (splittingStrategy < 2 || result.isEmpty() || !tok.isEmpty())
 				{
-					if (brackets > 0)
-						brackets--;
-					else
-						throw new IllegalArgumentException("Missing opening bracket in: " + s);
+					result.add(tok);
+					lastIndex = i + 1;
+					
+					count++;
 				}
 			}
+			
 			oldCh = ch;
 		}
-		
-		if (brackets > 0)
-			throw new IllegalArgumentException("Unclosed brackets in: " + s);
 
 		result.add(s.substring(lastIndex, len).trim());
 		return result.toArray(new String[0]);
@@ -611,26 +611,31 @@ public static int indexOfNotInObj(CharSequence s, char... oneOf)
 	 */
 	public static int indexOfNotInObj(CharSequence s, int from, int to, int defaultReturn, boolean firstIndex, char... oneOf)
 	{
-		for (int brackets = 0; from < to; from++)
+		for (; from < to; from++)
 		{
-			char ch = s.charAt(from);
+			int ch = s.charAt(from);
 			if (ch == '"')
 				while (++from < to && s.charAt(from) != '"');
-			else if (brackets == 0 && /*oneOf.length == 0 ? ch == oneOf[0] :*/ isOneOf(ch, oneOf))
+			else if ((ch | ' ') == '{')
+			{
+				for (int brackets = 1; brackets != 0; )
+				{
+					if (++from >= to)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + s);
+					if ((ch = (s.charAt(from) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++from < to && s.charAt(from) != '"');
+				}
+			}
+			else if (isOneOf(ch, oneOf))
 			{
 				if (firstIndex)
 					return from;
 				defaultReturn = from;
 			}
-			else if ((ch | ' ') == '{')
-				brackets++;
-			else if ((ch | ' ') == '}')
-			{
-				if (brackets > 0)
-					brackets--;
-				else
-					throw new IllegalArgumentException("Missing closing bracket in: " + s);
-			}
 		}
 		return defaultReturn;
 	}
@@ -665,21 +670,26 @@ public static int indexOfNotInObj(CharSequence s, int from, int to, int defaultR
 		if (sequencesToFind.length < 1)
 			return defaultReturn;
 
-		for (int brackets = 0; from < to; from++)
+		for (; from < to; from++)
 		{
-			char ch = s.charAt(from);
+			int ch = s.charAt(from);
 			if (ch == '"')
 				while (++from < to && s.charAt(from) != '"');
 			else if ((ch | ' ') == '{')
-				brackets++;
-			else if ((ch | ' ') == '}')
 			{
-				if (brackets > 0)
-					brackets--;
-				else
-					throw new IllegalArgumentException("Missing closing bracket in: " + s);
+				for (int brackets = 1; brackets != 0; )
+				{
+					if (++from >= to)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + s);
+					if ((ch = (s.charAt(from) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++from < to && s.charAt(from) != '"');
+				}
 			}
-			else if (brackets == 0)
+			else
 			{
 				findMatch: for (int cur = 0, seqsLen = sequencesToFind.length; cur < seqsLen; cur++) 
 				{

SerialX-devtools/pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>org.ugp.serialx</groupId>
   <artifactId>devtools</artifactId>
-  <version>1.3.7</version>
+  <version>1.3.8</version>
 
   <name>SerialX devtools</name>
   <description>Tools for debugging, mainly for Parser/Converter API. It is intended for DSL developers and people who want to add their own data formats.</description>

SerialX-json/pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>org.ugp.serialx</groupId>
   <artifactId>json</artifactId>
-  <version>1.3.7</version>
+  <version>1.3.8</version>
 
   <name>SerialX json</name>
   <description>SerialX Json support</description>

SerialX-juss/pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>org.ugp.serialx</groupId>
   <artifactId>juss</artifactId>
-  <version>1.3.7</version>
+  <version>1.3.8</version>
 
   <name>SerialX-juss</name>
   <description>SerialX support for Java Universal Serial Script data format, custom default format of SerialX!</description>

SerialX-juss/src/main/java/org/ugp/serialx/juss/JussSerializer.java

@@ -596,18 +596,32 @@ protected List<Object> splitAndParse(StringBuilder formattedStr, Object... parse
 		ParserRegistry reg = getParsers();
 
 		//DataParser[] parsers = new DataParser[DataParser.REGISTRY.size()];
-		int brackets = 0, lastIndex = 0, len = formattedStr.length();
+		int lastIndex = 0, len = formattedStr.length();
 		//boolean isBracketSplit = false;
 		for (int i = 0; i < len; i++)
 		{
-			char ch = formattedStr.charAt(i);
+			int ch = formattedStr.charAt(i);
 			if (ch == '"')
 			{
 				do if (++i >= len)
 					throw new IllegalArgumentException("Unclosed or missing quotes in: " + formattedStr);
 				while (formattedStr.charAt(i) != '"');
 			}
-			else if (brackets == 0 && (ch == ';' || ch == ',')/* || (brackets == 1 && (isBracketSplit = ch == '}' || ch == ']'))*/)
+			else if ((ch | ' ') == '{')
+			{
+				for (int brackets = 1; brackets != 0; )
+				{
+					if (++i >= len)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + formattedStr);
+					if ((ch = (formattedStr.charAt(i) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++i < len && formattedStr.charAt(i) != '"');
+				}
+			}
+			else if ((ch == ';' || ch == ',')/* || (brackets == 1 && (isBracketSplit = ch == '}' || ch == ']'))*/)
 			{
 				String str = formattedStr.substring(lastIndex == 0 ? 0 : lastIndex + 1, lastIndex = i /*+ (isBracketSplit ? 1 : 0)*/).trim();
 				if (!str.isEmpty())
@@ -618,20 +632,8 @@ protected List<Object> splitAndParse(StringBuilder formattedStr, Object... parse
 				}
 				//add = 1;
 			}
-			else if ((ch | ' ') == '{')
-				brackets++;
-			else if ((ch | ' ') == '}')
-			{
-				if (brackets > 0)
-					brackets--;
-				else
-					throw new IllegalArgumentException("Missing opening bracket in: " + formattedStr);
-			}
 		}
 
-		if (brackets > 0)
-			throw new IllegalArgumentException("Unclosed brackets in: " + formattedStr); 
-
 		String str = formattedStr.substring(lastIndex == 0 ? 0 : lastIndex + 1, len).trim();
 		if (!str.isEmpty())
 		{

SerialX-juss/src/main/java/org/ugp/serialx/juss/converters/OperationGroups.java

@@ -127,21 +127,26 @@ public static int isGroupMark(CharSequence s, char groupMark)
 	 */
 	public static int indexOfOpening(CharSequence str, int from, char... openings)
 	{
-		for (int len = str.length(), brackets = 0; from < len; from++) 
+		for (int len = str.length(); from < len; from++) 
 		{
-			char ch = str.charAt(from);
+			int ch = str.charAt(from);
 			if (ch == '"')
 				while (++from < len && str.charAt(from) != '"');
 			else if ((ch | ' ') == '{')
-				brackets++;
-			else if ((ch | ' ') == '}')
 			{
-				if (brackets > 0)
-					brackets--;
-				else
-					throw new IllegalArgumentException("Missing opening bracket in: " + str);
+				for (int brackets = 1; brackets != 0; )
+				{
+					if (++from >= len)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + str);
+					if ((ch = (str.charAt(from) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++from < len && str.charAt(from) != '"');
+				}
 			}
-			else if (brackets == 0 && isOneOf(ch, openings))
+			else if (isOneOf(ch, openings))
 				return from;
 		}
 		return -1;
@@ -159,21 +164,26 @@ else if (brackets == 0 && isOneOf(ch, openings))
 	 */
 	public static int indexOfClosing(CharSequence str, int from, char[] openings, char... closing) 
 	{
-		for (int len = str.length(), brackets = 0, ops = 0; from < len; from++) 
+		for (int len = str.length(), ops = 0; from < len; from++) 
 		{
-			char ch = str.charAt(from);
+			int ch = str.charAt(from);
 			if (ch == '"')
 				while (++from < len && str.charAt(from) != '"');
 			else if ((ch | ' ') == '{')
-				brackets++;
-			else if ((ch | ' ') == '}')
 			{
-				if (brackets > 0)
-					brackets--;
-				else
-					throw new IllegalArgumentException("Missing opening bracket in: " + str);
+				for (int brackets = 1; brackets != 0; )
+				{
+					if (++from >= len)
+						throw new IllegalArgumentException("Missing ("+ brackets + ") closing bracket in: " + str);
+					if ((ch = (str.charAt(from) | ' ')) == '{')
+						brackets++;
+					else if (ch == '}')
+						brackets--;
+					else if (ch == '"')
+						while (++from < len && str.charAt(from) != '"');
+				}
 			}
-			else if (brackets == 0)
+			else
 			{
 				if (isOneOf(ch, openings))
 					ops++;