Nanorc parser: replace Posix char class regexes with Java regexes

jline · Dec 5, 2020 · 82ca0f0 · 82ca0f0
1 parent 172644f
commit 82ca0f0
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -1687,10 +1687,23 @@ public NanorcParser(InputStream in, String name, String target) {
 
         public void parse() throws IOException {
             String line = reader.readLine();
-            while (line!= null) {
+            while (line != null) {
                 line = line.trim();
                 if (line.length() > 0 && !line.startsWith("#")) {
-                    line = line.replaceAll("\\\\<", "\\\\b").replaceAll("\\\\>", "\\\\b").replaceAll("\\[\\[:space:]]", "\\\\s");
+                    line = line.replaceAll("\\\\<", "\\\\b")
+                            .replaceAll("\\\\>", "\\\\b")
+                            .replaceAll("\\[:alnum:]", "\\\\p{Alnum}")
+                            .replaceAll("\\[:alpha:]", "\\\\p{Alpha}")
+                            .replaceAll("\\[:blank:]", "\\\\p{Blank}")
+                            .replaceAll("\\[:cntrl:]", "\\\\p{Cntrl}")
+                            .replaceAll("\\[:digit:]", "\\\\p{Digit}")
+                            .replaceAll("\\[:graph:]", "\\\\p{Graph}")
+                            .replaceAll("\\[:lower:]", "\\\\p{Lower}")
+                            .replaceAll("\\[:print:]", "\\\\p{Print}")
+                            .replaceAll("\\[:punct:]", "\\\\p{Punct}")
+                            .replaceAll("\\[:space:]", "\\\\s")
+                            .replaceAll("\\[:upper:]", "\\\\p{Upper}")
+                            .replaceAll("\\[:xdigit:]", "\\\\p{XDigit}");
                     List<String> parts = Parser.split(line);
                     if (parts.get(0).equals("syntax")) {
                         syntaxName = parts.get(1);