clang-format

p4lang · Apr 3, 2024 · f003fa6 · f003fa6
1 parent f1e234b
commit f003fa6
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 30 deletions.
diff --git a/frontends/p4/def_use.cpp b/frontends/p4/def_use.cpp
@@ -257,7 +257,8 @@ bool LocationSet::operator==(const LocationSet &other) const {
     auto it = other.begin();
     for (auto s : locations) {
         if (it == other.end() || *it != s) return false;
-        ++it; }
+        ++it;
+    }
     return it == other.end();
 }
 

diff --git a/frontends/p4/toP4/toP4.cpp b/frontends/p4/toP4/toP4.cpp
@@ -1204,7 +1204,8 @@ bool ToP4::preorder(const IR::ForStatement *s) {
         if (!first) builder.append(", ");
         builder.supressStatementSemi();
         visit(d, "init");
-        first = false; }
+        first = false;
+    }
     builder.append("; ");
     visit(s->condition, "condition");
     builder.append("; ");
@@ -1214,7 +1215,8 @@ bool ToP4::preorder(const IR::ForStatement *s) {
         if (!first) builder.append(", ");
         builder.supressStatementSemi();
         visit(e, "updates");
-        first = false; }
+        first = false;
+    }
     builder.append(") ");
     if (!s->body->is<IR::BlockStatement>()) {
         builder.append("{");

diff --git a/ir/dbprint-stmt.cpp b/ir/dbprint-stmt.cpp
@@ -92,13 +92,15 @@ void IR::ForStatement::dbprint(std::ostream &out) const {
     for (auto *sd : init) {
         if (!first) out << ", ";
         out << sd;
-        first = false; }
+        first = false;
+    }
     out << "; " << condition << "; ";
     first = true;
     for (auto *sd : updates) {
         if (!first) out << ", ";
         out << sd;
-        first = false; }
+        first = false;
+    }
     out << ") {" << indent << Log::endl << body << " }" << unindent << setprec(prec);
 }
 

diff --git a/ir/loop-visitor.cpp b/ir/loop-visitor.cpp
@@ -15,7 +15,7 @@ limitations under the License.
 */
 #include "ir/ir.h"
 
