Ticket #166: ticket166.patch

Source/CobraTokenizer.cobra

@@ -121 +121 @@
             r'UINT_SIZE             uint[0-9]+(?=[^A-Za-z0-9_])',
             r'FLOAT_SIZE            float[0-9]+(?=[^A-Za-z0-9_])',
 
-            r"CHAR_LIT_SINGLE       c'\\?.'",
-            r'CHAR_LIT_DOUBLE       c"\\?."',
+            r"CHAR_LIT_SINGLE       c'(?:\\'|\\?[^'])'",
+            r'CHAR_LIT_DOUBLE       c"(?:\\"|\\?[^"])"',
 
             # doc strings
             r'DOC_STRING_START      """[ \t]*\n',
             r'DOC_STRING_LINE       """.*"""[ \t]*\n',
 
             # sharp strings
-            r"SHARP_SINGLE          sharp'[^'\n]*'",
-            r'SHARP_DOUBLE          sharp"[^"\n]*"',
+            r"SHARP_SINGLE          sharp'(?:\\.?|[^'\n])*'",
+            r'SHARP_DOUBLE          sharp"(?:\\.?|[^"\n])*"',
 
             # raw strings
-            r"STRING_RAW_SINGLE     r'[^'\n]*'",
-            r'STRING_RAW_DOUBLE     r"[^"\n]*"',
+            r"STRING_RAW_SINGLE     r'(?:\\.?|[^'\n])*'",
+            r'STRING_RAW_DOUBLE     r"(?:\\.?|[^"\n])*"',
 
             # substituted strings
             r'RBRACKET_SPECIAL      ]',
@@ -149 +149 @@
             r'STRING_PART_FORMAT    :[^X"\n\[]*(?=])'.replace('X', "'"),
 
             # plain strings
-            r"STRING_NOSUB_SINGLE   ns'[^'\n]*'",
-            r'STRING_NOSUB_DOUBLE   ns"[^"\n]*"',
+            r"STRING_NOSUB_SINGLE   ns'(?:\\.?|[^'\n])*'",
+            r'STRING_NOSUB_DOUBLE   ns"(?:\\.?|[^"\n])*"',
 
-            r"STRING_SINGLE         '[^'\n]*'",
-            r'STRING_DOUBLE         "[^"\n]*"',
+            r"STRING_SINGLE         '(?:\\.?|[^'\n])*'",
+            r'STRING_DOUBLE         "(?:\\.?|[^"\n])*"',
 
             r'TOQ                   to\?',
             r'ID                    [A-Za-z_][A-Za-z0-9_]*',

Tests/100-basics/064-1-string-raw.cobra

@@ -26 +26 @@
         assert s.length==2
         assert s[0]==c'['
         assert s[1]==c']'
+
+        assert r'\"' == r"\""
+        assert r'cobra\language' == r"cobra\language"
+        assert r'[]' == r"[]"

Tests/100-basics/060-string.cobra

@@ -53 +53 @@
             s = 'aoeu'
             s = s[0].toString + 'b'
             assert s=='ab'
+
+            assert 'cobra\'s lair' == "cobra's lair"
+            assert '"' == "\""
+            assert '\'' == "'"

Tests/100-basics/055-char.cobra

@@ -20 +20 @@
             assert c'x'==c
             assert c<>c'y'
             assert c'y'<>c
+
+            assert c'\'' == c"'"
+            assert c"\"" == c'"'
+