Bugfix: Invalid comment handling in FSS Embedded Read.

The comments are not being properly processed because graph_first is not and should be being set to 0x1 at start.
As a result, the first comment is not being treated as a comment.

Make sure to reset the `graph_first` and `line_start` after processing the comment.
The comment starts at the line and so use `line_start` rather than `newline_last + 1`.
Remove dead code where `graph_first == 0x2` is being checked inside a block that requires `graph_first` to be `0x1`.

Update code comments about `graph_first` in several of the fl_fss read sources.

Add additional check for buffer string range when processing comments.

Update the runtime tests as appropriate.

I also noticed that several of these runtime tests use `--line` but are showing multiple lines.
I will address this bug in a separate commit.

diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c
index 7ae97abe9e94c14effa95d3fc49942c0260b51d5..2f7504f2bdb0c76a69bdea11dced170e18a825f5 100644 (file)
--- a/level_1/fl_fss/c/fss/basic_list.c
+++ b/level_1/fl_fss/c/fss/basic_list.c
@@ -35,7 +35,9 @@ extern "C" {
     f_array_length_t start = 0;
     f_array_length_t comment_delimit = 0;
 
-    uint8_t graph_first = 0x1; // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set.
+    // Designate that this is the first graph character.
+    // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set.
+    uint8_t graph_first = 0x1;
 
     // Identify where the content ends.
     while (range->start <= range->stop && range->start < buffer.used) {

diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c
index 261a36f42cf977b0a64157d9e0b9bbb0460d565f..8ea44794b29262b2ca1b99176f8ba76706659fdf 100644 (file)
--- a/level_1/fl_fss/c/fss/embedded_list.c
+++ b/level_1/fl_fss/c/fss/embedded_list.c
@@ -69,8 +69,9 @@ extern "C" {
 
     bool is_open = F_false;
 
+    // Designate that this is the first graph character.
     // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set.
-    uint8_t graph_first = 0x0;
+    uint8_t graph_first = 0x1;
 
     // Initialize depth 1 start position.
     // Positions_start.used is used as a max depth (such that positions_start.used == max depth + 1).
@@ -598,7 +599,7 @@ extern "C" {
         }
       }
       else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) {
-        position = newline_last + 1;
+        position = line_start;
 
         status = f_fss_seek_to_eol(state, buffer, range);
         if (F_status_is_error(status)) break;
@@ -610,19 +611,14 @@ extern "C" {
           --range->start;
         }
         else {
-          if (graph_first == 0x2) {
-            status = f_array_lengths_increase(state.step_small, delimits);
-            if (F_status_is_error(status)) break;
-
-            delimits->array[delimits->used++] = comment_delimit;
-          }
-
           newline_last = range->start;
-          graph_first = 0x1;
         }
 
+        graph_first = 0x1;
+
         comments->array[comments->used].start = position;
         comments->array[comments->used++].stop = range->start++;
+        line_start = range->start;
 
         continue;
       }

diff --git a/level_1/fl_fss/c/fss/extended_list.c b/level_1/fl_fss/c/fss/extended_list.c
index 9a7ae4b7990c030c05926a2cdd5da2671fab4a24..875f10408be90abde876479fa6498f2a139ddd7d 100644 (file)
--- a/level_1/fl_fss/c/fss/extended_list.c
+++ b/level_1/fl_fss/c/fss/extended_list.c
@@ -582,7 +582,8 @@ extern "C" {
     f_array_length_t slash_first = 0;
     f_array_length_t slash_count = 0;
 
-    bool graph_first = F_true;
+    // Designate that this is the first graph character.
+    uint8_t graph_first = F_true;
 
     // Identify where the object ends.
     while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) {

diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c
index 69cfb68fc0edd6cebccbd4c28da82419ebfedda9..43b76bb177c86eacda6bdc0baaf302f11b7ac1bd 100644 (file)
--- a/level_3/fss_embedded_list_read/c/private-read.c
+++ b/level_3/fss_embedded_list_read/c/private-read.c
@@ -279,7 +279,10 @@ extern "C" {
       for (; i < comments->used; ++i) {
 
         for (j = comments->array[i].start; j <= comments->array[i].stop; ++j) {
-          data->buffer.string[j] = f_fss_delimit_placeholder_s.string[0];
+
+          if (j < data->buffer.used) {
+            data->buffer.string[j] = f_fss_delimit_placeholder_s.string[0];
+          }
         } // for
       } // for
     }

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0-total.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0-total.expect
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0-total.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0-total.expect
@@ -1 +1 @@
-2
+1

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0.expect
index 29ae14d7fb4ea82b08fd0c14c8a7ec1d750cd601..9965c73b81d94d0385cb35258f65b3ebf5933e3a 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-select-0.expect
@@ -1,2 +1 @@
-  # has a comment
   But this is not a comment.

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-total.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-total.expect
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-total.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space-total.expect
@@ -1 +1 @@
-2
+1

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space.expect
index 29ae14d7fb4ea82b08fd0c14c8a7ec1d750cd601..9965c73b81d94d0385cb35258f65b3ebf5933e3a 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-привет_has_space.expect
@@ -1,2 +1 @@
-  # has a comment
   But this is not a comment.

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
index 53d1e7a2e50a721a4900ce9b62f54491fcdf27f9..959ccee90a5b2749f7aa926f70a00b71e2db4662 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
index 53d1e7a2e50a721a4900ce9b62f54491fcdf27f9..959ccee90a5b2749f7aa926f70a00b71e2db4662 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
index bbd7eb3efa3deedb03b6d974549148f9acdf22e7..9c5c57b3d21d40fcb62af9a31e73130d75905e34 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
index 209e3ef4b6247ce746048d5711befda46206d235..d6b24041cf04154f8f902651969675021f4d93a5 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
@@ -1 +1 @@
-20
+19

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
index bbd7eb3efa3deedb03b6d974549148f9acdf22e7..9c5c57b3d21d40fcb62af9a31e73130d75905e34 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
index bbd7eb3efa3deedb03b6d974549148f9acdf22e7..9c5c57b3d21d40fcb62af9a31e73130d75905e34 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-select-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-select-0.expect
index fad0fdc7fb4295d8cceb611ce1963971ddf61b0b..171efdd1477ba3f3bcaddae42c26487bb125f540 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-select-0.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-select-0.expect
@@ -1,4 +1,3 @@
 привет has space{
-  # has a comment
   But this is not a comment.
 }

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-total.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-total.expect
index b8626c4cff2849624fb67f87cd0ad72b163671ad..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-total.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-привет_has_space-total.expect
@@ -1 +1 @@
-4
+3

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
index 501583e9d24bb107b524e166861e91aecd32f579..025cdb431507752ab703bc835f0a7e8824509649 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
index a7873645902455c63d166fdcaa4b2fe565f6de7d..bb95160cb6e07358f54a28a208ae41e69889c97b 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
@@ -1 +1 @@
-34
+33

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
index 84340a2b14526aed143cc5d60ed3a8c43665b8d1..8ac8e0e9e2c7fccb784d8dc579156dcdf8f9b9af 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{

diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
index 9d794f30ef56f8278a9de6ebbc5a4dd9ddff701b..0a7c3b0cd76bd418f0aff3871b5f52b91a2f32a6 100644 (file)
--- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{