Fixed RAM and tests

src/AstToRamTranslator.cpp

@@ -42,15 +42,15 @@
 #include "ast/analysis/SCCGraph.h"
 #include "ast/analysis/TopologicallySortedSCCGraph.h"
 #include "json11.h"
-#include "ram/RamCondition.h"
-#include "ram/RamExpression.h"
-#include "ram/RamNode.h"
-#include "ram/RamOperation.h"
-#include "ram/RamProgram.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
-#include "ram/RamTranslationUnit.h"
-#include "ram/RamUtils.h"
+#include "ram/Condition.h"
+#include "ram/Expression.h"
+#include "ram/Node.h"
+#include "ram/Operation.h"
+#include "ram/Program.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
+#include "ram/TranslationUnit.h"
+#include "ram/Utils.h"
 #include "utility/ContainerUtil.h"
 #include "utility/FunctionalUtil.h"
 #include "utility/StreamUtil.h"

src/AstToRamTranslator.h

@@ -23,8 +23,8 @@
 #include "ast/Node.h"
 #include "ast/QualifiedName.h"
 #include "json11.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
 #include "utility/FunctionalUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"

src/Makefile.am

@@ -235,23 +235,23 @@ souffle_sources = \
         interpreter/InterpreterRelation.h                  \
         parser.cc                                          \
         parser.hh                                          \
-        ram/RamCondition.h                                 \
-        ram/RamExpression.h                                \
-        ram/RamNode.h                                      \
-        ram/RamOperation.h                                 \
-        ram/RamProgram.h                                   \
-        ram/RamRelation.h                                  \
-        ram/RamStatement.h                                 \
-        ram/RamTranslationUnit.h                           \
-        ram/RamUtils.h                                     \
-        ram/RamVisitor.h                                   \
-        ram/analysis/RamAnalysis.h                         \
-        ram/analysis/RamComplexityAnalysis.cpp             \
-        ram/analysis/RamComplexityAnalysis.h               \
-        ram/analysis/RamIndexAnalysis.cpp                  \
-        ram/analysis/RamIndexAnalysis.h                    \
-        ram/analysis/RamLevelAnalysis.cpp                  \
-        ram/analysis/RamLevelAnalysis.h                    \
+        ram/Condition.h                                 \
+        ram/Expression.h                                \
+        ram/Node.h                                      \
+        ram/Operation.h                                 \
+        ram/Program.h                                   \
+        ram/Relation.h                                  \
+        ram/Statement.h                                 \
+        ram/TranslationUnit.h                           \
+        ram/Utils.h                                     \
+        ram/Visitor.h                                   \
+        ram/analysis/Analysis.h                         \
+        ram/analysis/ComplexityAnalysis.cpp             \
+        ram/analysis/ComplexityAnalysis.h               \
+        ram/analysis/IndexAnalysis.cpp                  \
+        ram/analysis/IndexAnalysis.h                    \
+        ram/analysis/LevelAnalysis.cpp                  \
+        ram/analysis/LevelAnalysis.h                    \
         ram/transform/ChoiceConversion.cpp                 \
         ram/transform/ChoiceConversion.h                   \
         ram/transform/CollapseFilters.cpp                  \
@@ -272,8 +272,8 @@ souffle_sources = \
         ram/transform/MakeIndex.h                          \
         ram/transform/Parallel.cpp                         \
         ram/transform/Parallel.h                           \
-        ram/transform/RamTransformer.cpp                   \
-        ram/transform/RamTransformer.h                     \
+        ram/transform/Transformer.cpp                   \
+        ram/transform/Transformer.h                     \
         ram/transform/ReorderConditions.cpp                \
         ram/transform/ReorderConditions.h                  \
         ram/transform/ReorderFilterBreak.cpp               \

src/interpreter/InterpreterEngine.cpp

@@ -32,13 +32,13 @@
 #include "interpreter/InterpreterNode.h"
 #include "interpreter/InterpreterPreamble.h"
 #include "interpreter/InterpreterRelation.h"
