merge cleanup

Author: lmasroca

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

@@ -266,12 +266,12 @@ class GeneRegexJavaVisitor : RegexJavaBaseVisitor<VisitResult>(){
             list.addAll(rec)
         } else {
             val startText = ctx.classAtom()[0].text
-            assert(startText.length == 1 || startText.length==2) // single chars or \+ and \. escaped chars
+            assert(startText.length == 1 || startText.length == 2) // single chars or \+ and \. escaped chars
 
-            val start : Char
+            val start: Char
             val end: Char
 
-            if (startText.length==1) {
+            if (startText.length == 1) {
                 start = startText[0]
                 end = if (ctx.classAtom().size == 2) {
                     ctx.classAtom()[1].text[0]
@@ -283,7 +283,7 @@ class GeneRegexJavaVisitor : RegexJavaBaseVisitor<VisitResult>(){
                 // This case handles the \. and \+ cases
                 // wheren . and + should be treated as
                 // regular chars
-                assert(startText=="\\+" || startText=="\\.")
+                assert(startText == "\\+" || startText == "\\.")
                 start = startText[1]
                 end = start
             }
@@ -351,12 +351,12 @@ class GeneRegexJavaVisitor : RegexJavaBaseVisitor<VisitResult>(){
         res.data = if(ctx.atomEscape() != null) {
             when (val rec = ctx.atomEscape().accept(this).genes[0]) {
                 is CharacterClassEscapeRxGene -> {
-                    rec.charClassRepr.internalRanges
+                    rec.multiCharRange.ranges
                 }
 
                 is PatternCharacterBlockGene -> {
                     if (rec.stringBlock.length > 1) throw IllegalArgumentException("CharClass element cannot be strings")
-                    else listOf(rec.stringBlock[0] to rec.stringBlock[0])
+                    else listOf(CharacterRange(rec.stringBlock[0], rec.stringBlock[0]))
                 }
 
                 else -> throw IllegalArgumentException("Unexpected CharClass content")

core/src/main/kotlin/org/evomaster/core/search/gene/regex/CharacterClassEscapeRxGene.kt

@@ -22,6 +22,10 @@ import kotlin.collections.contains
 \D	Find a non-digit character
 \s	Find a whitespace character
 \S	Find a non-whitespace character
+\h	Find a horizontal space character
+\H	Find a non-horizontal space character
+\v	Find a vertical space character
+\V	Find a non-vertical space character
 \p{X} Find a character from X POSIX character class (eg:\p{Lower})
  */
 class CharacterClassEscapeRxGene(
@@ -71,12 +75,13 @@ class CharacterClassEscapeRxGene(
             "Blank" to stringToListOfCharacterRanges(" \t"),
             "Cntrl" to listOf(CharacterRange(0, 0x1f)) + stringToListOfCharacterRanges("\u007f"),
             "XDigit" to listOf(CharacterRange('0', '9'), CharacterRange('a', 'f'), CharacterRange('A', 'F')),
-            "Space" to spaceSet
+            "Space" to spaceSet,
+            "Pe" to stringToListOfCharacterRanges(")]}")
         ).mapValues { (_, value) -> MultiCharacterRange(false, value) }
     }
 
     var value: String = ""
-    private var multiCharRange: MultiCharacterRange
+    var multiCharRange: MultiCharacterRange
 
     init {
         if (type[0] !in "wWdDsSvVhHp") {