Remove redundant AST class

Author: mpkorstanje

java/src/main/java/io/cucumber/cucumberexpressions/Ast.java

@@ -1,7 +1,5 @@
 package io.cucumber.cucumberexpressions;
 
-import io.cucumber.cucumberexpressions.Ast.Located;
-import io.cucumber.cucumberexpressions.Ast.Token;
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE)

java/src/main/java/io/cucumber/cucumberexpressions/CucumberExpressionException.java

@@ -1,6 +1,5 @@
 package io.cucumber.cucumberexpressions;
 
-import io.cucumber.cucumberexpressions.Ast.Token;
 import org.apiguardian.api.API;
 
 import java.util.ArrayList;
@@ -11,14 +10,14 @@
 import static io.cucumber.cucumberexpressions.Node.Type.EXPRESSION_NODE;
 import static io.cucumber.cucumberexpressions.Node.Type.OPTIONAL_NODE;
 import static io.cucumber.cucumberexpressions.Node.Type.TEXT_NODE;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.ALTERNATION;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.BEGIN_OPTIONAL;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.BEGIN_PARAMETER;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.END_OF_LINE;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.END_OPTIONAL;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.END_PARAMETER;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.START_OF_LINE;
-import static io.cucumber.cucumberexpressions.Ast.Token.Type.WHITE_SPACE;
+import static io.cucumber.cucumberexpressions.Token.Type.ALTERNATION;
+import static io.cucumber.cucumberexpressions.Token.Type.BEGIN_OPTIONAL;
+import static io.cucumber.cucumberexpressions.Token.Type.BEGIN_PARAMETER;
+import static io.cucumber.cucumberexpressions.Token.Type.END_OF_LINE;
+import static io.cucumber.cucumberexpressions.Token.Type.END_OPTIONAL;
+import static io.cucumber.cucumberexpressions.Token.Type.END_PARAMETER;
+import static io.cucumber.cucumberexpressions.Token.Type.START_OF_LINE;
+import static io.cucumber.cucumberexpressions.Token.Type.WHITE_SPACE;
 import static io.cucumber.cucumberexpressions.CucumberExpressionException.createAlternationNotAllowedInOptional;
 import static io.cucumber.cucumberexpressions.CucumberExpressionException.createInvalidParameterTypeName;
 import static io.cucumber.cucumberexpressions.CucumberExpressionException.createMissingEndToken;

java/src/main/java/io/cucumber/cucumberexpressions/CucumberExpressionParser.java

@@ -1,6 +1,5 @@
 package io.cucumber.cucumberexpressions;
 
-import io.cucumber.cucumberexpressions.Ast.Token;
 import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;

java/src/main/java/io/cucumber/cucumberexpressions/CucumberExpressionTokenizer.java

@@ -0,0 +1,9 @@
+package io.cucumber.cucumberexpressions;
+
+interface Located {
+
+    int start();
+
+    int end();
+
+}

java/src/main/java/io/cucumber/cucumberexpressions/Located.java

@@ -11,7 +11,7 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 @API(since = "18.1", status = EXPERIMENTAL)
-public final class Node implements Ast.Located {
+public final class Node implements Located {
 
     private final Type type;
     private final @Nullable List<Node> nodes;

java/src/main/java/io/cucumber/cucumberexpressions/Node.java

@@ -0,0 +1,134 @@
+package io.cucumber.cucumberexpressions;
+
+import org.jspecify.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.StringJoiner;
+
+import static java.util.Objects.requireNonNull;
+
+final class Token implements Located {
+
+    private static final char escapeCharacter = '\\';
+    private static final char alternationCharacter = '/';
+    private static final char beginParameterCharacter = '{';
+    private static final char endParameterCharacter = '}';
+    private static final char beginOptionalCharacter = '(';
+    private static final char endOptionalCharacter = ')';
+
+    final String text;
+    final Type type;
+    final int start;
+    final int end;
+
+    Token(String text, Type type, int start, int end) {
+        this.text = requireNonNull(text);
+        this.type = requireNonNull(type);
+        this.start = start;
+        this.end = end;
+    }
+
+    static boolean canEscape(Integer token) {
+        if (Character.isWhitespace(token)) {
+            return true;
+        }
+        return switch (token) {
+            case (int) escapeCharacter,
+                 (int) alternationCharacter,
+                 (int) beginParameterCharacter,
+                 (int) endParameterCharacter,
+                 (int) beginOptionalCharacter,
+                 (int) endOptionalCharacter -> true;
+            default -> false;
+        };
+    }
+
+    static Type typeOf(Integer token) {
+        if (Character.isWhitespace(token)) {
+            return Type.WHITE_SPACE;
+        }
+        return switch (token) {
+            case (int) alternationCharacter -> Type.ALTERNATION;
+            case (int) beginParameterCharacter -> Type.BEGIN_PARAMETER;
+            case (int) endParameterCharacter -> Type.END_PARAMETER;
+            case (int) beginOptionalCharacter -> Type.BEGIN_OPTIONAL;
+            case (int) endOptionalCharacter -> Type.END_OPTIONAL;
+            default -> Type.TEXT;
+        };
+    }
+
+    static boolean isEscapeCharacter(int token) {
+        return token == escapeCharacter;
+    }
+
+    @Override
+    public int start() {
+        return start;
+    }
+
+    @Override
+    public int end() {
+        return end;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Token token = (Token) o;
+        return start == token.start &&
+                end == token.end &&
+                text.equals(token.text) &&
+                type == token.type;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(start, end, text, type);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", "{", "}")
+                .add("\"type\": \"" + type + "\"")
+                .add("\"start\": " + start)
+                .add("\"end\": " + end)
+                .add("\"text\": \"" + text + "\"")
+                .toString();
+    }
+
+    enum Type {
+        START_OF_LINE,
+        END_OF_LINE,
+        WHITE_SPACE,
+        BEGIN_OPTIONAL("" + beginOptionalCharacter, "optional text"),
+        END_OPTIONAL("" + endOptionalCharacter, "optional text"),
+        BEGIN_PARAMETER("" + beginParameterCharacter, "a parameter"),
+        END_PARAMETER("" + endParameterCharacter, "a parameter"),
+        ALTERNATION("" + alternationCharacter, "alternation"),
+        TEXT;
+
+        private final @Nullable String symbol;
+        private final @Nullable String purpose;
+
+        Type() {
+            this(null, null);
+        }
+
+        Type(@Nullable String symbol, @Nullable String purpose) {
+            this.symbol = symbol;
+            this.purpose = purpose;
+        }
+
+        String purpose() {
+            return requireNonNull(purpose, name() + " does not have a purpose");
+        }
+
+        String symbol() {
+            return requireNonNull(symbol, name() + " does not have a symbol");
+        }
+    }
+
+}

java/src/main/java/io/cucumber/cucumberexpressions/Token.java

@@ -1,6 +1,5 @@
 package io.cucumber.cucumberexpressions;
 
-import io.cucumber.cucumberexpressions.Ast.Token;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.extension.ParameterContext;