From 194d8b99b33b1fe58e14a6143334a2d3ee5397ed Mon Sep 17 00:00:00 2001
From: Dean Moldovan <dean0x7d@gmail.com>
Date: Wed, 29 Mar 2017 00:27:56 +0200
Subject: [PATCH] Support raw string literals as input for py::eval (#766)

* Support raw string literals as input for py::eval
* Dedent only when needed
---
 docs/advanced/pycpp/utilities.rst | 15 +++++++++++++++
 include/pybind11/eval.h           | 10 ++++++++--
 tests/test_eval.cpp               | 16 +++++++++++++---
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/docs/advanced/pycpp/utilities.rst b/docs/advanced/pycpp/utilities.rst
index ba0dbef88..442d0e9c9 100644
--- a/docs/advanced/pycpp/utilities.rst
+++ b/docs/advanced/pycpp/utilities.rst
@@ -55,3 +55,18 @@ is always ``none``).
 
     // Evaluate the statements in an separate Python file on disk
     py::eval_file("script.py", scope);
+
+C++11 raw string literals are also supported and quite handy for this purpose.
+The only requirement is that the first statement must be on a new line following
+the raw string delimiter ``R"(``, ensuring all lines have common leading indent:
+
+.. code-block:: cpp
+
+    py::eval<py::eval_statements>(R"(
+        x = get_answer()
+        if x == 42:
+            print('Hello World!')
+        else:
+            print('Bye!')
+        )", scope
+    );
diff --git a/include/pybind11/eval.h b/include/pybind11/eval.h
index 5b2b98272..d4d26c12b 100644
--- a/include/pybind11/eval.h
+++ b/include/pybind11/eval.h
@@ -11,8 +11,6 @@
 
 #pragma once
 
-#pragma once
-
 #include "pybind11.h"
 
 NAMESPACE_BEGIN(pybind11)
@@ -56,6 +54,14 @@ object eval(str expr, object global = object(), object local = object()) {
     return reinterpret_steal<object>(result);
 }
 
+template <eval_mode mode = eval_expr, size_t N>
+object eval(const char (&s)[N], object global = object(), object local = object()) {
+    /* Support raw string literals by removing common leading whitespace */
+    auto expr = (s[0] == '\n') ? str(module::import("textwrap").attr("dedent")(s))
+                               : str(s);
+    return eval<mode>(expr, global, local);
+}
+
 template <eval_mode mode = eval_statements>
 object eval_file(str fname, object global = object(), object local = object()) {
     if (!global) {
diff --git a/tests/test_eval.cpp b/tests/test_eval.cpp
index ed4c226fe..05cc7f06d 100644
--- a/tests/test_eval.cpp
+++ b/tests/test_eval.cpp
@@ -20,11 +20,21 @@ test_initializer eval([](py::module &m) {
             return 42;
         });
 
-        auto result = py::eval<py::eval_statements>(
-            "print('Hello World!');\n"
-            "x = call_test();",
+        // Regular string literal
+        py::eval<py::eval_statements>(
+            "message = 'Hello World!'\n"
+            "x = call_test()",
             global, local
         );
+
+        // Multi-line raw string literal
+        auto result = py::eval<py::eval_statements>(R"(
+            if x == 42:
+                print(message)
+            else:
+                raise RuntimeError
+            )", global, local
+        );
         auto x = local["x"].cast<int>();
 
         return result == py::none() && x == 42;