Corrected includes of .hpp files

Kalashnikovni · Kalashnikovni · commit f655334d60d1 · 2025-06-06T16:20:44.000-03:00
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -27,7 +27,7 @@ jobs:
       run: |
         autoconf
         ./configure 
-        make MODE=Release
+        make compile MODE=Release
 
     - name: Tests
       working-directory: ./
diff --git a/ast/statement.hpp b/ast/statement.hpp
@@ -25,7 +25,6 @@
 #define PARSER_STATEMENT_AST_HPP
 
 #include "ast/expr.hpp"
-#include "sbg/natural.hpp"
 #include "util/debug.hpp"
 
 namespace SBG {
diff --git a/eval/defs.hpp b/eval/defs.hpp
@@ -30,15 +30,7 @@
 #include <variant>
 
 #include "ast/expr.hpp"
-#include "ast/statement.hpp"
-#include "sbg/af_pwmap.hpp"
-#include "algorithms/cc/cc.hpp"
 #include "algorithms/matching/matching.hpp"
-#include "algorithms/scc/scc.hpp"
-#include "algorithms/cutvertex/cut_vertex.hpp"
-#include "algorithms/toposort/topo_sort.hpp"
-#include "algorithms/misc/causalization_builders.hpp"
-#include "algorithms/misc/causalization_json.hpp"
 
 namespace SBG {
 
diff --git a/eval/visitors/eval_expr.cpp b/eval/visitors/eval_expr.cpp
@@ -17,6 +17,12 @@
 
  ******************************************************************************/
 
+#include "algorithms/cc/cc.hpp"
+#include "algorithms/cutvertex/cut_vertex.hpp"
+#include "algorithms/scc/scc.hpp"
+#include "algorithms/toposort/topo_sort.hpp"
+#include "algorithms/misc/causalization_builders.hpp"
+#include "algorithms/misc/causalization_json.hpp"
 #include "eval/visitors/eval_expr.hpp"
 
 namespace SBG {
diff --git a/eval/visitors/eval_expr.hpp b/eval/visitors/eval_expr.hpp
@@ -27,6 +27,7 @@
 #include "eval/visitors/eval_nat.hpp"
 #include "eval/visitors/eval_rat.hpp"
 #include "eval/visitors/eval_le.hpp"
+#include "sbg/af_pwmap.hpp"
 
 namespace SBG {
 
diff --git a/eval/visitors/eval_le.cpp b/eval/visitors/eval_le.cpp
@@ -18,6 +18,8 @@
  ******************************************************************************/
 
 #include "eval/visitors/eval_le.hpp"
+#include "eval/visitors/eval_nat.hpp"
+#include "eval/visitors/eval_rat.hpp"
 
 namespace SBG {
 
diff --git a/eval/visitors/eval_le.hpp b/eval/visitors/eval_le.hpp
@@ -24,8 +24,7 @@
 #ifndef AST_VISITOR_EVALLE
 #define AST_VISITOR_EVALLE
 
-#include "eval/visitors/eval_nat.hpp"
-#include "eval/visitors/eval_rat.hpp"
+#include "eval/defs.hpp"
 #include "sbg/lexp.hpp"
 
 namespace SBG {
diff --git a/eval/visitors/eval_rat.cpp b/eval/visitors/eval_rat.cpp
@@ -72,11 +72,11 @@ LIB::RATIONAL EvalRat::operator()(AST::UnaryOp v) const
       return -result;
 
     default:
-      Util::ERROR("EvalExpression: UnaryOp ", v.op(), " unsupported\n");
+      Util::ERROR("EvalRat: UnaryOp ", v.op(), " unsupported\n");
       return 0;
   }
 
-  Util::ERROR("EvalExpression: UnaryOp ", v.op(), " unsupported\n");
+  Util::ERROR("EvalRat: UnaryOp ", v.op(), " unsupported\n");
   return 0;
 }
 
@@ -99,7 +99,7 @@ LIB::RATIONAL EvalRat::operator()(AST::BinOp v) const
       return LIB::RATIONAL(0, 1);
   }
 
-  Util::ERROR("EvalExpression: BinOp ", v.op(), " unsupported\n");
+  Util::ERROR("EvalRat: BinOp ", v.op(), " unsupported\n");
   return 0;
 }
 
diff --git a/eval/visitors/eval_rat.hpp b/eval/visitors/eval_rat.hpp
@@ -24,8 +24,8 @@
 #ifndef AST_VISITOR_EVALRAT
 #define AST_VISITOR_EVALRAT
 
-#include "eval/defs.hpp"
 #include "eval/visitors/eval_int.hpp"
+#include "sbg/rational.hpp"
 
 namespace SBG {
 
diff --git a/eval/visitors/program_visitor.cpp b/eval/visitors/program_visitor.cpp
@@ -17,6 +17,7 @@
 
  ******************************************************************************/
 
+#include "eval/visitors/eval_expr.hpp"
 #include "eval/visitors/program_visitor.hpp"
 
 namespace SBG {
diff --git a/eval/visitors/stm_visitor.cpp b/eval/visitors/stm_visitor.cpp
@@ -17,6 +17,7 @@
 
  ******************************************************************************/
 
+#include "eval/visitors/eval_expr.hpp"
 #include "eval/visitors/stm_visitor.hpp"
 
 namespace SBG {
diff --git a/eval/visitors/stm_visitor.hpp b/eval/visitors/stm_visitor.hpp
@@ -27,7 +27,7 @@
 #define AST_VISITOR_STATEMENT 
 
 #include "ast/statement.hpp"
-#include "eval/visitors/eval_expr.hpp"
+#include "eval/defs.hpp"
 
 namespace SBG {
 
diff --git a/test/performance/boost/main.cpp b/test/performance/boost/main.cpp
@@ -35,9 +35,12 @@
 #include <boost/graph/topological_sort.hpp>
 #include <gtest/gtest.h>
 
-#include <eval/visitors/program_visitor.hpp>
-#include <parser/sbg_program.hpp>
-#include <test/performance/boost/ordinary_graph_builder.hpp>
+#include "algorithms/misc/causalization_builders.hpp"
+#include "algorithms/scc/scc.hpp"
+#include "algorithms/toposort/topo_sort.hpp"
+#include "eval/visitors/program_visitor.hpp"
+#include "parser/sbg_program.hpp"
+#include "test/performance/boost/ordinary_graph_builder.hpp"
 
 template<class... Ts> struct Overload : Ts... { using Ts::operator()...; };
 template<class... Ts> Overload(Ts...) -> Overload<Ts...>;

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ LIB::RATIONAL EvalRat::operator()(AST::UnaryOp v) const`
`72`	`72`	`return -result;`
`73`	`73`
`74`	`74`	`default:`
`75`		`- Util::ERROR("EvalExpression: UnaryOp ", v.op(), " unsupported\n");`
	`75`	`+ Util::ERROR("EvalRat: UnaryOp ", v.op(), " unsupported\n");`
`76`	`76`	`return 0;`
`77`	`77`	`}`
`78`	`78`
`79`		`- Util::ERROR("EvalExpression: UnaryOp ", v.op(), " unsupported\n");`
	`79`	`+ Util::ERROR("EvalRat: UnaryOp ", v.op(), " unsupported\n");`
`80`	`80`	`return 0;`
`81`	`81`	`}`
`82`	`82`
`@@ -99,7 +99,7 @@ LIB::RATIONAL EvalRat::operator()(AST::BinOp v) const`
`99`	`99`	`return LIB::RATIONAL(0, 1);`
`100`	`100`	`}`
`101`	`101`
`102`		`- Util::ERROR("EvalExpression: BinOp ", v.op(), " unsupported\n");`
	`102`	`+ Util::ERROR("EvalRat: BinOp ", v.op(), " unsupported\n");`
`103`	`103`	`return 0;`
`104`	`104`	`}`
`105`	`105`