WIP

Author: samyron

Rakefile

@@ -16,6 +16,7 @@ JAVA_DIR            = "java/src/json/ext"
 JAVA_RAGEL_PATH     = "#{JAVA_DIR}/ParserConfig.rl"
 JAVA_PARSER_SRC     = "#{JAVA_DIR}/ParserConfig.java"
 JAVA_SOURCES        = FileList["#{JAVA_DIR}/*.java"]
+JAVA_VEC_SOURCES    = FileList["#{JAVA_DIR}/vectorized/*.java"]
 JAVA_CLASSES        = []
 JRUBY_PARSER_JAR    = File.expand_path("lib/json/ext/parser.jar")
 JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar")
@@ -68,7 +69,8 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
       classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * ':'
       obj = src.sub(/\.java\Z/, '.class')
       file obj => src do
-        sh 'javac', '--enable-preview', '--add-modules', 'jdk.incubator.vector', '-classpath', classpath, '-source', '21', '-target', '21', src
+        sh 'javac', '-classpath', classpath, '-source', '1.8', '-target', '1.8', src
+        # '--enable-preview', '--add-modules', 'jdk.incubator.vector', 
       end
       JAVA_CLASSES << obj
     end

java/src/json/ext/EscapeScanner.java

@@ -15,22 +15,19 @@ static class State {
     }
 
     static class VectorSupport {
+        private static String VECTORIZED_ESCAPE_SCANNER_CLASS = "json.ext.vectorized.VectorizedEscapeScanner";
         static final EscapeScanner VECTORIZED_ESCAPE_SCANNER;
 
         static {
-            Optional<Module> vectorModule = ModuleLayer.boot().findModule("jdk.incubator.vector");
             EscapeScanner scanner = null;
-            if (vectorModule.isPresent()) {
-                try {
-                    Class<?> vectorEscapeScannerClass = EscapeScanner.class.getClassLoader().loadClass("json.ext.VectorizedEscapeScanner");
-                    Constructor<?> vectorizedEscapeScannerConstructor = vectorEscapeScannerClass.getDeclaredConstructor();
-                    scanner = (EscapeScanner) vectorizedEscapeScannerConstructor.newInstance();
-                } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
-                    // Fallback to the ScalarEscapeScanner if we cannot load the VectorizedEscapeScanner.
-                    System.err.println("Failed to load VectorizedEscapeScanner, falling back to ScalarEscapeScanner: " + e.getMessage());
-                    scanner = null;
-                }
-                
+            try {
+                Class<?> vectorEscapeScannerClass = EscapeScanner.class.getClassLoader().loadClass(VECTORIZED_ESCAPE_SCANNER_CLASS);
+                Constructor<?> vectorizedEscapeScannerConstructor = vectorEscapeScannerClass.getDeclaredConstructor();
+                scanner = (EscapeScanner) vectorizedEscapeScannerConstructor.newInstance();
+            } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                // Fallback to the ScalarEscapeScanner if we cannot load the VectorizedEscapeScanner.
+                System.err.println("Failed to load VectorizedEscapeScanner, falling back to ScalarEscapeScanner: " + e.getMessage());
+                scanner = null;
             }
             VECTORIZED_ESCAPE_SCANNER = scanner;
         }

java/src/json/ext/StringEncoder.java

@@ -21,10 +21,6 @@
 import org.jruby.util.ByteList;
 import org.jruby.util.StringSupport;
 
-import jdk.incubator.vector.ByteVector;
-import jdk.incubator.vector.VectorSpecies;
-import json.ext.VectorizedEscapeScanner;
-
 /**
  * An encoder that reads from the given source and outputs its representation
  * to another ByteList. The source string is fully checked for UTF-8 validity,

java/src/json/ext/VectorizedEscapeScanner.java renamed to java/src/json/ext/vectorized/VectorizedEscapeScanner.java

@@ -1,4 +1,4 @@
-package json.ext;
+package json.ext.vectorized;
 
 import java.io.IOException;