Attempt to process cell without semicolon

Author: anutosh491

src/xinterpreter.cpp

@@ -28,6 +28,7 @@
 #include "xinput.hpp"
 #include "xinspect.hpp"
 #include "xmagics/os.hpp"
+#include "xmime_internal.hpp"
 #include "xparser.hpp"
 #include "xsystem.hpp"
 
@@ -128,7 +129,7 @@ __get_cxx_version ()
 
     void interpreter::execute_request_impl(
         send_reply_callback cb,
-        int /*execution_count*/,
+        int execution_counter,
         const std::string& code,
         xeus::execute_request_config config,
         nl::json /*user_expressions*/
@@ -153,7 +154,9 @@ __get_cxx_version ()
         auto errorlevel = 0;
         std::string ename;
         std::string evalue;
-        bool compilation_result = false;
+        //bool compilation_result = false;
+        intptr_t output_value;
+        bool hadError = false;
 
         // If silent is set to true, temporarily dismiss all std::cerr and
         // std::cout outputs resulting from `process_code`.
@@ -174,7 +177,7 @@ __get_cxx_version ()
         try
         {
             StreamRedirectRAII R(err);
-            compilation_result = Cpp::Process(code.c_str());
+            output_value = Cpp::Evaluate(code.c_str(), &hadError);
         }
         catch (std::exception& e)
         {
@@ -188,7 +191,7 @@ __get_cxx_version ()
             ename = "Error: ";
         }
 
-        if (compilation_result)
+        if (hadError)
         {
             errorlevel = 1;
             ename = "Error: ";
@@ -233,15 +236,12 @@ __get_cxx_version ()
         }
         else
         {
-            /*
-                // Publish a mime bundle for the last return value if
-                // the semicolon was omitted.
-                if (!config.silent && output.hasValue() && trim(code).back() != ';')
-                {
-                    nl::json pub_data = mime_repr(output);
-                    publish_execution_result(execution_counter, std::move(pub_data), nl::json::object());
-                }
-                */
+            // Publish a mime bundle for the last return value if
+            // the semicolon was omitted.
+            if (!config.silent && !hadError && trim(code).back() != ';') {
+                nl::json pub_data = mime_repr(output_value);
+                publish_execution_result(execution_counter, std::move(pub_data), nl::json::object());
+            }
             // Compose execute_reply message.
             kernel_res["status"] = "ok";
             kernel_res["payload"] = nl::json::array();

src/xmime_internal.hpp

@@ -0,0 +1,61 @@
+/************************************************************************************
+ * Copyright (c) 2016, Johan Mabille, Loic Gouarin, Sylvain Corlay, Wolf Vollprecht *
+ * Copyright (c) 2016, QuantStack                                                   *
+ *                                                                                  *
+ * Distributed under the terms of the BSD 3-Clause License.                         *
+ *                                                                                  *
+ * The full license is in the file LICENSE, distributed with this software.         *
+ ************************************************************************************/
+
+#ifndef XCPP_MIME_INTERNAL_HPP
+#define XCPP_MIME_INTERNAL_HPP
+
+#include <cstddef>
+#include <locale>
+#include <string>
+
+#include "clang/Interpreter/CppInterOp.h" // from CppInterOp package
+
+#include <nlohmann/json.hpp>
+
+namespace nl = nlohmann;
+
+namespace xcpp
+{
+    inline nl::json mime_repr(intptr_t V)
+    {
+        // Return a JSON mime bundle representing the specified value.
+        // Include "xcpp/xmime.hpp" only on the first time a variable is displayed.
+        static bool xmime_included = false;
+
+        if (!xmime_included)
+        {
+            Cpp::Declare("#include \"xcpp/xmime.hpp\"");
+            xmime_included = true;
+        }
+
+        intptr_t mimeReprV;
+        bool hadError = false;
+        {
+            std::ostringstream oss;
+            oss << reinterpret_cast<void*>(V);
+            std::string pointerStr = oss.str();
+
+            std::string code;
+            code = "using xcpp::mime_bundle_repr; ";
+            code += "mime_bundle_repr(*((const void**)";
+            code += pointerStr;
+            code += "));";
+
+            mimeReprV = Cpp::Evaluate(code.c_str(), &hadError);
+        }
+
+        if (!hadError && mimeReprV != 0) {
+            return *(nl::json*)mimeReprV;
+        } else {
+            return nl::json::object();
+        }
+    }
+}
+
+#endif