-#include "ram/RamCondition.h"
-#include "ram/RamExpression.h"
-#include "ram/RamOperation.h"
-#include "ram/RamProgram.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
-#include "ram/RamVisitor.h"
+#include "ram/Condition.h"
+#include "ram/Expression.h"
+#include "ram/Operation.h"
+#include "ram/Program.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
+#include "ram/Visitor.h"
 #include "utility/EvaluatorUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/ParallelUtil.h"

src/interpreter/InterpreterEngine.h

@@ -21,8 +21,8 @@
 #include "RecordTable.h"
 #include "interpreter/InterpreterGenerator.h"
 #include "interpreter/InterpreterIndex.h"
-#include "ram/RamTranslationUnit.h"
-#include "ram/analysis/RamIndexAnalysis.h"
+#include "ram/TranslationUnit.h"
+#include "ram/analysis/IndexAnalysis.h"
 #include <atomic>
 #include <cstddef>
 #include <deque>

src/interpreter/InterpreterGenerator.h

@@ -24,15 +24,15 @@
 #include "interpreter/InterpreterNode.h"
 #include "interpreter/InterpreterPreamble.h"
 #include "interpreter/InterpreterRelation.h"
-#include "ram/RamCondition.h"
-#include "ram/RamExpression.h"
-#include "ram/RamNode.h"
-#include "ram/RamOperation.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
-#include "ram/RamUtils.h"
-#include "ram/RamVisitor.h"
-#include "ram/analysis/RamIndexAnalysis.h"
+#include "ram/Condition.h"
+#include "ram/Expression.h"
+#include "ram/Node.h"
+#include "ram/Operation.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
+#include "ram/Utils.h"
+#include "ram/Visitor.h"
+#include "ram/analysis/IndexAnalysis.h"
 #include "utility/MiscUtil.h"
 #include <algorithm>
 #include <cstddef>

src/interpreter/InterpreterProgInterface.h

@@ -22,12 +22,12 @@
 #include "interpreter/InterpreterEngine.h"
 #include "interpreter/InterpreterIndex.h"
 #include "interpreter/InterpreterRelation.h"
-#include "ram/RamNode.h"
-#include "ram/RamProgram.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
-#include "ram/RamTranslationUnit.h"
-#include "ram/RamVisitor.h"
+#include "ram/Node.h"
+#include "ram/Program.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
+#include "ram/TranslationUnit.h"
+#include "ram/Visitor.h"
 #include <cassert>
 #include <cstddef>
 #include <cstdint>

src/interpreter/InterpreterRelation.cpp

@@ -15,7 +15,7 @@
  ***********************************************************************/
 
 #include "interpreter/InterpreterRelation.h"
-#include "ram/analysis/RamIndexAnalysis.h"
+#include "ram/analysis/IndexAnalysis.h"
 #include <algorithm>
 #include <cassert>
 #include <set>

src/main.cpp

@@ -63,9 +63,9 @@
 #include "interpreter/InterpreterEngine.h"
 #include "interpreter/InterpreterProgInterface.h"
 #include "profile/Tui.h"
-#include "ram/RamNode.h"
-#include "ram/RamProgram.h"
-#include "ram/RamTranslationUnit.h"
+#include "ram/Node.h"
+#include "ram/Program.h"
+#include "ram/TranslationUnit.h"
 #include "ram/transform/ChoiceConversion.h"
 #include "ram/transform/CollapseFilters.h"
 #include "ram/transform/EliminateDuplicates.h"
@@ -76,7 +76,7 @@
 #include "ram/transform/IndexedInequality.h"
 #include "ram/transform/MakeIndex.h"
 #include "ram/transform/Parallel.h"
-#include "ram/transform/RamTransformer.h"
+#include "ram/transform/Transformer.h"
 #include "ram/transform/ReorderConditions.h"
 #include "ram/transform/ReorderFilterBreak.h"
 #include "ram/transform/ReportIndex.h"

src/ram/RamCondition.h → src/ram/Condition.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamCondition.h
+ * @file Condition.h
  *
  * Defines a class for evaluating conditions in the Relational Algebra
  * Machine.
@@ -18,9 +18,9 @@
 #pragma once
 
 #include "BinaryConstraintOps.h"
