Merge pull request #3 from koji-kojiro/develop

Develop

Author: koji-kojiro

.gitignore

@@ -7,4 +7,5 @@ __test__*__
 *~
 python/
 build/
-README.html
+README.html
+*.png

examples/source/app.d

@@ -11,6 +11,11 @@ void main() {
     subplots();
 }
 
+void bad() {
+    plt.plot("hoge");
+    plt.show();
+}
+
 void simple() {
     auto x = iota(0, 2.05, 0.05).map!(x => x * PI);
     auto y = x.map!(sin);

source/matplotlibd/package.d

@@ -1,3 +1,2 @@
 module matplotlibd;
 import matplotlibd.pyplot;
-

source/matplotlibd/pyplot.d

@@ -1,8 +1,5 @@
 module matplotlibd.pyplot;
 
-import std.stdio : popen, fprintf, fclose;
-import std.format : format;
-
 private:
 
 string py_path = "python";
@@ -57,15 +54,15 @@ immutable string py_methods = (){
     foreach(name; method_names) {
         py_methods ~=
             "void " ~ name ~ "(T...)(T a)" ~
-            "{string p;if(a.length>0){foreach(i;a){p~=parseArgs(i);}" ~
+            "{import std.format: format;" ~
+            "string p;if(a.length>0){foreach(i;a){p~=parseArgs(i);}" ~
             "p = p[0..$-1];}send(format(\"plt."~ name ~ "(%s)\n\",p));";
 
         if (name == "show" || name == "savefig")
             py_methods ~= "eval();}\n";
         else
-            py_methods ~= "}\n";    
+            py_methods ~= "}\n";
     }
-    
     return py_methods;
 }();
 
@@ -74,16 +71,29 @@ template GenPyMethods() {
 }
 
 void eval() {
-    auto p = popen(py_path, "w");
-    p.fprintf("%s", cast(char*)py_script);
-    p.fclose();
+    import std.process: pipeProcess, wait, Redirect;
+    auto pipes = pipeProcess(py_path, Redirect.stdin | Redirect.stderr);
+
+    pipes.stdin.writeln(py_script);
+    pipes.stdin.writeln("exit()");
+    pipes.stdin.close();
+
+    wait(pipes.pid);
+
+    string error;
+    foreach (line; pipes.stderr.byLine)
+        error ~= line ~ "\n";
+
+    if (error)
+        throw new Exception("\n\nERROR occurred in Python:\n" ~ error);
 }
 
 void send(string line) {
     py_script ~= line;
 }
 
 string d2py(T)(T v) {
+    import std.format: format;
     static if (is(typeof(v) : PyNone))
         return "None";
 
@@ -98,15 +108,13 @@ string d2py(T)(T v) {
 }
 
 string parseArgs(Args)(Args args) {
-
     static if (is(typeof(args.keys) : string[])) {
         string parsed;
         foreach(key; args.byKey)
             parsed ~= key ~ "=" ~  d2py(args[key]) ~ ",";
     }
     else
         string parsed =  d2py(args) ~ ",";
-    
     return parsed;
 }