fix(preproc): Fix macro redefinition

Author: robertoraggi

src/cxx/preprocessor.cc

@@ -335,6 +335,7 @@ struct Preprocessor::Private {
   Control *control_ = nullptr;
   DiagnosticsClient *diagnosticsClient_ = nullptr;
   CommentHandler *commentHandler_ = nullptr;
+  PreprocessorDelegate *delegate_ = nullptr;
   bool canResolveFiles_ = true;
   std::vector<fs::path> systemIncludePaths_;
   std::vector<fs::path> quoteIncludePaths_;
@@ -1322,6 +1323,11 @@ void Preprocessor::Private::defineMacro(const TokList *ts) {
 
   auto name = ts->head->text;
 
+  if (auto it = macros_.find(name); it != macros_.end()) {
+    warning(ts->head->token(), "'{}' macro redefined", name);
+    macros_.erase(it);
+  }
+
   if (ts->tail && !ts->tail->head->space &&
       ts->tail->head->is(TokenKind::T_LPAREN)) {
     ts = ts->tail->tail;  // skip macro name and '('
@@ -1464,6 +1470,12 @@ void Preprocessor::setCommentHandler(CommentHandler *commentHandler) {
   d->commentHandler_ = commentHandler;
 }
 
+PreprocessorDelegate *Preprocessor::delegate() const { return d->delegate_; }
+
+void Preprocessor::setDelegate(PreprocessorDelegate *delegate) {
+  d->delegate_ = delegate;
+}
+
 bool Preprocessor::canResolveFiles() const { return d->canResolveFiles_; }
 
 void Preprocessor::setCanResolveFiles(bool canResolveFiles) {

src/cxx/preprocessor.h

@@ -35,6 +35,7 @@ class Token;
 class DiagnosticsClient;
 class CommentHandler;
 class Preprocessor;
+class PreprocessorDelegate;
 
 class CommentHandler {
  public:
@@ -44,6 +45,11 @@ class CommentHandler {
                              const Token &token) = 0;
 };
 
+class PreprocessorDelegate {
+ public:
+  virtual ~PreprocessorDelegate() = default;
+};
+
 class Preprocessor {
  public:
   Preprocessor(Preprocessor &&) noexcept = default;
@@ -57,6 +63,9 @@ class Preprocessor {
   CommentHandler *commentHandler() const;
   void setCommentHandler(CommentHandler *commentHandler);
 
+  PreprocessorDelegate *delegate() const;
+  void setDelegate(PreprocessorDelegate *delegate);
+
   bool canResolveFiles() const;
   void setCanResolveFiles(bool canResolveFiles);
 

src/frontend/frontend.cc

@@ -96,6 +96,17 @@ struct VerifyDiagnostics : DiagnosticsClient {
   std::list<Diagnostic> reportedDiagnostics;
   bool verify = false;
 
+  bool hasErrors() const {
+    if (verify) return !reportedDiagnostics.empty();
+
+    for (const auto& d : reportedDiagnostics) {
+      if (d.severity() == Severity::Error || d.severity() == Severity::Fatal)
+        return true;
+    }
+
+    return false;
+  }
+
   void report(const Diagnostic& diagnostic) override {
     if (!verify) {
       DiagnosticsClient::report(diagnostic);
@@ -303,7 +314,7 @@ bool runOnFile(const CLI& cli, const std::string& fileName) {
     diagnosticsClient.verifyExpectedDiagnostics(
         verifyCommentHandler.expectedDiagnostics);
 
-    return true;
+    return !diagnosticsClient.hasErrors();
   }
 
   preprocesor->squeeze();
@@ -330,7 +341,7 @@ bool runOnFile(const CLI& cli, const std::string& fileName) {
   diagnosticsClient.verifyExpectedDiagnostics(
       verifyCommentHandler.expectedDiagnostics);
 
-  return result;
+  return !diagnosticsClient.hasErrors();
 }
 
 }  // namespace cxx
@@ -358,9 +369,13 @@ int main(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
+  int existStatus = EXIT_SUCCESS;
+
   for (const auto& fileName : inputFiles) {
-    runOnFile(cli, fileName);
+    if (!runOnFile(cli, fileName)) {
+      existStatus = EXIT_FAILURE;
+    }
   }
 
-  return EXIT_SUCCESS;
+  return existStatus;
 }

tests/unit_tests/preprocessor/define.002.cc

@@ -0,0 +1,12 @@
+// RUN: %cxx -verify -E %s -o - | filecheck %s
+
+#define RESULT 0
+
+#define RESULT 1  // expected-warning {{'RESULT' macro redefined}}
+
+int main() {
+  int result = RESULT;
+  return result;
+}
+
+// CHECK: int result = 1;