Merge pull request #138 from abap34/bug/#137

DivBlock のパースの不具合を修正
abap34 · Jun 21, 2024 · 3100fc5 · 3100fc5
2 parents 1cec61d + 99e197e
commit 3100fc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/reader.hpp b/src/reader.hpp
@@ -34,6 +34,7 @@ struct Reader {
         return lines[row].substr(col);
     }
     void move_next_line(){
+        assert(row < (int)(lines.size()));
         row++;
         col = 0;
     }

diff --git a/src/syntax/DivBlock.hpp b/src/syntax/DivBlock.hpp
@@ -49,6 +49,7 @@ struct DivBlockSyntax : public BlockSyntax {
         std::vector<std::string> text;
 
         while (!read.is_eof()){
+            // Invariant : scopes.size() >= 1
             if (rtrim(read.get_row()) == ":::"){
                 Markdown inner_md;
                 MarkdownParser parser(text, read.meta_data);
@@ -61,6 +62,7 @@ struct DivBlockSyntax : public BlockSyntax {
 
                 if (scopes.size() == 1u){
                     ast.add_child(scopes.top());
+                    scopes.pop();
                     break;
                 }
                 scopes.pop();
@@ -86,23 +88,25 @@ struct DivBlockSyntax : public BlockSyntax {
             text.emplace_back(read.get_row());
             read.move_next_line();
         }
-        while (true){
+        // scopes.empty() iff completed DivBlock
+        while (!scopes.empty()){
             Markdown inner_md;
             MarkdownParser parser(text, read.meta_data);
             parser.process(inner_md);
             auto inner_md_ptr = std::make_shared<Markdown>(inner_md);
             scopes.top()->add_child(inner_md_ptr);
 
             text = {};
-            read.move_next_line();
 
             if (scopes.size() == 1u){
                 ast.add_child(scopes.top());
+                scopes.pop();
                 break;
             }
             scopes.pop();
             continue;
         }
+        assert(scopes.empty());
     }
 };