1. YAUCL update

2. IFTE update

Author: jackbergus

CMakeCache.txt

@@ -1303,19 +1303,22 @@ struct closure {
                         }
                     }
 
+//                    if ((vertex == 0) && (graph_id == 0))
+//                        std::cout << "HERE" << std::endl;
+
                     Interpret I(graph_id, pattern_id, pattern_result.first, it->second, table_offset, *this, pr.morphisms,
                                 forloading);
                     if (pattern.has_where) {
 //                        std::cout << "TGraph #" << graph_id << ": applying pattern " << pattern.pattern_name << " for node " << vertex << std::endl;
+
                         if ((I.interpret(pattern.where, 1).empty())) {
                             table_offset++;
                             continue; //next entry
                         }
                     }
+//                    std::cout << "FGraph #" << graph_id << ": applying pattern " << pattern.pattern_name << " for node " << vertex << std::endl;
 
 
-                    if ((vertex == 3) && (graph_id == 2))
-                        std::cout << "HERE" << std::endl;
                     for (const auto& operation : pattern.rwr_to) {
                         switch (operation.t) {
 

include/queries/closure.h

@@ -77,8 +77,8 @@ struct delta_updates {
      */
     inline void set_removed(size_t default_val){
         size_t toRemove = getOrDefault(replacement_map, default_val, default_val);
-        if ((toRemove == 6) || (default_val == 6))
-            std::cerr << "EHRE" << std::endl;
+//        if ((toRemove == 6) || (default_val == 6))
+//            std::cerr << "EHRE" << std::endl;
         if (!newIterationInsertedObjects.contains(toRemove))
             removed_objects.insert(toRemove);
         else

include/queries/delta_updates.h

@@ -1,5 +1,5 @@
 #include <vector>
-#include "database/GSMIso.h"
+#include <database/GSMIso.h>
 
 #include <args.hxx>
 #include <string>

main.cpp

@@ -308,8 +308,8 @@ void closure::generate_materialised_view() {
                 size_t new_id = legacy_object_old_data.id;
                 auto& obj = updates.delta_plus_db.O[new_id];
                 obj.id = new_id;
-                if ((graphid== 2) && (legacy_object_old_data.id == 3))
-                    std::cout << "DREBUG" << std::endl;
+//                if ((graphid== 2) && (legacy_object_old_data.id == 3))
+//                    std::cout << "DREBUG" << std::endl;
                 obj.updateWith(legacy_object_old_data);
                 for (auto& [k, v] :obj.phi) {
                     i = 0;

src/queries/closure.cpp

@@ -647,11 +647,20 @@ DPtr<script::structures::ScriptAST> script::structures::ScriptAST::run(bool impl
             return lx->javaComparator(rx) == 0 ? true_() : false_();
         }
 
-        case IfteE:
-            return arrayList[0]->toBoolean() ? arrayList[0]->run(implode) : arrayList[1]->run(implode);
+        case IfteE: {
+            auto cond = arrayList[0]->toBoolean();
+            if (cond) {
+                auto tmp = arrayList[1]->run(implode);
+                return tmp;
+            } else {
+                auto tmp = arrayList[2]->run(implode);
+                return tmp;
+            }
+        }
+            return arrayList[0]->toBoolean() ? arrayList[1]->run(implode) : arrayList[2]->run(implode);
 
         case ImplyE:
-            return arrayList[0]->toBoolean() ? arrayList[0]->run(implode) : arrayList[1]->run(implode);
+            return arrayList[0]->toBoolean() ? arrayList[1]->run(implode) : arrayList[0]->run(implode);
 
         case InvokeE:
         case ApplyE:

src/scriptv2/ScriptAST.cpp

@@ -371,7 +371,11 @@ namespace script {
         }
 
         std::any ScriptVisitor::visitIfte(scriptParser::IfteContext *context) {
-            return std::any();
+            auto lx = std::any_cast<DPtr<script::structures::ScriptAST>>(visit(context->cp()->term(0)));
+            auto M = visit(context->cp()->term(1));
+            auto mx = std::any_cast<DPtr<script::structures::ScriptAST>>(M);
+            auto rx = std::any_cast<DPtr<script::structures::ScriptAST>>(visit(context->expr()));
+            return script::structures::ScriptAST::terop_(this->context, script::structures::t::IfteE, std::move(lx), std::move(mx), std::move(rx));
         }