Merge pull request lcompilers#659 from certik/str1

Implement string escaping
dylon · Jun 21, 2022 · 64f1af3 · 64f1af3
2 parents 3f7aab5 + a1503ae
commit 64f1af3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/integration_tests/CMakeLists.txt b/integration_tests/CMakeLists.txt
@@ -136,6 +136,7 @@ RUN(NAME expr_08             LABELS llvm c)
 RUN(NAME test_types_01       LABELS cpython llvm)
 RUN(NAME test_str_01         LABELS cpython llvm)
 RUN(NAME test_str_02         LABELS cpython llvm)
+RUN(NAME test_str_03         LABELS cpython llvm c)
 RUN(NAME test_list_01        LABELS cpython llvm)
 RUN(NAME modules_01          LABELS cpython llvm)
 RUN(NAME test_math           LABELS cpython llvm)

diff --git a/integration_tests/run_tests.sh b/integration_tests/run_tests.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-git clean -dfx
+rm -rf b1 b2 b3
 
 # Append "-j4" or "-j" to run in parallel
 jn=$1

diff --git a/integration_tests/test_str_03.py b/integration_tests/test_str_03.py
@@ -0,0 +1,6 @@
+def test_new_line():
+    print("abc\n")
+    print("\ndef")
+    print("x\nyz")
+
+test_new_line()
diff --git a/src/libasr/codegen/asr_to_c.cpp b/src/libasr/codegen/asr_to_c.cpp
@@ -415,8 +415,8 @@ R"(
         std::vector<std::string> v;
         for (size_t i=0; i<x.n_values; i++) {
             this->visit_expr(*x.m_values[i]);
-            ASR::ttype_t* valuei_type = ASRUtils::expr_type(x.m_values[i]);
-            out += get_print_type(valuei_type, ASR::is_a<ASR::ArrayRef_t>(*x.m_values[i]));
+            ASR::ttype_t* value_type = ASRUtils::expr_type(x.m_values[i]);
+            out += get_print_type(value_type, ASR::is_a<ASR::ArrayRef_t>(*x.m_values[i]));
             if (i+1!=x.n_values) {
                 out += " ";
             }

diff --git a/src/libasr/codegen/asr_to_c_cpp.h b/src/libasr/codegen/asr_to_c_cpp.h
@@ -542,7 +542,20 @@ R"(#include <stdio.h>
 
 
     void visit_StringConstant(const ASR::StringConstant_t &x) {
-        src = "\"" + std::string(x.m_s) + "\"";
+        src = "\"";
+        std::string s = x.m_s;
+        for (size_t idx=0; idx < s.size(); idx++) {
+            if (s[idx] == '\n') {
+                src += "\\n";
+            } else if (s[idx] == '\\') {
+                src += "\\\\";
+            } else if (s[idx] == '\"') {
+                src += "\\\"";
+            } else {
+                src += s[idx];
+            }
+        }
+        src += "\"";
         last_expr_precedence = 2;
     }