commit 86e113342a49499850701e3b752ce56ec73d34d6
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Tue Jul 28 15:24:17 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Tue Jul 28 15:24:17 2015 +0900
tree bf2429c8e9cc7ff2347aefad956b79266eee1f76
parent 7409aee3b69a7de63af7a4c3dd7ea87d84fed0f1

[C++] Fix info, warning, and error for ninja

func.cc

diff --git a/func.cc b/func.cc
index e0f9e52..5f01ebe 100644
--- a/func.cc
+++ b/func.cc
@@ -534,30 +534,33 @@
   *s += var->Flavor();
 }
 
-void InfoFunc(const vector<Value*>& args, Evaluator* ev, string* s) {
+void InfoFunc(const vector<Value*>& args, Evaluator* ev, string*) {
   shared_ptr<string> a = args[0]->Eval(ev);
   if (ev->avoid_io()) {
-    *s += "KATI_TODO(info)";
+    ev->add_delayed_output_command(StringPrintf("echo '%s'", a->c_str()));
     return;
   }
   printf("%s\n", a->c_str());
   fflush(stdout);
 }
 
-void WarningFunc(const vector<Value*>& args, Evaluator* ev, string* s) {
+void WarningFunc(const vector<Value*>& args, Evaluator* ev, string*) {
   shared_ptr<string> a = args[0]->Eval(ev);
   if (ev->avoid_io()) {
-    *s += "KATI_TODO(warning)";
+    ev->add_delayed_output_command(
+        StringPrintf("echo '%s:%d: %s' 2>&1", LOCF(ev->loc()), a->c_str()));
     return;
   }
   printf("%s:%d: %s\n", LOCF(ev->loc()), a->c_str());
   fflush(stdout);
 }
 
-void ErrorFunc(const vector<Value*>& args, Evaluator* ev, string* s) {
+void ErrorFunc(const vector<Value*>& args, Evaluator* ev, string*) {
   shared_ptr<string> a = args[0]->Eval(ev);
   if (ev->avoid_io()) {
-    *s += "KATI_TODO(error)";
+    ev->add_delayed_output_command(
+        StringPrintf("echo '%s:%d: *** %s.' 2>&1 && false",
+                     LOCF(ev->loc()), a->c_str()));
     return;
   }
   ev->Error(StringPrintf("*** %s.", a->c_str()));