Pull request #23: Apply source code format

Merge in ECFLOW/ecflow from feature/ECFLOW-1868_source_code_formatting to develop * commit '26fafe1755827c9d32b414703566546f44f71b24': Apply code formatting (ECFLOW-1868) Include all headers+sources in CMakeLists.txt (ECFLOW-1868)
ecmwf · Mar 31, 2023 · 7602b2f · 7602b2f
2 parents 38718f3 + 26fafe1
commit 7602b2f
Show file tree

Hide file tree

Showing 55 changed files with 5,084 additions and 4,790 deletions.
diff --git a/ANode/CMakeLists.txt b/ANode/CMakeLists.txt
@@ -29,6 +29,9 @@ add_subdirectory( parser )
 #file( GLOB test_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "test/*.cpp" )
 
 list( APPEND test_srcs
+# HEADERS
+test/MyDefsFixture.hpp
+# SOURCES
 test/Test_ECFLOW-195.cpp
 test/Test_ECFLOW-247.cpp
 test/Test_ECFLOW-417.cpp

diff --git a/ANode/parser/CMakeLists.txt b/ANode/parser/CMakeLists.txt
@@ -7,6 +7,9 @@
 #  cd $WK/ANode/parser                      
 #  find test -name \*.cpp | sort   
 list( APPEND test_srcs
+   # HEADERS
+   test/PersistHelper.hpp
+   # SOURCES
    test/PersistHelper.cpp
    test/TestAutoAddExterns.cpp
    test/TestDefsStructurePersistAndReload.cpp
@@ -28,6 +31,7 @@ ecbuild_add_test( TARGET       u_aparser
                   DEFINITIONS  ${BOOST_TEST_DYN_LINK}
                   TEST_DEPENDS u_anode
                 )
+target_clangformat(u_aparser)
 
 if (ENABLE_ALL_TESTS)
 	#
@@ -47,6 +51,7 @@ if (ENABLE_ALL_TESTS)
                                ${Boost_INCLUDE_DIRS}
                       DEFINITIONS ${BOOST_TEST_DYN_LINK}
                     )
+	target_clangformat(perf_aparser)
 
 	#
 	# Timer for arbitary defs file,  
@@ -65,7 +70,7 @@ if (ENABLE_ALL_TESTS)
                                ${Boost_INCLUDE_DIRS} 
                       DEFINITIONS ${BOOST_TEST_DYN_LINK}
                     )
-
+    target_clangformat(perf_aparser_timer)
 	#
 	# Tests parser for a single defs file.  
 	#
@@ -82,4 +87,6 @@ if (ENABLE_ALL_TESTS)
                                ${Boost_INCLUDE_DIRS} 
                       DEFINITIONS ${BOOST_TEST_DYN_LINK}
                    )
-endif()
+	target_clangformat(perf_aparser_only)
+
+endif()
diff --git a/ANode/parser/test/ParseOnly.cpp b/ANode/parser/test/ParseOnly.cpp
@@ -12,9 +12,9 @@
 //
 // Description :
 //============================================================================
-#include <string>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <string>
 
 #include "Defs.hpp"
 #include "PrintStyle.hpp"
@@ -28,46 +28,45 @@ using namespace ecf;
 //    user    0m2.59s
 //    sys     0m0.18s
 
-int main(int argc, char* argv[])
-{
-//   cout << "argc = " << argc << "\n";
-//   for(int i = 0; i < argc; i++) {
-//      cout << "arg " << i << ":" << argv[i] << "\n";
-//   }
+int main(int argc, char* argv[]) {
+    //   cout << "argc = " << argc << "\n";
+    //   for(int i = 0; i < argc; i++) {
+    //      cout << "arg " << i << ":" << argv[i] << "\n";
+    //   }
 
-   if (argc != 2) {
-      cout << "Expect single argument which is path to a defs file\n";
-      return 1;
-   }
+    if (argc != 2) {
+        cout << "Expect single argument which is path to a defs file\n";
+        return 1;
+    }
 
-   std::string path = argv[1];
+    std::string path = argv[1];
 
-   Defs defs;
-   std::string errorMsg,warningMsg;
-   if (!defs.restore(path,errorMsg,warningMsg)) {
-      cout << errorMsg << "\n";
-      cout << warningMsg << "\n";
-      return 1;
-   }
+    Defs defs;
+    std::string errorMsg, warningMsg;
+    if (!defs.restore(path, errorMsg, warningMsg)) {
+        cout << errorMsg << "\n";
+        cout << warningMsg << "\n";
+        return 1;
+    }
 
-//   // Determine average number of variables for nodes with variables
-//   vector<Node*> nodes;
-//   defs.getAllNodes(nodes);
-//   cout << "Total number of nodes: " << nodes.size() << "\n";
-//   size_t number_of_variables = 0;
-//   size_t nodes_with_variables = 0;
-//   for(const auto& n : nodes) {
-//      // cout << n->variables().size() << "\n";
-//      if (n->variables().size() > 0) {
-//         number_of_variables +=  n->variables().size();
-//         nodes_with_variables++;
-//      }
-//   }
-//   cout << "number_of_variables " << number_of_variables << "\n";
-//   cout << "nodes_with_variables  " <<  nodes_with_variables << "\n";
-//   cout <<"Average number of variables per node " <<  (double)number_of_variables/nodes_with_variables  << "\n";
+    //   // Determine average number of variables for nodes with variables
+    //   vector<Node*> nodes;
+    //   defs.getAllNodes(nodes);
+    //   cout << "Total number of nodes: " << nodes.size() << "\n";
+    //   size_t number_of_variables = 0;
+    //   size_t nodes_with_variables = 0;
+    //   for(const auto& n : nodes) {
+    //      // cout << n->variables().size() << "\n";
+    //      if (n->variables().size() > 0) {
+    //         number_of_variables +=  n->variables().size();
+    //         nodes_with_variables++;
+    //      }
+    //   }
+    //   cout << "number_of_variables " << number_of_variables << "\n";
+    //   cout << "nodes_with_variables  " <<  nodes_with_variables << "\n";
+    //   cout <<"Average number of variables per node " <<  (double)number_of_variables/nodes_with_variables  << "\n";
 
-//   PrintStyle style(PrintStyle::MIGRATE);
-//   cout << defs;
-   return 0;
+    //   PrintStyle style(PrintStyle::MIGRATE);
+    //   cout << defs;
+    return 0;
 }