-#include "ram/RamExpression.h"
-#include "ram/RamNode.h"
-#include "ram/RamRelation.h"
+#include "ram/Expression.h"
+#include "ram/Node.h"
+#include "ram/Relation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <cassert>

src/ram/RamExpression.h → src/ram/Expression.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamExpression.h
+ * @file Expression.h
  *
  * Defines a class for evaluating values in the Relational Algebra Machine
  *
@@ -18,7 +18,7 @@
 
 #include "FunctorOps.h"
 #include "RamTypes.h"
-#include "ram/RamNode.h"
+#include "ram/Node.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <cassert>

src/ram/RamNode.h → src/ram/Node.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamNode.h
+ * @file Node.h
  *
  * Declaration of RAM node and mappers for RAM nodes
  *

src/ram/RamOperation.h → src/ram/Operation.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamOperation.h
+ * @file Operation.h
  *
  * Defines the Operation of a relational algebra query.
  *
@@ -17,11 +17,11 @@
 #pragma once
 
 #include "AggregateOp.h"
-#include "ram/RamCondition.h"
-#include "ram/RamExpression.h"
-#include "ram/RamNode.h"
-#include "ram/RamRelation.h"
-#include "ram/RamUtils.h"
+#include "ram/Condition.h"
+#include "ram/Expression.h"
+#include "ram/Node.h"
+#include "ram/Relation.h"
+#include "ram/Utils.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"

src/ram/RamProgram.h → src/ram/Program.h

@@ -8,17 +8,17 @@
 
 /************************************************************************
  *
- * @file RamProgram.h
+ * @file Program.h
  *
  * Defines a Program of a relational algebra query
  *
  ***********************************************************************/
 
 #pragma once
 
-#include "ram/RamNode.h"
-#include "ram/RamRelation.h"
-#include "ram/RamStatement.h"
+#include "ram/Node.h"
+#include "ram/Relation.h"
+#include "ram/Statement.h"
 #include "utility/ContainerUtil.h"
 #include <cassert>
 #include <map>

src/ram/RamRelation.h → src/ram/Relation.h

@@ -8,15 +8,15 @@
 
 /************************************************************************
  *
- * @file RamRelation.h
+ * @file Relation.h
  *
  * Defines the class for ram relations
  ***********************************************************************/
 
 #pragma once
 
 #include "RelationTag.h"
-#include "ram/RamNode.h"
+#include "ram/Node.h"
 #include "utility/ContainerUtil.h"
 #include <cassert>
 #include <cstddef>

src/ram/RamStatement.h → src/ram/Statement.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamStatement.h
+ * @file Statement.h
  *
  * Defines abstract class Statement and sub-classes for implementing the
  * Relational Algebra Machine (RAM), which is an abstract machine.
@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include "ram/RamCondition.h"
-#include "ram/RamNode.h"
-#include "ram/RamOperation.h"
-#include "ram/RamRelation.h"
+#include "ram/Condition.h"
+#include "ram/Node.h"
+#include "ram/Operation.h"
+#include "ram/Relation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include "utility/StringUtil.h"

src/ram/RamTranslationUnit.h → src/ram/TranslationUnit.h

@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file RamTranslationUnit.h
+ * @file TranslationUnit.h
  *
  * Define a class that represents a Datalog translation unit, consisting
  * of a datalog program, error reports and cached analysis results.
@@ -20,8 +20,8 @@
 #include "DebugReport.h"
 #include "Global.h"
 #include "SymbolTable.h"
-#include "ram/RamProgram.h"
-#include "ram/analysis/RamAnalysis.h"
+#include "ram/Program.h"
+#include "ram/analysis/Analysis.h"
 #include <cassert>
 #include <iosfwd>
 #include <map>

src/ram/RamUtils.h → src/ram/Utils.h

@@ -8,16 +8,16 @@
 
 /************************************************************************
  *
- * @file RamUtils.h
+ * @file Utils.h
  *
  * A collection of utilities operating on RAM constructs.
  *
  ***********************************************************************/
 
 #pragma once
 
-#include "ram/RamCondition.h"
-#include "ram/RamExpression.h"
+#include "ram/Condition.h"
+#include "ram/Expression.h"
 #include <algorithm>
 #include <memory>
 #include <queue>