Added cmd line options for code-completion

Author: cmaglie

CommandLine.cpp

@@ -29,16 +29,22 @@
 
 #include "CommandLine.hpp"
 #include "Config.hpp"
+#include "utils.hpp"
 
 #include <iostream>
-
-using namespace std;
+#include <sstream>
 
 bool debugOutput;
 bool outputDiagnostics;
 bool outputOnlyNeededPrototypes;
 bool outputPreprocessedSketch = true;
 
+// Code completion parameters
+bool outputCodeCompletions;
+string codeCompleteFilename;
+int codeCompleteLine;
+int codeCompleteCol;
+
 static cl::OptionCategory arduinoToolCategory("Arduino options");
 // TODO: add complete help
 static cl::extrahelp arduinoHelp("\n"
@@ -49,6 +55,7 @@ static cl::extrahelp commonHelp(CommonOptionsParser::HelpMessage);
 static cl::opt<bool> debugOutputOpt("debug");
 static cl::opt<bool> outputOnlyNeededPrototypesOpt("output-only-needed-prototypes");
 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";
@@ -68,14 +75,39 @@ CommonOptionsParser doCommandLineParsing(int argc, const char **argv) {
     outputDiagnosticsOpt.setInitialValue(false);
     outputDiagnosticsOpt.setDescription("Output diagnostics (warnings/errors) in json format");
 
+    outputCodeCompletionsOpt.setCategory(arduinoToolCategory);
+    outputCodeCompletionsOpt.setInitialValue("");
+    outputCodeCompletionsOpt.setDescription(
+            "Output code completions (suggestions) in json format.\n"
+            "This option requires the cursor position in the format \"filename:line:col\"");
+
     cl::AddExtraVersionPrinter(printVersion);
 
     CommonOptionsParser optParser(argc, argv, arduinoToolCategory);
 
+    /* Parse outputCodeCompletion parameter */
+    if (outputCodeCompletionsOpt.getValue() != "") {
+        vector<string> spl = split(outputCodeCompletionsOpt.getValue(), ':');
+        if (spl.size() != 3) {
+            cerr << "code completion requires parameter in the form \"filename:line:col\"\n";
+            exit(1);
+        }
+        codeCompleteFilename = spl[0];
+        if (!stringToInt(spl[1], &codeCompleteLine)) {
+            cerr << "code completion requires 'line' to be a positive integer parameter in the form \"filename:line:col\"\n";
+            exit(1);
+        }
+        if (!stringToInt(spl[2], &codeCompleteCol)) {
+            cerr << "code completion requires 'col' to be a positive integer parameter in the form \"filename:line:col\"\n";
+            exit(1);
+        }
+        outputCodeCompletions = true;
+    }
+
     debugOutput = debugOutputOpt.getValue();
     outputOnlyNeededPrototypes = outputOnlyNeededPrototypesOpt.getValue();
     outputDiagnostics = outputDiagnosticsOpt.getValue();
-    if (outputDiagnostics) {
+    if (outputDiagnostics || outputCodeCompletions) {
         outputPreprocessedSketch = false;
     }
     return optParser;

CommandLine.hpp

@@ -35,10 +35,17 @@
 using namespace clang;
 using namespace clang::tooling;
 using namespace llvm;
+using namespace std;
 
 extern bool debugOutput;
 extern bool outputOnlyNeededPrototypes;
 extern bool outputDiagnostics;
 extern bool outputPreprocessedSketch;
 
+// Code completion parameters
+extern bool outputCodeCompletions;
+extern string codeCompleteFilename;
+extern int codeCompleteLine;
+extern int codeCompleteCol;
+
 CommonOptionsParser doCommandLineParsing(int argc, const char **argv);

utils.hpp

@@ -0,0 +1,59 @@
+/*
+ * This file is part of arduino-preprocessor.
+ *
+ * Copyright 2017 BCMI LABS SA
+ *
+ * arduino-preprocessor is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+
+#pragma once
+
+#include <vector>
+#include <sstream>
+
+using namespace std;
+
+vector<string> split(const string &in, const char sep) {
+    vector<string> res;
+    istringstream params(in);
+    string s;
+    while (getline(params, s, sep)) {
+        res.push_back(s);
+    }
+    return res;
+}
+
+bool stringToInt(const string &in, int *out) {
+    stringstream ss(in);
+    ss >> *out;
+    if (!ss.fail()) {
+        return true;
+    }
+    // Tolerate trailing white space
+    ss >> ws;
+    if (ss.eof()) {
+        return true;
+    }
+    return false;
+}