scanner: Accept \R and \N escape sequences in regex literals

https://bugzilla.gnome.org/show_bug.cgi?id=749576

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f64269fb1342fa8e68dd3890ec37b8d3be9b7b23..f9dfaffd0c708298f5c79a995ef404d46a943a6b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -355,6 +355,7 @@ TESTS = \
        parser/preprocessor.vala \
        parser/template.vala \
        parser/tuple.vala \
+       parser/bug749576.vala \
        $(NULL)
 
 NON_NULL_TESTS = \

diff --git a/tests/parser/bug749576.vala b/tests/parser/bug749576.vala
new file mode 100644 (file)
index 0000000..8aa961a
--- /dev/null
+++ b/tests/parser/bug749576.vala
@@ -0,0 +1,29 @@
+void main() {
+       unowned string a = "first line\nnext line";
+       unowned string b = "first line\rnext line";
+       unowned string c = "first \tline\r\nnext \tline";
+
+       assert (/\Rnext/.match (a));
+       assert (/\Rnext/.match (b));
+       assert (/\Rnext/.match (c));
+
+       try {
+               var r = new Regex ("\\Rnext");
+               assert (r.match (a));
+
+               var r2 = new Regex ("""\Rnext""");
+               assert (r2.match (a));
+       } catch {
+       }
+
+       assert (/\Nline/.match (c));
+
+       try {
+               var r = new Regex ("\\Nline");
+               assert (r.match (c));
+
+               var r2 = new Regex ("""\Nline""");
+               assert (r2.match (c));
+       } catch {
+       }
+}

diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index e232a77bc44e281e285cb4c8ff9d4ce65ff0f5f9..d5d013642083320bab11425944d1616db1244c01 100644 (file)
--- a/vala/valageniescanner.vala
+++ b/vala/valageniescanner.vala
@@ -208,7 +208,9 @@ public class Vala.Genie.Scanner {
                                                case 'B':
                                                case 'f':
                                                case 'n':
+                                               case 'N':
                                                case 'r':
+                                               case 'R':
                                                case 't':
                                                case 'a':
                                                case 'A':

diff --git a/vala/valascanner.vala b/vala/valascanner.vala
index 8b50a59d4eb94c90b80796c7a316b886f334e867..7c4c75c0c2ad340210ec33c961bfc54b832fcba8 100644 (file)
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -193,7 +193,9 @@ public class Vala.Scanner {
                                                case 'B':
                                                case 'f':
                                                case 'n':
+                                               case 'N':
                                                case 'r':
+                                               case 'R':
                                                case 't':
                                                case 'v':
                                                case 'a':