Always use llvm' outs() instead of cout

This avoids interleaving output in the two streams when debugging is
enabled.

Author: cmaglie

ArduinoDiagnosticConsumer.cpp

@@ -40,7 +40,7 @@ void ArduinoDiagnosticConsumer::collectUndeclaredIdentifiersIn(IdentifiersList &
     undeclaredIdentifiersList = &list;
 }
 
-void ArduinoDiagnosticConsumer::outputJsonDiagnosticsTo(ostream &out) {
+void ArduinoDiagnosticConsumer::outputJsonDiagnosticsTo(raw_ostream &out) {
     jsonDiagnosticOutput = &out;
 }
 

ArduinoDiagnosticConsumer.hpp

@@ -41,11 +41,11 @@ class ArduinoDiagnosticConsumer : public DiagnosticConsumer {
 
     void collectUndeclaredIdentifiersIn(IdentifiersList &list);
 
-    void outputJsonDiagnosticsTo(ostream &out);
+    void outputJsonDiagnosticsTo(raw_ostream &out);
 
 private:
     IdentifiersList *undeclaredIdentifiersList = nullptr;
-    ostream *jsonDiagnosticOutput = nullptr;
+    raw_ostream *jsonDiagnosticOutput = nullptr;
 
     void HandleDiagnostic(DiagnosticsEngine::Level level, const Diagnostic& info) override;
 };

CodeCompletion.cpp

@@ -70,7 +70,7 @@ class CustomCodeCompleteConsumer : public CodeCompleteConsumer {
             string ccStr = "";
             raw_string_ostream OS(ccStr);
             CodeCompletionString *ccs = res[i].CreateCodeCompletionString(s, ctx, getAllocator(), TUInfo, includeBriefComments());
-            //cout << encode(res[i], ccs, sm).dump(2) << "\n";
+            //outs() << encode(res[i], ccs, sm).dump(2) << "\n";
             output.push_back(encode(res[i], ccs, sm));
         }
 
@@ -175,5 +175,5 @@ void DoCodeCompletion(const string &filename, const string &code, int line, int
         action.EndSourceFile();
     }
 
-    cout << ccConsumer->GetJSON()->dump();
-}
+    outs() << ccConsumer->GetJSON()->dump();
+}

CommandLine.cpp

@@ -58,8 +58,8 @@ static cl::opt<bool> outputDiagnosticsOpt("output-diagnostics");
 static cl::opt<string> outputCodeCompletionsOpt("output-code-completions");
 
 static void printVersion() {
-    cout << "Arduino (https://www.arduino.cc/):\n";
-    cout << "  arduino-preprocessor version " VERSION "\n";
+    outs() << "Arduino (https://www.arduino.cc/):\n";
+    outs() << "  arduino-preprocessor version " VERSION "\n";
 }
 
 CommonOptionsParser doCommandLineParsing(int argc, const char **argv) {

main.cpp

@@ -283,14 +283,14 @@ int main(int argc, const char **argv) {
     ArduinoDiagnosticConsumer dc;
     dc.collectUndeclaredIdentifiersIn(undeclaredIdentifiers);
     if (outputDiagnostics) {
-        dc.outputJsonDiagnosticsTo(cout);
+        dc.outputJsonDiagnosticsTo(outs());
     }
     tool.setDiagnosticConsumer(&dc);
 
     int res = tool.run(newFrontendActionFactory<INOPreprocessAction>().get());
 
     if (outputPreprocessedSketch) {
-        cout << preprocessedSketch;
+        outs() << preprocessedSketch;
     }
 
     if (outputCodeCompletions) {