refactor: Rename

src/main/java/eu/jasperlorelai/circe/parser/Parser.java

@@ -37,13 +37,13 @@ public String parse(String string) {
 		if (expression == null) return "";
 
 		/*
-		 * If we want the string node to be quoteless, we have to execute the function
+		 * If we want the string node to be unquoted, we have to execute the function
 		 * expression manually, otherwise we'll get the right value() but of function node type.
 		 */
 		if (expression instanceof FunctionNode functionNode) {
 			expression = functionNode.getFunction().execute();
 		}
-		if (expression instanceof StringLiteralNode stringNode) return stringNode.quoteless();
+		if (expression instanceof StringLiteralNode stringNode) return stringNode.unquoted();
 		return expression.value();
 	}
 

src/main/java/eu/jasperlorelai/circe/parser/expression/StringLiteralNode.java

@@ -12,7 +12,7 @@ public NodeType<StringLiteralNode> getType() {
 		return NodeType.STRING;
 	}
 
-	public String quoteless() {
+	public String unquoted() {
 		return value.substring(1, value.length() - 1).replaceAll("\\\\\"", "\"");
 	}
 

src/main/java/eu/jasperlorelai/circe/parser/function/CalcFunction.java

@@ -37,7 +37,7 @@ public ExpressionNode<?> execute() {
 				variableMap.put(name, number.valueDouble());
 			});
 
-			return new NumberLiteralNode(new ExpressionBuilder(string.quoteless())
+			return new NumberLiteralNode(new ExpressionBuilder(string.unquoted())
 					.variables(variableMap.keySet())
 					.build()
 					.setVariables(variableMap)

src/main/java/eu/jasperlorelai/circe/parser/function/CharAtFunction.java

@@ -40,7 +40,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return stringNode(string.quoteless().charAt(index.valueInteger()) + "");
+			return stringNode(string.unquoted().charAt(index.valueInteger()) + "");
 		} catch (IndexOutOfBoundsException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/CharCodeAtFunction.java

@@ -40,7 +40,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return numberNode(string.quoteless().charAt(index.valueInteger()));
+			return numberNode(string.unquoted().charAt(index.valueInteger()));
 		} catch (IndexOutOfBoundsException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/ContainsFunction.java

@@ -45,7 +45,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		ExpressionNode<?> node = elementString == null ? elementNumber : elementString;
-		if (array == null) return stringFromBool(string.quoteless().contains(valueQuoteless(node)));
+		if (array == null) return stringFromBool(string.unquoted().contains(valueQuoteless(node)));
 		else return stringFromBool(array.stringArray().contains(node.value()));
 	}
 

src/main/java/eu/jasperlorelai/circe/parser/function/EndsWithFunction.java

@@ -38,7 +38,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringFromBool(string.quoteless().endsWith(substring.quoteless()));
+		return stringFromBool(string.unquoted().endsWith(substring.unquoted()));
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/EqualsFunction.java

@@ -47,7 +47,7 @@ public ExpressionNode<?> execute() {
 			return stringFromBool(arrayFirst.value().equals(arraySecond.value()));
 		}
 		if (stringFirst != null && stringSecond != null) {
-			return stringFromBool(stringFirst.quoteless().equals(stringSecond.quoteless()));
+			return stringFromBool(stringFirst.unquoted().equals(stringSecond.unquoted()));
 		}
 		return stringFromBool(false);
 	}

src/main/java/eu/jasperlorelai/circe/parser/function/IndexOfFunction.java

