update grammar naming for lambda-grammars

Author: bachish

solver/src/main/kotlin/org/ucfs/grammar/combinator/Grammar.kt

@@ -1,11 +1,7 @@
 package org.ucfs.grammar.combinator
 
 import org.ucfs.grammar.combinator.regexp.Nt
-import org.ucfs.grammar.combinator.regexp.Regexp
-import org.ucfs.incrementalDfs
 import org.ucfs.rsm.RsmState
-import org.ucfs.rsm.symbol.ITerminal
-import org.ucfs.rsm.symbol.Nonterminal
 
 
 open class Grammar {
@@ -14,6 +10,11 @@ open class Grammar {
     private lateinit var startNt: Nt
     private lateinit var fictitiousStartNt: Nt
 
+    val name: String = this.javaClass.simpleName.ifEmpty {
+        //in case of lambda objects
+        this.javaClass.name.substringBeforeLast('$').substringAfterLast('$')
+    }
+
     private var _rsm: RsmState? = null
     val rsm: RsmState
         get() {

test-shared/src/test/kotlin/solver/correctnessTests/AbstractCorrectnessTest.kt

@@ -29,7 +29,7 @@ abstract class AbstractCorrectnessTest {
 
 
     fun runTests(grammar :Grammar) {
-        val grammarName = grammar.javaClass.simpleName
+        val grammarName = grammar.name
         writeRsmToDot(grammar.rsm, "${grammarName}Rsm")
         val path: Path = getRootDataFolder()
         val testCasesFolder = File(path.resolve(grammarName).toUri())