fixing bugs and doing small optim

Author: SimplyProgrammer

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

@@ -1024,7 +1024,7 @@ public static <K, V> GenericScope<K, V> newBidirectional(Map<K, V> variablesMap,
 	 * 
 	 * @since 1.3.5
 	 */
-	public static <K, V> GenericScope<K, V> intoBidirectional(GenericScope<K, V> scopeToMakeBidirectional, Map<K, V> variablesMap, List<V> values)
+	public static <K, V, S extends GenericScope<K, V>> S intoBidirectional(S scopeToMakeBidirectional, Map<K, V> variablesMap, List<V> values)
 	{
 		return intoBidirectional(scopeToMakeBidirectional, variablesMap, values, null);
 	}
@@ -1039,7 +1039,7 @@ public static <K, V> GenericScope<K, V> intoBidirectional(GenericScope<K, V> sco
 	 * 
 	 * @since 1.3.5
 	 */
-	public static <K, V> GenericScope<K, V> intoBidirectional(GenericScope<K, V> scopeToMakeBidirectional, Map<K, V> variablesMap, List<V> values, GenericScope<?, ?> parent)
+	public static <K, V, S extends GenericScope<K, V>> S intoBidirectional(S scopeToMakeBidirectional, Map<K, V> variablesMap, List<V> values, GenericScope<?, ?> parent)
 	{
 		scopeToMakeBidirectional.variables = variablesMap;
 		scopeToMakeBidirectional.values = values;

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

@@ -164,6 +164,16 @@ public <T> T toObject(Class<T> objClass) throws Exception
 		return toObject(objClass, getProtocols());
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public <V> GenericScope<String, V> transform(Function<Object, V> trans, boolean includeSubScopes) 
+	{
+		Serializer transformed = (Serializer) super.transform(trans, includeSubScopes);
+		transformed.parsers = getParsers();
+		transformed.protocols = getProtocols();
+		return (GenericScope<String, V>) transformed;
+	}
+	
 	/**
 	 * @see Serializer#into(Object, Serializer, String...)
 	 */

SerialX-core/src/main/java/org/ugp/serialx/converters/DataParser.java

@@ -45,7 +45,7 @@ public interface DataParser
 
 	/**
 	 * @param myHomeRegistry | Registry where this parser is registered provided by {@link DataParser#parseObj(Registry, String, boolean, Class[], Object...)} otherwise it demands on implementation (it should not be null)!
-	 * @param str | Source string!
+	 * @param str | Source string, preferably trimed!
 	 * @param args | Some additional args. This can be anything and it demands on implementation of DataParser. Default SerialX API implementation will provide one optional argument with {@link Scope} that value was loaded from!
 	 * 
 	 * @return Object that was parsed from obtained string. Special return types are {@link DataParser#VOID} and {@link DataParser#CONTINUE}. Continue will ignore this parser and jump to another one in registry.

SerialX-core/src/main/java/org/ugp/serialx/converters/NumberConverter.java

@@ -112,8 +112,8 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 		int len;
 		if ((len = arg.length()) > 0)
 		{
-			char ch0 = arg.charAt(0);
-			if (ch0 == '+' || ch0 == '-' || ch0 == '.' || (ch0 >= '0' && ch0 <= '9'))
+			char ch0;
+			if ((ch0 = arg.charAt(0)) >= '0' && ch0 <= '9' || (ch0 == '+' || ch0 == '-' || ch0 == '.') && len > 1 && arg.charAt(1) > '*')
 			{
 				Number num;
 				if ((num = numberOf(arg, ch0, --len, 10, 0)) != null)

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

@@ -69,7 +69,7 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 					op0Index--;
 				}
 
-				String vars[] = splitValues(arg, op0Index, 0, 1, new char[] {'?'}, '=', ':'), valStr;
+				String vars[] = splitValues(arg, op0Index, 0, 1, new char[] {'?', '<', '>', '!'}, '=', ':'), valStr;
 
 				Object val = null;
 				int iVal = vars.length-1;

SerialX-operators/src/main/java/org/ugp/serialx/converters/operators/ArithmeticOperators.java

@@ -42,10 +42,14 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 		int len;
 		if ((len = str.length()) > 2 && isExpression(str, len, operators))
 		{
-			for (int i; (i = indexOfNotInObj(str, 0, len, len, true, '+', '-')+1) < len && isOneOf(str.charAt(i), '+', '-'); ) // Handle duplicates of [+-]{2}
-				str = fastReplace(fastReplace(fastReplace(fastReplace(str, "-+", "-"), "+-", "-"), "--", "+"), "++", "+");
+			for (int i = 0; i < len; ) // Format duplicates of [+-]{2}
+				if (isOneOf(str.charAt(i++), '+', '-') && i < len && isOneOf(str.charAt(i), '+', '-'))
+				{
+					len = (str = fastReplace(fastReplace(fastReplace(fastReplace(str, "-+", "-"), "+-", "-"), "--", "+"), "++", "+")).length();
+					i--;
+				}
 
-			List<?>[] terms = getAndParseTerms(str, myHomeRegistry, args, getClass(), operators);
+			List<?>[] terms = getAndParseTerms(str, len, myHomeRegistry, args, getClass(), operators);
 			ArrayList<Object> cofs = (ArrayList<Object>) terms[0];
 			if (cofs.size() <= 1)
 				return cofs.get(0);
@@ -383,6 +387,7 @@ public static Object pow(Object cof, Object cof2, int sign)
 
 	/**
 	 * @param str | String to split!
+	 * @param to | Ending index of parsing, exclusive. Everything from this index to the end will be ignored (should be str.length())!
 	 * @param registryForParsers | Registry to use for parsing operands!
 	 * @param argsForParsers | Arguments for the parse method!
 	 * @param classToIgnore | Parser to ignore (should be class of the caller if possible)!
@@ -393,14 +398,14 @@ public static Object pow(Object cof, Object cof2, int sign)
 	 * @since 1.3.7 (originally getTerms since 1.3.0)
 	 */
 	@SuppressWarnings("unchecked")
-	public static List<?>[] getAndParseTerms(String str, ParserRegistry registryForParsers, Object[] argsForParsers, Class<? extends DataParser> classToIgnore, char... oprs)
+	public static List<?>[] getAndParseTerms(String str, int to, ParserRegistry registryForParsers, Object[] argsForParsers, Class<? extends DataParser> classToIgnore, char... oprs)
 	{
 		List<Object>[] ret = new List[] {new ArrayList<Object>(), new LinkedList<String>()}; //cofs, ops
 
-		int i = 0, startIndex = 0, type = 0, len = str.length();
-		for (; i < len && isOneOf(str.charAt(i), oprs); i++); //in case of start cof sign
+		int i = 0, startIndex = 0, type = 0;
+		for (; i < to && isOneOf(str.charAt(i), oprs); i++); //in case of start cof sign
 
-		for (int quote = 0, brackets = 0, lastType = type; i < len; i++) 
+		for (int quote = 0, brackets = 0, lastType = type; i < to; i++) 
 		{
 			char ch = str.charAt(i);
 			if (ch == '\"')
@@ -426,7 +431,7 @@ else if ((ch | ' ') == '}')
 			lastType = type;
 		}
 
-		String s = str.substring(startIndex, len).trim();
+		String s = str.substring(startIndex, to).trim();
 		if (!s.isEmpty())
 			ret[type].add(type == 0 ? registryForParsers.parse(s, false, classToIgnore, argsForParsers) : s);
 //		System.err.println(ret[0] + "\n" + ret[1] + "\n");

SerialX-operators/src/main/java/org/ugp/serialx/converters/operators/NegationOperator.java

@@ -16,20 +16,19 @@ public class NegationOperator implements DataParser
 	@Override
 	public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) 
 	{
-		int ch, len = str.length();
-		if (len > 0 && ((ch = str.charAt(0)) == '!' || ch == '-'))
+		int len, type;
+		if ((len = str.length()) < 2)
+			return CONTINUE;
+		if ((type = str.charAt(0)) == '!' || type == '-')
 		{
 			int negCount = 1;
-			for (int i = negCount; i < len; i++) 
-				if ((ch = str.charAt(i)) == '!' || ch == '-')
-					negCount++;
-				else
-					break;
+			for (int ch; negCount < len && ((ch = str.charAt(negCount)) == '!' || ch == '-'); negCount++);
 
-			Object obj = myHomeRegistry.parse(str.substring(negCount), args); 
+			Object obj = myHomeRegistry.parse(str.substring(negCount).trim(), false, getClass(), args); 
 			if (negCount % 2 == 0)
 				return obj;
-			Object neg = ch == '!' ? logicalNotOperator(obj) : notOperator(obj);
+
+			Object neg = type == '!' ? logicalNotOperator(obj) : notOperator(obj);
 			if (obj == neg && !(obj instanceof Number && ((Number) obj).intValue() == 0))
 				LogProvider.instance.logErr("Unable to nagete \"" + obj + "\" because object of \"" + obj.getClass().getName() + "\" cant be negated!", null);
 			return neg;