1. refactor inclusion checking

2. ensure pre.lsta == pre.hsl and optionally post.lsta == post.hsl

Author: alan23273850

include/autoq/aut_description.hh

@@ -37,7 +37,6 @@ namespace AUTOQ
 template <typename T> constexpr auto support_fraction_simplification = requires (T x) {
     x.fraction_simplification();
 };
-template<typename T> constexpr auto concrete_like = std::is_same_v<T, AUTOQ::Symbol::Concrete> || std::is_same_v<T, AUTOQ::Symbol::Index>;
 
 template <typename TT>
 struct AUTOQ::Automata
@@ -134,12 +133,12 @@ public:   // methods
 
 	/******************************************************/
     /* inclusion.cc: checks language inclusion of two TAs */
-    bool operator<=(const Automata &o) const; // requires concrete_like<TT>;
-    bool operator>=(const Automata &o) const requires concrete_like<TT> { return o <= *this; }
-	bool operator==(const Automata &o) const requires concrete_like<TT> { return (*this <= o) && (o <= *this); }
-    bool operator!=(const Automata &o) const requires concrete_like<TT> { return !(*this == o); }
-    bool operator<(const Automata &o) const requires concrete_like<TT> { return (*this <= o) && !(o <= *this); }
-    bool operator>(const Automata &o) const requires concrete_like<TT> { return o < *this; }
+    bool operator<=(const Automata &o) const;
+    bool operator>=(const Automata &o) const { return o <= *this; }
+	bool operator==(const Automata &o) const { return (*this <= o) && (o <= *this); }
+    bool operator!=(const Automata &o) const { return !(*this == o); }
+    bool operator<(const Automata &o) const { return (*this <= o) && !(o <= *this); }
+    bool operator>(const Automata &o) const { return o < *this; }
     // The above comparison is done after amplitude comparison.
     /******************************************************/
 

src/inclusion.cc

@@ -282,8 +282,8 @@ bool AUTOQ::Automata<AUTOQ::Symbol::Index>::operator<=(const Automata<AUTOQ::Sym
     return true;
 }
 
-template <>
-bool AUTOQ::Automata<AUTOQ::Symbol::Concrete>::operator<=(const Automata<AUTOQ::Symbol::Concrete> &autB) const {
+template <typename Symbol>
+bool AUTOQ::Automata<Symbol>::operator<=(const Automata<Symbol> &autB) const {
     // migrate instance variables
     Automata<AUTOQ::Symbol::Index> aut1;
     aut1.name = this->name;
@@ -325,7 +325,13 @@ bool AUTOQ::Automata<AUTOQ::Symbol::Concrete>::operator<=(const Automata<AUTOQ::
             if (i == symbol_map.size()) {
                 symbol_map.push_back(symbol);
             }
-            if (i == symbol_map.size() || symbol_map.at(i).valueEqual(symbol)) {
+            bool eq;
+            if constexpr (std::is_same_v<Symbol, AUTOQ::Symbol::Concrete>) {
+                eq = symbol_map.at(i).valueEqual(symbol);
+            } else {
+                eq = symbol_map.at(i) == symbol;
+            }
+            if (i == symbol_map.size() || eq) {
                 Automata<AUTOQ::Symbol::Index>::SymbolTag symbol_tag2 = {AUTOQ::Symbol::Index(symbol.is_leaf(), i), symbol_tag.tag()};
                 for (const auto &out_ins : t.second) {
                     const auto &out = out_ins.first;
@@ -345,7 +351,13 @@ bool AUTOQ::Automata<AUTOQ::Symbol::Concrete>::operator<=(const Automata<AUTOQ::
             if (i == symbol_map.size()) {
                 symbol_map.push_back(symbol);
             }
-            if (i == symbol_map.size() || symbol_map.at(i).valueEqual(symbol)) {
+            bool eq;
+            if constexpr (std::is_same_v<Symbol, AUTOQ::Symbol::Concrete>) {
+                eq = symbol_map.at(i).valueEqual(symbol);
+            } else {
+                eq = symbol_map.at(i) == symbol;
+            }
+            if (i == symbol_map.size() || eq) {
                 Automata<AUTOQ::Symbol::Index>::SymbolTag symbol_tag2 = {AUTOQ::Symbol::Index(symbol.is_leaf(), i), symbol_tag.tag()};
                 for (const auto &out_ins : t.second) {
                     const auto &out = out_ins.first;
@@ -378,11 +390,6 @@ bool AUTOQ::Automata<AUTOQ::Symbol::Concrete>::operator<=(const Automata<AUTOQ::
     return result;
 }
 
-template <typename Symbol>
-bool AUTOQ::Automata<Symbol>::operator<=(const Automata<Symbol> &) const {
-    THROW_AUTOQ_ERROR("The operator <= is not defined for the given type of automata.");
-}
-
 bool AUTOQ::check_validity(Constraint C, const PredicateAutomata::Symbol &ps, const SymbolicAutomata::Symbol &te) {
     std::string str(ps);
     /* Replace all real(.) in C.content with .R and
@@ -742,6 +749,7 @@ bool operator<=(const AUTOQ::SymbolicAutomata &autA, const AUTOQ::PredicateAutom
 // https://bytefreaks.net/programming-2/c/c-undefined-reference-to-templated-class-function
 template struct AUTOQ::Automata<AUTOQ::Symbol::Concrete>;
 template struct AUTOQ::Automata<AUTOQ::Symbol::Symbolic>;
+template struct AUTOQ::Automata<AUTOQ::Symbol::Predicate>;
 
 // #define MIN
 

src/timbuk_parser-nobison.cc

@@ -1371,7 +1371,7 @@ AUTOQ::Automata<Symbol> AUTOQ::Parsing::TimbukParser<Symbol>::parse_hsl_from_ist
     while (std::getline(*is, line))
     {
 		line = AUTOQ::String::trim(line);
-        std::cout<<line<<std::endl;
+        // std::cout<<line<<std::endl;
 		if (line.empty())
         {
             continue;