Refactor, renaming

Author: lmasroca

core/src/main/kotlin/org/evomaster/core/parser/GeneRegexJavaVisitor.kt

@@ -11,7 +11,7 @@ private const val EOF_TOKEN = "<EOF>"
 /**
  * Created by arcuri82 on 11-Sep-19.
  */
-class GeneRegexJavaVisitor(externalFlags: RegexFlags = RegexFlags()) : RegexJavaBaseVisitor<VisitResult>(){
+class GeneRegexJavaVisitor(externalRegexFlags: RegexFlags = RegexFlags()) : RegexJavaBaseVisitor<VisitResult>(){
 
     private val hexEscapePrefixes = setOf('x', 'u')
 
@@ -52,9 +52,9 @@ class GeneRegexJavaVisitor(externalFlags: RegexFlags = RegexFlags()) : RegexJava
     /**
      * Tracks the flags active in the current lexical scope.
      * Updated when entering a flag group, restored on exit.
-     * Initialized from [externalFlags].
+     * Initialized from [externalRegexFlags].
      */
-    private var currentFlags = externalFlags
+    private var currentFlags = externalRegexFlags
 
     /**
      * Parses a FLAG_GROUP_OPEN or FLAG_SCOPE_OPEN token text like "(?i:", "(?iu:", "(?-i:", "(?i-u:", "(?iu)", etc.

core/src/main/kotlin/org/evomaster/core/parser/RegexHandler.kt

@@ -4,7 +4,7 @@ import org.antlr.v4.runtime.*
 import org.antlr.v4.runtime.misc.ParseCancellationException
 import org.evomaster.core.search.gene.regex.RegexGene
 import org.evomaster.core.utils.RegexFlags
-import org.evomaster.core.utils.RegexWithFlags
+import org.evomaster.core.utils.RegexWithExternalFlags
 
 
 /**
@@ -21,14 +21,14 @@ object RegexHandler {
         WARNING mutable static state, but those are just caches.
         Key -> regex
      */
-    private val cacheJVM : MutableMap<RegexWithFlags, RegexGene> = mutableMapOf()
+    private val cacheJVM : MutableMap<RegexWithExternalFlags, RegexGene> = mutableMapOf()
     private val cacheEcma262 : MutableMap<String, RegexGene> = mutableMapOf()
     private val cachePostgresLike : MutableMap<String, RegexGene> = mutableMapOf()
     private val cachePostgresSimilarTo : MutableMap<String, RegexGene> = mutableMapOf()
 
-    fun createGeneForJVM(regex: String, flags: RegexFlags = RegexFlags()) : RegexGene {
+    fun createGeneForJVM(regex: String, externalRegexFlags: RegexFlags = RegexFlags()) : RegexGene {
 
-        val key = RegexWithFlags(regex, flags)
+        val key = RegexWithExternalFlags(regex, externalRegexFlags)
         if(cacheJVM.contains(key)){
             return cacheJVM[key]!!.copy() as RegexGene
         }
@@ -41,7 +41,7 @@ object RegexHandler {
 
         val pattern = parser.pattern()
 
-        val res = GeneRegexJavaVisitor(flags).visit(pattern)
+        val res = GeneRegexJavaVisitor(externalRegexFlags).visit(pattern)
 
         val gene= res.genes.first() as RegexGene
         cacheJVM[key] = gene.copy() as RegexGene

core/src/main/kotlin/org/evomaster/core/search/gene/string/StringGene.kt

@@ -36,7 +36,7 @@ import org.evomaster.core.search.service.Randomness
 import org.evomaster.core.search.service.mutator.MutationWeightControl
 import org.evomaster.core.search.service.mutator.genemutation.AdditionalGeneMutationInfo
 import org.evomaster.core.search.service.mutator.genemutation.SubsetGeneMutationSelectionStrategy
-import org.evomaster.core.utils.RegexWithFlags
+import org.evomaster.core.utils.RegexWithExternalFlags
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.lang.IllegalStateException
@@ -817,12 +817,12 @@ class StringGene(
                         } else {
                             RegexSharedUtils.handlePartialMatch(it.value)
                         }
-                        RegexWithFlags(regex, it.externalRegexFlagsBitmask)
+                        RegexWithExternalFlags(regex, it.externalRegexFlagsBitmask)
                     }
                     //.joinToString("|")
-                    .forEach {(regex, flags) ->
+                    .forEach {(regex, externalFlags) ->
                       try {
-                              toAddGenes.add(RegexHandler.createGeneForJVM(regex, flags))
+                              toAddGenes.add(RegexHandler.createGeneForJVM(regex, externalFlags))
                               log.trace("Regex, added specification for: {}", regex)
                           } catch (e: Exception) {
                               LoggingUtil.uniqueWarn(log, "Failed to handle regex: $regex")

core/src/main/kotlin/org/evomaster/core/utils/RegexWithExternalFlags.kt

@@ -0,0 +1,5 @@
+package org.evomaster.core.utils
+
+data class RegexWithExternalFlags(val regex: String, val externalRegexFlags: RegexFlags) {
+    constructor (regex: String, externalRegexFlagBitmask: Int) : this(regex, RegexFlags.fromExternalJavaRegexFlagBitmask(externalRegexFlagBitmask))
+}