Skip to content

Fix/expression space parsing #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShaneBeee merged 3 commits into from
Mar 10, 2026
Merged

Fix/expression space parsing #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9012976
Fix expression parsing with space-separated expressions
ShaneBeee Mar 10, 2026
6ba4e77
ExprClaudeTest - add for testing
ShaneBeee Mar 10, 2026
780fbac
ClaudeDebugTest - checkstyle
ShaneBeee Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/main/java/io/github/syst3ms/skriptparser/expressions/ExprClaudeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package io.github.syst3ms.skriptparser.expressions;

import io.github.syst3ms.skriptparser.Parser;
import io.github.syst3ms.skriptparser.lang.Expression;
import io.github.syst3ms.skriptparser.lang.TriggerContext;
import io.github.syst3ms.skriptparser.parsing.ParseContext;

public class ExprClaudeTest implements Expression<String> {

static {
Parser.getMainRegistration().newExpression(ExprClaudeTest.class, String.class,
true, "claude test %number% [of] %number%")
.noDoc()
.register();
}

private Expression<Number> first, second;

@Override
public boolean init(Expression<?>[] expressions, int matchedPattern, ParseContext parseContext) {
first = (Expression<Number>) expressions[0];
second = (Expression<Number>) expressions[1];
return true;
}

@Override
public String[] getValues(TriggerContext ctx) {
Number number = this.first.getSingle(ctx).orElse(null);
Number other = this.second.getSingle(ctx).orElse(null);
if (number != null && other != null) {
return new String[]{"claude test " + number + " " + other};
}
return new String[]{};
}

@Override
public String toString(TriggerContext ctx, boolean debug) {
return "";
}
}
97 changes: 85 additions & 12 deletions src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,93 @@ public int match(String s, int index, MatchContext context) {
}
} else {
assert possibleInput instanceof ExpressionElement;
var nextPossibleInputs = PatternElement.getPossibleInputs(flattened.subList(context.getPatternIndex() + 1, flattened.size()));
// Find the index of the next expression element in the flattened list
// We need to find the first ExpressionElement after the current position
var expressionIndex = -1;
for (var i = possibilityIndex + 1; i < flattened.size(); i++) {
var elem = flattened.get(i);
// Skip optional groups and look inside them
if (elem instanceof OptionalGroup) {
var inner = PatternElement.flatten(((OptionalGroup) elem).getElement());
if (inner.stream().anyMatch(e -> e instanceof ExpressionElement)) {
continue; // Skip optional groups containing expressions
}
} else if (elem instanceof ExpressionElement) {
expressionIndex = i;
break;
}
}
if (expressionIndex == -1) {
continue;
}
// When the expression is the last element, nextPossibleInputs will contain "\0" (end of line)
// which we handle below, so we should NOT skip this case!
var nextPossibleInputs = PatternElement.getPossibleInputs(flattened.subList(expressionIndex + 1, flattened.size()));
if (nextPossibleInputs.stream().anyMatch(pe -> !(pe instanceof TextElement))) {
continue;
}
for (var nextPossibleInput : nextPossibleInputs) {
var text = ((TextElement) nextPossibleInput).getText();
if (text.equals("")) {
if (text.equals("\0")) {
// End of line marker - parse the rest and we're done
var rest = s.substring(index);
var splits = splitAtSpaces(rest);
for (var split : splits) {
var i = StringUtils.indexOfIgnoreCase(s, split, index);
if (i != -1) {
var toParse = s.substring(index, i);
var expression = parse(toParse, typeArray, context.getParserState(), logger);
if (expression.isPresent()) {
context.addExpression(expression.get());
return index + toParse.length();
if (splits.isEmpty()) {
return -1;
}
// Try parsing progressively larger prefixes
for (var splitCount = 1; splitCount < splits.size(); splitCount++) {
var endIndex = index;
for (var j = 0; j < splitCount; j++) {
var splitIndex = s.indexOf(splits.get(j), endIndex);
if (splitIndex == -1) {
break;
}
endIndex = splitIndex + splits.get(j).length();
}
while (endIndex < s.length() && Character.isWhitespace(s.charAt(endIndex))) {
endIndex++;
}
if (endIndex > index) {
var toParse = s.substring(index, endIndex).strip();
if (!toParse.isEmpty()) {
var expression = parse(toParse, typeArray, context.getParserState(), logger);
if (expression.isPresent()) {
context.addExpression(expression.get());
return endIndex;
}
}
}
}
return -1;
} else if (text.isEmpty() || text.isBlank()) {
var rest = s.substring(index);
var splits = splitAtSpaces(rest);
if (splits.isEmpty()) {
return -1;
}
// Try parsing progressively larger prefixes (first 1 token, then first 2 tokens, etc.)
for (var splitCount = 1; splitCount < splits.size(); splitCount++) {
var endIndex = index;
for (var j = 0; j < splitCount; j++) {
var splitIndex = s.indexOf(splits.get(j), endIndex);
if (splitIndex == -1) {
break;
}
endIndex = splitIndex + splits.get(j).length();
}
// Find the start of the next token (skip whitespace)
while (endIndex < s.length() && Character.isWhitespace(s.charAt(endIndex))) {
endIndex++;
}
if (endIndex > index) {
var toParse = s.substring(index, endIndex).strip();
if (!toParse.isEmpty()) {
var expression = parse(toParse, typeArray, context.getParserState(), logger);
if (expression.isPresent()) {
context.addExpression(expression.get());
return endIndex;
}
}
}
}
Expand All @@ -137,11 +207,14 @@ public int match(String s, int index, MatchContext context) {
for (var split : splits) {
var i = StringUtils.indexOfIgnoreCase(s, split, index);
if (i != -1) {
var toParse = s.substring(index, i);
var toParse = s.substring(index, i).strip();
if (toParse.isEmpty()) {
continue;
}
var expression = parse(toParse, typeArray, context.getParserState(), logger);
if (expression.isPresent()) {
context.addExpression(expression.get());
return index + toParse.length();
return i;
}
}
}
Expand Down
56 changes: 56 additions & 0 deletions src/test/java/io/github/syst3ms/skriptparser/ClaudeDebugTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package io.github.syst3ms.skriptparser;

import io.github.syst3ms.skriptparser.lang.Expression;
import io.github.syst3ms.skriptparser.log.SkriptLogger;
import io.github.syst3ms.skriptparser.parsing.ParserState;
import io.github.syst3ms.skriptparser.parsing.SyntaxParser;
import io.github.syst3ms.skriptparser.types.PatternType;
import io.github.syst3ms.skriptparser.types.TypeManager;
import org.junit.Test;

import static org.junit.Assert.fail;

public class ClaudeDebugTest {
static {
TestRegistration.register();
}

@Test
public void testClaudePattern() {
var logger = new SkriptLogger(true);
var parserState = new ParserState();

// Test case 1: with space between numbers
String input1 = "claude test 1 2";
var type = TypeManager.getByClass(String.class).orElseThrow();
var patternType = new PatternType<>(type, true);

System.out.println("Testing: " + input1);
var result1 = SyntaxParser.parseExpression(input1, patternType, parserState, logger);

if (result1.isEmpty()) {
System.out.println("FAILED to parse: " + input1);
fail("Failed to parse: " + input1);
} else {
System.out.println("SUCCESS: " + input1);
Expression<?> expr = result1.get();
System.out.println(" Parsed expression: " + expr.getClass().getSimpleName());
}

// Test case 2: with "of" between numbers
logger.clearErrors();
logger.clearLogs();
String input2 = "claude test 1 of 2";
System.out.println("\nTesting: " + input2);
var result2 = SyntaxParser.parseExpression(input2, patternType, parserState, logger);

if (result2.isEmpty()) {
System.out.println("FAILED to parse: " + input2);
fail("Failed to parse: " + input2);
} else {
System.out.println("SUCCESS: " + input2);
Expression<?> expr = result2.get();
System.out.println(" Parsed expression: " + expr.getClass().getSimpleName());
}
}
}
Loading