updated jars, start for GuardedPattern and NullPattern

boalang · Feb 21, 2024 · f96b0d5 · f96b0d5
1 parent 22da2cc
commit f96b0d5
Show file tree

Hide file tree

Showing 17 changed files with 120 additions and 56 deletions.
diff --git a/lib/datagen/org.eclipse.core.commands-3.10.200.jar b/lib/datagen/org.eclipse.core.commands-3.10.200.jar
diff --git a/lib/datagen/org.eclipse.core.contenttype-3.8.200.jar b/lib/datagen/org.eclipse.core.contenttype-3.8.200.jar
diff --git a/lib/datagen/org.eclipse.core.expressions-3.8.200.jar b/lib/datagen/org.eclipse.core.expressions-3.8.200.jar
diff --git a/lib/datagen/org.eclipse.core.filesystem-1.9.500.jar b/lib/datagen/org.eclipse.core.filesystem-1.9.500.jar
diff --git a/lib/datagen/org.eclipse.core.jobs-3.13.100.jar b/lib/datagen/org.eclipse.core.jobs-3.13.100.jar
diff --git a/lib/datagen/org.eclipse.core.resources-3.18.0.jar b/lib/datagen/org.eclipse.core.resources-3.18.0.jar
diff --git a/lib/datagen/org.eclipse.core.runtime-3.26.0.jar b/lib/datagen/org.eclipse.core.runtime-3.26.0.jar
diff --git a/lib/datagen/org.eclipse.equinox.app-1.6.200.jar b/lib/datagen/org.eclipse.equinox.app-1.6.200.jar
diff --git a/lib/datagen/org.eclipse.equinox.common-3.16.200.jar b/lib/datagen/org.eclipse.equinox.common-3.16.200.jar
diff --git a/lib/datagen/org.eclipse.equinox.preferences-3.10.100.jar b/lib/datagen/org.eclipse.equinox.preferences-3.10.100.jar
diff --git a/lib/datagen/org.eclipse.equinox.registry-3.11.200.jar b/lib/datagen/org.eclipse.equinox.registry-3.11.200.jar
diff --git a/lib/datagen/org.eclipse.jdt.core-3.31.0.jar b/lib/datagen/org.eclipse.jdt.core-3.31.0.jar
diff --git a/lib/datagen/org.eclipse.osgi-3.18.100.jar b/lib/datagen/org.eclipse.osgi-3.18.100.jar
diff --git a/lib/datagen/org.eclipse.text-3.12.200.jar b/lib/datagen/org.eclipse.text-3.12.200.jar
diff --git a/src/compiled-proto/boa/types/Ast.java b/src/compiled-proto/boa/types/Ast.java
diff --git a/src/java/boa/datagen/util/JavaVisitor.java b/src/java/boa/datagen/util/JavaVisitor.java
@@ -60,6 +60,11 @@ public class JavaVisitor extends ASTVisitor {
 	public static final int JLS15 = 15;
 	public static final int JLS16 = 16;
 	public static final int JLS17 = 17;
+	public static final int JLS18 = 18;
+	public static final int JLS19 = 19;
+	public static final int JLS20 = 20;
+	public static final int JLS21 = 21;
+
 	public static final int SOURCE_JAVA_ERROR = 999;
 
 	protected CompilationUnit root = null;
@@ -2573,6 +2578,33 @@ public boolean visit(final RecordDeclaration node) {
 		return false;
 	}
 
+	//begin Java 21
+
+	@Override
+	public boolean visit(final NullPattern node) {
+		setAstLevel(JLS21);
+
+		final boa.types.Ast.Expression.Builder eb = boa.types.Ast.Expression.newBuilder();
+		eb.setKind(boa.types.Ast.Expression.ExpressionKind.NULL_PATTERN);
+		expressions.push(eb.build());
+
+		return false;
+	}
+
+	@Override
+	public boolean visit(final GuardedPattern node) {
+		setAstLevel(JLS21);
+
+		final boa.types.Ast.Expression.Builder eb = boa.types.Ast.Expression.newBuilder();
+		eb.setKind(boa.types.Ast.Expression.ExpressionKind.GUARDED_PATTERN);
+		eb.addExpressions(expressions.pop());
+		node.getPattern().accept(this);
+		eb.addExpressions(expressions.pop());
+		expressions.push(eb.build());
+
+		return false;
+	}
+
 	//////////////////////////////////////////////////////////////
 	// Utility methods
 

diff --git a/src/proto/ast.proto b/src/proto/ast.proto
@@ -375,6 +375,9 @@ message Expression {
 		PROVIDES = 106;
 		PACKAGE_NAME = 107;
 		MODULE_NAME = 108;
+		PATTERN = 109;
+		NULL_PATTERN = 110;
+		GUARDED_PATTERN = 111;
 	}
 	/** The kind of expression */
 	required ExpressionKind kind = 1;