@@ -46,7 +46,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	public ExpressionNode<?> execute() {
 		ExpressionNode<?> node = elementString == null ? elementNumber : elementString;
 		if (string == null) return numberNode(array.stringArray().indexOf(node.value()));
-		else return numberNode(string.quoteless().indexOf(valueQuoteless(node)));
+		else return numberNode(string.unquoted().indexOf(valueQuoteless(node)));
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/IsEmptyFunction.java

@@ -27,7 +27,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringFromBool(string == null ? array.array().isEmpty() : string.quoteless().isEmpty());
+		return stringFromBool(string == null ? array.array().isEmpty() : string.unquoted().isEmpty());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/JoinFunction.java

@@ -43,7 +43,7 @@ public ExpressionNode<?> execute() {
 		return stringNode(array.array()
 				.stream()
 				.map(Function::valueQuoteless)
-				.collect(Collectors.joining(delimiter.quoteless()))
+				.collect(Collectors.joining(delimiter.unquoted()))
 		);
 	}
 

src/main/java/eu/jasperlorelai/circe/parser/function/LastIndexOfFunction.java

@@ -46,7 +46,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	public ExpressionNode<?> execute() {
 		ExpressionNode<?> node = elementString == null ? elementNumber : elementString;
 		if (string == null) return numberNode(array.stringArray().lastIndexOf(node.value()));
-		else return numberNode(string.quoteless().lastIndexOf(valueQuoteless(node)));
+		else return numberNode(string.unquoted().lastIndexOf(valueQuoteless(node)));
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/LowercaseFunction.java

@@ -24,7 +24,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringNode(string.quoteless().toLowerCase());
+		return stringNode(string.unquoted().toLowerCase());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/MatchFunction.java

@@ -44,7 +44,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	public ExpressionNode<?> execute() {
 		try {
 			List<String> list = new ArrayList<>();
-			Matcher matcher = Pattern.compile(pattern.quoteless()).matcher(string.quoteless());
+			Matcher matcher = Pattern.compile(pattern.unquoted()).matcher(string.unquoted());
 			while (matcher.find()) {
 				for (int j = 0; j <= matcher.groupCount(); j++) {
 					list.add(matcher.group(j));

src/main/java/eu/jasperlorelai/circe/parser/function/PadEndFunction.java

@@ -45,8 +45,8 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		StringBuilder newString = new StringBuilder(string.quoteless());
-		while (minLength.valueInteger() > newString.length()) newString.append(padChar.quoteless());
+		StringBuilder newString = new StringBuilder(string.unquoted());
+		while (minLength.valueInteger() > newString.length()) newString.append(padChar.unquoted());
 		return stringNode(newString.toString());
 	}
 

src/main/java/eu/jasperlorelai/circe/parser/function/PadStartFunction.java

@@ -46,9 +46,9 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		StringBuilder newString = new StringBuilder();
-		String quoteless = string.quoteless();
+		String quoteless = string.unquoted();
 		int length = quoteless.length();
-		while (minLength.valueInteger() > newString.length() + length) newString.append(padChar.quoteless());
+		while (minLength.valueInteger() > newString.length() + length) newString.append(padChar.unquoted());
 		newString.append(quoteless);
 		return stringNode(newString.toString());
 	}

src/main/java/eu/jasperlorelai/circe/parser/function/RepeatFunction.java

@@ -40,7 +40,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return stringNode(string.quoteless().repeat(amount.valueInteger()));
+			return stringNode(string.unquoted().repeat(amount.valueInteger()));
 		} catch (IllegalArgumentException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/ReplaceAllFunction.java

@@ -45,7 +45,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return stringNode(string.quoteless().replaceAll(pattern.quoteless(), replacement.quoteless()));
+			return stringNode(string.unquoted().replaceAll(pattern.unquoted(), replacement.unquoted()));
 		} catch (PatternSyntaxException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/ReplaceFirstFunction.java

@@ -45,7 +45,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return stringNode(string.quoteless().replaceFirst(pattern.quoteless(), replacement.quoteless()));
+			return stringNode(string.unquoted().replaceFirst(pattern.unquoted(), replacement.unquoted()));
 		} catch (PatternSyntaxException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/ReverseStringFunction.java

@@ -24,7 +24,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringNode(new StringBuilder(string.quoteless()).reverse().toString());
+		return stringNode(new StringBuilder(string.unquoted()).reverse().toString());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/SizeFunction.java

@@ -27,7 +27,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return numberNode(array == null ? string.quoteless().length() : array.array().size());
+		return numberNode(array == null ? string.unquoted().length() : array.array().size());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/SplitFunction.java

@@ -47,7 +47,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return arrayNode(Arrays.asList(string.quoteless().split(pattern.quoteless(), limit.valueInteger())));
+			return arrayNode(Arrays.asList(string.unquoted().split(pattern.unquoted(), limit.valueInteger())));
 		} catch (PatternSyntaxException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/StartsWithFunction.java

@@ -38,7 +38,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringFromBool(string.quoteless().startsWith(substring.quoteless()));
+		return stringFromBool(string.unquoted().startsWith(substring.unquoted()));
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/SubstringFunction.java

@@ -45,7 +45,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return stringNode(string.quoteless().substring(startIndex.valueInteger(), endIndex.valueInteger()));
+			return stringNode(string.unquoted().substring(startIndex.valueInteger(), endIndex.valueInteger()));
 		} catch (IndexOutOfBoundsException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/ToNumberFunction.java

@@ -26,7 +26,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@Override
 	public ExpressionNode<?> execute() {
 		try {
-			return new NumberLiteralNode(Double.parseDouble(string.quoteless()) + "");
+			return new NumberLiteralNode(Double.parseDouble(string.unquoted()) + "");
 		} catch (NumberFormatException e) {
 			throw formatException(e);
 		}

src/main/java/eu/jasperlorelai/circe/parser/function/TrimFunction.java

@@ -24,7 +24,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringNode(string.quoteless().trim());
+		return stringNode(string.unquoted().trim());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/UnshiftFunction.java

@@ -44,7 +44,7 @@ public void initializeArguments(@NotNull List<ExpressionNode<?>> arguments) {
 	@Override
 	public ExpressionNode<?> execute() {
 		List<String> list = new ArrayList<>();
-		list.add(elementString == null ? elementNumber.value() : elementString.quoteless());
+		list.add(elementString == null ? elementNumber.value() : elementString.unquoted());
 		array.array().forEach(item -> list.add(valueQuoteless(item)));
 		return arrayNode(list);
 	}

src/main/java/eu/jasperlorelai/circe/parser/function/UppercaseFunction.java

@@ -24,7 +24,7 @@ public void initializeTarget(@NotNull ExpressionNode<?> target) {
 	@NotNull
 	@Override
 	public ExpressionNode<?> execute() {
-		return stringNode(string.quoteless().toUpperCase());
+		return stringNode(string.unquoted().toUpperCase());
 	}
 
 }

src/main/java/eu/jasperlorelai/circe/parser/function/util/Function.java

@@ -51,7 +51,7 @@ protected ArrayNode castArray(ExpressionNode<?> node) {
 	}
 
 	protected static String valueQuoteless(ExpressionNode<?> node) {
-		return node instanceof StringLiteralNode string ? string.quoteless() : node.value();
+		return node instanceof StringLiteralNode string ? string.unquoted() : node.value();
 	}
 
 	protected static String quote(String string) {