Merge pull request #847 from akshanshbhatt/pr_string_prefix

Author: Thirumalai-Shaktivel

src/lpython/parser/semantics.h

@@ -683,9 +683,14 @@ static inline ast_t *PREFIX_STRING(Allocator &al, Location &l, char *prefix, cha
     Vec<expr_t *> exprs;
     exprs.reserve(al, 4);
     ast_t *tmp = nullptr;
-    // Assuming prefix has only one character.
-    prefix[0] = tolower(prefix[0]);
-    if (strcmp(prefix, "f") == 0) {
+    if (strcmp(prefix, "U") == 0 ) {
+        return make_ConstantStr_t(al, l,  s, nullptr);
+    }
+    for (size_t i = 0; i < strlen(prefix); i++) {
+        prefix[i] = tolower(prefix[i]);
+    }
+    if (strcmp(prefix, "f") == 0 || strcmp(prefix, "fr") == 0 
+            || strcmp(prefix, "rf") == 0) {
         std::string str = std::string(s);
         std::string s1 = "\"";
         std::string id;
@@ -729,7 +734,8 @@ static inline ast_t *PREFIX_STRING(Allocator &al, Location &l, char *prefix, cha
             }
         }
         tmp = make_JoinedStr_t(al, l, exprs.p, exprs.size());
-    } else if (strcmp(prefix, "b") == 0) {
+    } else if (strcmp(prefix, "b") == 0 || strcmp(prefix, "br") == 0 
+            || strcmp(prefix, "rb") == 0) {
         std::string str = std::string(s);
         size_t start_pos = 0;
         while((start_pos = str.find("\n", start_pos)) != std::string::npos) {

tests/parser/string1.py

@@ -19,3 +19,31 @@
 
 u"1,2,3 # comment"
 u'Text'
+U"Text"
+
+fr"""Text {id}"""
+Fr"Text {id}"
+fR"Text {id}"
+FR"Text {id}"
+rf"Text {id}"
+rF"""
+Text {id}
+"""
+Rf'Text {id}'
+RF"Text {id}"
+
+br"Text"
+Br"""
+Text
+"""
+bR"Text"
+
+BR"Text"
+rb"Text"
+rB"""
+Text
+"""
+Rb'Text'
+RB"Text"
+
+rf'\N{AMPERSAND}'

tests/reference/ast_new-string1-96b90b3.json

@@ -2,11 +2,11 @@
     "basename": "ast_new-string1-96b90b3",
     "cmd": "lpython --show-ast --new-parser --no-color {infile} -o {outfile}",
     "infile": "tests/parser/string1.py",
-    "infile_hash": "e30b4b895b30b3ebb04e26d5b0c473fd8f048f60253eadd38088479a",
+    "infile_hash": "e4090ab45efb09242e14f3dd494ca869a32e71de3617306d959d8721",
     "outfile": null,
     "outfile_hash": null,
     "stdout": "ast_new-string1-96b90b3.stdout",
-    "stdout_hash": "dae1d81b8b616fcc63e5f47744c88ac18b8e6f8b351e603fa831176d",
+    "stdout_hash": "1666ca8ebba593a8bf35e7906efabf5726626b7c82b130324bd78a43",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0

tests/reference/ast_new-string1-96b90b3.stdout

@@ -3,4 +3,6 @@ sometext
 anotherline
 " ())) (Expr (ConstantBytes "b'Some text goes here.'" ())) (Expr (ConstantBytes "b'\nMultiple texts goes here.\n'" ())) (Expr (ConstantStr "
 Text
-" ())) (Expr (ConstantStr "Text" ())) (Expr (ConstantStr "a\tb\nA\tB" ())) (Expr (ConstantStr "1,2,3 # comment" "u")) (Expr (ConstantStr "Text" "u"))] [])
+" ())) (Expr (ConstantStr "Text" ())) (Expr (ConstantStr "a\tb\nA\tB" ())) (Expr (ConstantStr "1,2,3 # comment" "u")) (Expr (ConstantStr "Text" "u")) (Expr (ConstantStr "Text" ())) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "
+Text " ()) (FormattedValue (Name id Load) -1 ()) (ConstantStr "
+" ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (JoinedStr [(ConstantStr "Text " ()) (FormattedValue (Name id Load) -1 ())])) (Expr (ConstantBytes "b'Text'" ())) (Expr (ConstantBytes "b'\nText\n'" ())) (Expr (ConstantBytes "b'Text'" ())) (Expr (ConstantBytes "b'Text'" ())) (Expr (ConstantBytes "b'Text'" ())) (Expr (ConstantBytes "b'\nText\n'" ())) (Expr (ConstantBytes "b'Text'" ())) (Expr (ConstantBytes "b'Text'" ())) (Expr (JoinedStr [(ConstantStr "\N" ()) (FormattedValue (Name AMPERSAND Load) -1 ())]))] [])