fixed move assignment for VariableIterator

vprover · Dec 12, 2024 · 37fae7d · 37fae7d
1 parent 1ed353a
commit 37fae7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Kernel/Term.cpp b/Kernel/Term.cpp
@@ -121,7 +121,7 @@ bool TermList::isSafe() const
 }
 
 bool TermList::ground() const 
-{ return !isVar() && term()->ground(); }
+{ return isTerm() && term()->ground(); }
 
 /**
  * Return true if @b ss and @b tt have the same top symbols, that is,

diff --git a/Kernel/TermIterators.hpp b/Kernel/TermIterators.hpp
@@ -44,10 +44,7 @@ class VariableIterator
   DECL_ELEMENT_TYPE(TermList);
   VariableIterator() : _stack(8), _used(false) {}
 
-  VariableIterator& operator=(VariableIterator&&) = default;
-  VariableIterator(VariableIterator&& other)
-    : VariableIterator() 
-  {
+  void swap(VariableIterator& other) {
     std::swap(_stack, other._stack);
     std::swap(_used, other._used);
     std::swap(_aux[0], other._aux[0]);
@@ -59,6 +56,9 @@ class VariableIterator
     }
   }
 
+  VariableIterator& operator=(VariableIterator&& other) { swap(other); return *this; }
+  VariableIterator(VariableIterator&& other) : VariableIterator() { swap(other); }
+
   VariableIterator(const Term* term) : _stack(8), _used(false)
   {
     if(term->isLiteral() && static_cast<const Literal*>(term)->isTwoVarEquality()){