rename java sources (fix errors)

FormalLanguageConstrainedPathQuerying · May 30, 2024 · 8c8a5b9 · 8c8a5b9
1 parent 6a6269c
commit 8c8a5b9
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 31 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -19,24 +19,16 @@ dependencies {
     implementation(project(":solver"))
     implementation(project(":generator"))
     implementation(project(":examples"))
-    // 2. for java_cup (?)
-    implementation("java_cup:java_cup:0.9e")
-    // 3. for antlr
+    // 2. for antlr
     implementation("org.antlr:antlr4:4.13.1")
-    // 4. for iguana
-    implementation("io.usethesource:capsule:0.6.3")
-    implementation("info.picocli:picocli:4.7.0")
-    implementation("com.google.guava:guava-testlib:23.0")
-    implementation("com.fasterxml.jackson.core:jackson-core:2.14.0")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0")
 }
 
 fun getArgs(strFolder: String): Array<String> {
     val resourcesDir = File(strFolder)
     val files = resourcesDir.listFiles()!!
     return files.map { it.toString() }.sorted().toTypedArray()
 }
-
+//benchmark{}
 benchmark {
     configurations {
         named("main") {

diff --git a/benchmarks/src/main/kotlin/org/Benchmarks.kt b/benchmarks/src/main/kotlin/org/Benchmarks.kt
@@ -1,7 +1,7 @@
 package org
 
-import java7.JavaLexer
-import java7.JavaToken
+import java8.JavaLexer
+import java8.JavaToken
 import org.ucfs.input.*
 import org.ucfs.rsm.symbol.Term
 import java.io.StringReader

diff --git a/benchmarks/src/main/kotlin/org/RecoveryOfflineGll.kt b/benchmarks/src/main/kotlin/org/RecoveryOfflineGll.kt
@@ -8,7 +8,7 @@ class RecoveryOfflineGll : BaseBench() {
 
     @Benchmark
     fun measureGll(blackhole: Blackhole) {
-        val parser = org.ucfs.Java7ParserRecovery<Int, LinearInputLabel>()
+        val parser = org.ucfs.Java8ParserRecovery<Int, LinearInputLabel>()
         parser.input = getTokenStream(fileContents)
         blackhole.consume(parser.parse())
     }

diff --git a/benchmarks/src/main/kotlin/org/RecoveryOnlineGll.kt b/benchmarks/src/main/kotlin/org/RecoveryOnlineGll.kt
@@ -1,8 +1,8 @@
 package org
 
-import java7.Java7
+import java8.Java8
 import kotlinx.benchmark.*
-import org.junit.Before
+
 import org.ucfs.input.LinearInput
 import org.ucfs.input.LinearInputLabel
 import org.ucfs.parser.Gll
@@ -11,11 +11,10 @@ import org.ucfs.parser.Gll
 @State(Scope.Benchmark)
 class RecoveryOnlineGll : BaseBench() {
 
-    val startState = Java7().rsm
+    val startState = Java8().rsm
     lateinit var tokens: LinearInput<Int, LinearInputLabel>
 
     @Setup
-    @Before
     override fun prepare() {
         super.prepare()
         tokens = getTokenStream(fileContents)

diff --git a/benchmarks/src/main/kotlin/org/SimpleOfflineGll.kt b/benchmarks/src/main/kotlin/org/SimpleOfflineGll.kt
@@ -9,7 +9,7 @@ class SimpleOfflineGll : BaseBench() {
 
     @Benchmark
     fun measureGll(blackhole: Blackhole) {
-        val parser = org.ucfs.Java7Parser<Int, LinearInputLabel>()
+        val parser = org.ucfs.Java8Parser<Int, LinearInputLabel>()
         parser.input = getTokenStream(fileContents)
         blackhole.consume(parser.parse())
     }

diff --git a/benchmarks/src/main/kotlin/org/SimpleOnlineGll.kt b/benchmarks/src/main/kotlin/org/SimpleOnlineGll.kt
@@ -1,8 +1,7 @@
 package org
 
-import java7.Java7
+import java8.Java8
 import kotlinx.benchmark.*
-import org.junit.Before
 import org.ucfs.input.LinearInput
 import org.ucfs.input.LinearInputLabel
 import org.ucfs.parser.Gll
@@ -11,11 +10,10 @@ import org.ucfs.parser.Gll
 @State(Scope.Benchmark)
 class SimpleOnlineGll : BaseBench() {
 
-    val startState = Java7().rsm
+    val startState = Java8().rsm
     lateinit var tokens: LinearInput<Int, LinearInputLabel>
 
     @Setup
-    @Before
     override fun prepare() {
         super.prepare()
         tokens = getTokenStream(fileContents)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -1,15 +1,11 @@
 plugins {
-
     java
     kotlin("jvm") version "1.9.20"
     application
 }
 
-group = "org.example"
-version = "unspecified"
-
 application{
-    mainClass = "java7.GeneratorKt"
+    mainClass = "java8.GeneratorKt"
 }
 repositories {
     mavenCentral()
@@ -20,3 +16,4 @@ dependencies {
     implementation(project(":generator"))
 }
 
+kotlin { jvmToolchain(11) }
diff --git a/examples/src/main/java/java8/Java.x b/examples/src/main/java/java8/Java.x
@@ -101,7 +101,6 @@ CommentContent       = ( [^*] | \*+ [^/*] )*
 "private"      { return JavaToken.PRIVATE; }
 "abstract"     { return JavaToken.ABSTRACT; }
 "final"        { return JavaToken.FINAL; }
-"const"        { return JavaToken.FINAL; }
 "strictfp"     { return JavaToken.STRICTFP; }
 "implements"   { return JavaToken.IMPLEMENTS; }
 "transient"    { return JavaToken.TRANSIENT; }

diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -2,9 +2,6 @@ plugins {
     kotlin("jvm") version "1.9.20"
 }
 
-
-version = "unspecified"
-
 repositories {
     mavenCentral()
 }