-template<class THIS>
+template <class THIS>
 void IR::ForStatement::visit_children(THIS *self, Visitor &v) {
     v.visit(self->annotations, "annotations");
     v.visit(self->init, "init");
@@ -50,7 +50,7 @@ void IR::ForStatement::visit_children(THIS *self, Visitor &v) {
 void IR::ForStatement::visit_children(Visitor &v) { visit_children(this, v); }
 void IR::ForStatement::visit_children(Visitor &v) const { visit_children(this, v); }
 
-template<class THIS>
+template <class THIS>
 void IR::ForInStatement::visit_children(THIS *self, Visitor &v) {
     v.visit(self->annotations, "annotations");
     v.visit(self->decl, "decl", 0);

diff --git a/ir/visitor.h b/ir/visitor.h
@@ -530,7 +530,8 @@ class ControlFlowVisitor : public virtual Visitor {
     void flow_merge(Visitor &) override = 0;
     virtual void flow_copy(ControlFlowVisitor &) = 0;
     virtual bool operator==(const ControlFlowVisitor &) const {
-        BUG("%s pass does not support loops", name()); }
+        BUG("%s pass does not support loops", name());
+    }
     bool operator!=(const ControlFlowVisitor &v) const { return !(*this == v); }
     void setUnreachable() { unreachable = true; }
     bool isUnreachable() { return unreachable; }
@@ -556,8 +557,7 @@ class ControlFlowVisitor : public virtual Visitor {
     }
     void restore_global(std::pair<cstring, ControlFlowVisitor *> saved) {
         globals.erase(saved.first);
-        if (saved.second)
-            globals.emplace(saved.first, *saved.second);
+        if (saved.second) globals.emplace(saved.first, *saved.second);
     }
 
     /// RAII class to ensure global key is only used in one place
@@ -574,7 +574,8 @@ class ControlFlowVisitor : public virtual Visitor {
     /// RAII class to save and restore one or more global keys
     class SaveGlobal {
         ControlFlowVisitor &self;
-        std::vector<std::pair<cstring, ControlFlowVisitor *>>   saved;
+        std::vector<std::pair<cstring, ControlFlowVisitor *>> saved;
+
      public:
         SaveGlobal(ControlFlowVisitor &self, cstring key) : self(self) {
             saved.push_back(self.save_global(key));
@@ -584,8 +585,7 @@ class ControlFlowVisitor : public virtual Visitor {
             saved.push_back(self.save_global(k2));
         }
         ~SaveGlobal() {
-            for (auto it = saved.rbegin(); it != saved.rend(); ++it)
-                self.restore_global(*it);
+            for (auto it = saved.rbegin(); it != saved.rend(); ++it) self.restore_global(*it);
         }
     };
 

diff --git a/lib/log.h b/lib/log.h
@@ -112,7 +112,8 @@ void increaseVerbosity();
 #define LOGN(N, X)                                                        \
     (LOGGING(N) ? ::Log::Detail::fileLogOutput(__FILE__)                  \
                       << ::Log::Detail::OutputLogPrefix(__FILE__, N) << X \
-                      << ::Log::Detail::clearPrefix << std::endl << std::flush         \
+                      << ::Log::Detail::clearPrefix << std::endl          \
+                      << std::flush                                       \
                 : std::clog)
 #define LOG1(X) LOGN(1, X)
 #define LOG2(X) LOGN(2, X)

diff --git a/lib/sourceCodeBuilder.h b/lib/sourceCodeBuilder.h
@@ -87,9 +87,7 @@ class SourceCodeBuilder {
         supressSemi = false;
         if (addNl) newline();
     }
-    void supressStatementSemi() {
-        supressSemi = true;
-    }
+    void supressStatementSemi() { supressSemi = true; }
 
     void blockStart() {
         append("{");

diff --git a/midend/def_use.cpp b/midend/def_use.cpp
@@ -85,27 +85,25 @@ void ComputeDefUse::def_info_t::flow_merge(def_info_t &a) {
 
 bool ComputeDefUse::def_info_t::operator==(const def_info_t &a) const {
     if (defs.size() != a.defs.size()) return false;
-    for (auto *l : defs) if (!a.defs.count(l)) return false;
+    for (auto *l : defs)
+        if (!a.defs.count(l)) return false;
     if (live != a.live) return false;
     // Don't check the parent field as it is not set consistently (it is only set in
     // copy/move ctors above) and nothing appears to depend on it.  Should be removed?
     if (valid_bit_defs.size() != a.valid_bit_defs.size()) return false;
-    for (auto *l : valid_bit_defs) if (!a.valid_bit_defs.count(l)) return false;
+    for (auto *l : valid_bit_defs)
+        if (!a.valid_bit_defs.count(l)) return false;
     if (fields.size() != a.fields.size()) return false;
     for (auto &[field, info] : fields) {
         auto it = a.fields.find(field);
-        if (it == a.fields.end())
-            return false;
-        if (info != it->second)
-            return false;
+        if (it == a.fields.end()) return false;
+        if (info != it->second) return false;
     }
     if (slices.size() != a.slices.size()) return false;
     for (auto &[slice, info] : slices) {
         auto it = a.slices.find(slice);
-        if (it == a.slices.end())
-            return false;
-        if (info != it->second)
-            return false;
+        if (it == a.slices.end()) return false;
+        if (info != it->second) return false;
     }
     return true;
 }

diff --git a/midend/local_copyprop.cpp b/midend/local_copyprop.cpp
@@ -425,8 +425,7 @@ IR::AssignmentStatement *DoLocalCopyPropagation::postorder(IR::AssignmentStateme
 }
 
 void DoLocalCopyPropagation::LoopPrepass::postorder(const IR::AssignmentStatement *as) {
-    if (auto dest = expr_name(as->left))
-        self.dropValuesUsing(dest);
+    if (auto dest = expr_name(as->left)) self.dropValuesUsing(dest);
 }
 
 IR::IfStatement *DoLocalCopyPropagation::postorder(IR::IfStatement *s) {

diff --git a/midend/local_copyprop.h b/midend/local_copyprop.h
@@ -97,11 +97,12 @@ class DoLocalCopyPropagation : public ControlFlowVisitor, Transform, P4WriteCont
     bool isHeaderUnionIsValid(const IR::Expression *e);
 
     class LoopPrepass : public Inspector {
-        DoLocalCopyPropagation  &self;
+        DoLocalCopyPropagation &self;
         void postorder(const IR::AssignmentStatement *) override;
         void postorder(const IR::MethodCallExpression *) override;
         void apply_table(TableInfo *tbl);
         void apply_function(FuncInfo *tbl);
+
      public:
         explicit LoopPrepass(DoLocalCopyPropagation &s) : self(s) {}
     };