BUG-5410: introduce RegularExpression.toPatternString()

[yangtools.git] / third-party / xsd-regex / src / main / java / org / opendaylight / yangtools / xsd / regex / RangeToken.java

diff --git a/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RangeToken.java b/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RangeToken.java
index a6640e4ec29c351e9c698e869995be17f4fb8b9c..1328475764c3b3b396a9822ed6df679906ccfed2 100644 (file)
--- a/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RangeToken.java
+++ b/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RangeToken.java
@@ -594,11 +594,11 @@ final class RangeToken extends Token implements java.io.Serializable {
                         sb.append(',');
                     }
                     if (this.ranges[i] == this.ranges[i+1]) {
-                        sb.append(escapeCharInCharClass(this.ranges[i]));
+                        sb.append(escapeCharInCharClass(this.ranges[i], options));
                     } else {
-                        sb.append(escapeCharInCharClass(this.ranges[i]));
+                        sb.append(escapeCharInCharClass(this.ranges[i], options));
                         sb.append('-');
-                        sb.append(escapeCharInCharClass(this.ranges[i+1]));
+                        sb.append(escapeCharInCharClass(this.ranges[i+1], options));
                     }
                 }
                 sb.append(']');
@@ -619,11 +619,11 @@ final class RangeToken extends Token implements java.io.Serializable {
                         sb.append(',');
                     }
                     if (this.ranges[i] == this.ranges[i+1]) {
-                        sb.append(escapeCharInCharClass(this.ranges[i]));
+                        sb.append(escapeCharInCharClass(this.ranges[i], options));
                     } else {
-                        sb.append(escapeCharInCharClass(this.ranges[i]));
+                        sb.append(escapeCharInCharClass(this.ranges[i], options));
                         sb.append('-');
-                        sb.append(escapeCharInCharClass(this.ranges[i+1]));
+                        sb.append(escapeCharInCharClass(this.ranges[i+1], options));
                     }
                 }
                 sb.append(']');
@@ -633,7 +633,7 @@ final class RangeToken extends Token implements java.io.Serializable {
         return ret;
     }
 
-    private static String escapeCharInCharClass(int ch) {
+    private static String escapeCharInCharClass(int ch, int options) {
         String ret;
         switch (ch) {
           case '[':  case ']':  case '-':  case '^':
@@ -645,6 +645,11 @@ final class RangeToken extends Token implements java.io.Serializable {
           case '\r':  ret = "\\r";  break;
           case '\t':  ret = "\\t";  break;
           case 0x1b:  ret = "\\e";  break;
+          case '$':
+              if (isSet(options, RegularExpression.XMLSCHEMA_MODE)) {
+                  ret = "\\$";
+                  break;
+              }
           //case 0x0b:  ret = "\\v";  break;
           default:
             if (ch < 0x20) {
@@ -652,7 +657,12 @@ final class RangeToken extends Token implements java.io.Serializable {
                 ret = "\\x"+pre.substring(pre.length()-2, pre.length());
             } else if (ch >= 0x10000) {
                 String pre = "0"+Integer.toHexString(ch);
-                ret = "\\v"+pre.substring(pre.length()-6, pre.length());
+                String sub = pre.substring(pre.length()-6, pre.length());
+                if (isSet(options, RegularExpression.XMLSCHEMA_MODE)) {
+                    ret = "\\x{"+sub+"}";
+                } else {
+                    ret = "\\v"+sub;
+                }
             } else {
                 ret = ""+(char)ch;
             }