Moved IdentifiersList class on his own file

Author: cmaglie

IdentifiersList.cpp

@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+#include "IdentifiersList.h"
+
+void IdentifiersList::dump(ostream &out) {
+    out << "Undeclared identifiers:\n";
+    for (IdentifierLocation *m : * this) {
+        const FullSourceLoc &sl = m->location.getSpellingLoc();
+        out << "  " << sl.getSpellingLineNumber() << ":" << sl.getSpellingColumnNumber();
+        out << " " << m->identifier << "\n";
+    }
+}
+
+IdentifierLocation *IdentifiersList::findFirst(string name) {
+    for (IdentifierLocation *m : * this) {
+        if (m->identifier == name)
+            return m;
+    }
+    return nullptr;
+}

IdentifiersList.h

@@ -0,0 +1,50 @@
+/*
+ * 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 <clang/AST/AST.h>
+
+#include <string>
+#include <iostream>
+#include <list>
+
+using namespace clang;
+using namespace std;
+
+typedef struct {
+    FullSourceLoc location;
+    string identifier;
+} IdentifierLocation;
+
+class IdentifiersList : public list<IdentifierLocation *> {
+public:
+    IdentifierLocation *findFirst(string name);
+    void dump(ostream &out);
+};

main.cpp

@@ -47,39 +47,14 @@
 
 #include "Config.h"
 #include "CommandLine.h"
+#include "IdentifiersList.h"
 
 using namespace clang;
 using namespace clang::ast_matchers;
 using namespace clang::tooling;
 using namespace llvm;
 using namespace std;
 
-typedef struct {
-    FullSourceLoc location;
-    string identifier;
-} IdentifierLocation;
-
-class IdentifiersList : public list<IdentifierLocation *> {
-public:
-
-    void dump() {
-        outs() << "Undeclared identifiers:\n";
-        for (IdentifierLocation *m : * this) {
-            const FullSourceLoc &sl = m->location.getSpellingLoc();
-            outs() << "  " << sl.getSpellingLineNumber() << ":" << sl.getSpellingColumnNumber();
-            outs() << " " << m->identifier << "\n";
-        }
-    }
-
-    IdentifierLocation *findFirst(string name) {
-        for (IdentifierLocation *m : * this) {
-            if (m->identifier == name)
-                return m;
-        }
-        return nullptr;
-    }
-};
-
 IdentifiersList undeclaredIdentifiers;
 
 class UndefinedIdentifiersCollector : public DiagnosticConsumer {
@@ -254,7 +229,10 @@ class INOPreprocessAction : public ASTFrontendAction {
 
     virtual void EndSourceFileAction() override {
         if (debugOutput) {
-            undeclaredIdentifiers.dump();
+            ostringstream out;
+            undeclaredIdentifiers.dump(out);
+            out.flush();
+            outs() << out.str();
         }
 
         const FileID mainFileID = rewriter.getSourceMgr().getMainFileID();

package-arduino-preprocessor.bash

@@ -108,7 +108,7 @@ CXXFLAGS=`clang/bin/llvm-config --cxxflags`
 LDFLAGS=`clang/bin/llvm-config --ldflags`
 LLVMLIBS=`clang/bin/llvm-config --libs --system-libs`
 CLANGLIBS=`ls clang/lib/libclang*.a | sed s/.*libclang/-lclang/ | sed s/.a$//`
-SOURCES="main.cpp CommandLine.cpp"
+SOURCES="main.cpp CommandLine.cpp IdentifiersList.cpp"
 $CXX $SOURCES -o objdir/arduino-preprocessor $CXXFLAGS $LDFLAGS -Wl,--start-group $LLVMLIBS $CLANGLIBS -Wl,--end-group
 
 rm -f arduino-preprocessor-${OUTPUT_VERSION}-${OUTPUT_TAG}.tar.bz2