Partial validation when setting selection on PN

JohnDTill · Aug 5, 2023 · b6c77a1 · b6c77a1
1 parent 192ef14
commit b6c77a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/meta/ast_fields.py b/meta/ast_fields.py
@@ -62,7 +62,7 @@ def main():
             source_file.write(
                 f"void ParseTree::{setter}(ParseNode pn, {T} {field.property}) noexcept {{\n")
             if field.property == "selection":
-                source_file.write("    //assert(selection.inValidState()); //DO THIS\n")
+                source_file.write("    assert(selection.inValidState(false));\n")
             source_file.write(
                 "    assert(isNode(pn));\n"
                 f"    {ref} = {field.property};\n"

diff --git a/src/typeset_selection.cpp b/src/typeset_selection.cpp
@@ -493,7 +493,7 @@ std::array<double, 4> Selection::getDimensionsLines() const noexcept {
 #endif
 
 #ifndef NDEBUG
-bool Selection::inValidState() const noexcept {
+bool Selection::inValidState(bool require_markers_on_same_level) const noexcept {
     if(!left.inValidState()){
         std::cout << "Left marker invalid" << std::endl;
         return false;
@@ -509,7 +509,7 @@ bool Selection::inValidState() const noexcept {
         return false;
     }
 
-    if(left.phrase() != right.phrase() && (left.isNested() || right.isNested())){
+    if(require_markers_on_same_level && left.phrase() != right.phrase() && (left.isNested() || right.isNested())){
         std::cout << "Markers are not on same level" << std::endl;
         return false;
     }
@@ -523,8 +523,11 @@ bool Selection::inValidState() const noexcept {
         }
     }else if(isPhraseSelection()){
         return tR->id > tL->id;
-    }else{
+    }else if(!left.isNested() && !right.isNested()){
         return lR->id > lL->id;
+    }else{
+        assert(!require_markers_on_same_level);
+        return left.precedesInclusive(right);
     }
 }
 #endif

diff --git a/src/typeset_selection.h b/src/typeset_selection.h
@@ -89,7 +89,7 @@ class Selection{
     #endif
 
     #ifndef NDEBUG
-    bool inValidState() const noexcept;
+    bool inValidState(bool require_markers_on_same_level = true) const noexcept;
     #endif
 
     #ifdef QT_CORE_LIB