Merge pull request #1 from gitlarryf/comment-fixes

Fixed lexer to deal with incorrectly formatted Comments and Block Commen...

Author: ghewgill

lexer.cpp

@@ -232,9 +232,15 @@ std::vector<Token> tokenize(const std::string &source)
                 t.text.push_back(c);
             }
         } else if (c == '%') {
+            if (i+1 >= source.length()) {
+                break;
+            }
             if (source.at(i+1) == '|') {
                 int level = 0;
                 do {
+                    if (i+1 >= source.length()) {
+                        error(t, "Missing closing comment '|%'");
+                    }
                     if (source.at(i) == '%' && source.at(i+1) == '|') {
                         level++;
                         i += 2;

t/comments-block.simple

@@ -0,0 +1,3 @@
+%! Missing closing comment '|%'
+
+%| Block Comment, without proper ending comment token.

t/comments-block2.simple

@@ -0,0 +1,9 @@
+%! Missing closing comment '|%'
+
+%| This test is specifically designed to BEGIN the Block-Comment ending token,
+   but leaving off the last part of it, as well as ANY other data in the file.
+   This will test the lexers ability to handle a case where it THINKS the
+   token is ABOUT to end, but it does not, which is why there is NO LF at the
+   end of this file, and why the test result appears at the top. |%
+
+%| Block Comment, without proper ending comment token.|

t/comments-block3.simple

@@ -0,0 +1,3 @@
+%! Missing closing comment '|%'
+
+%| Block Comment, without proper ending comment token.%|

t/comments-block4.simple

@@ -0,0 +1,3 @@
+%! Missing closing comment '|%'
+
+%| Block Comment, without proper ending comment token.%|%%

t/comments-block5.simple

@@ -0,0 +1,7 @@
+%= Passed.
+
+%| This test is testing the COMMENT token on the last line of a source file.
+   A line that does not end, thus making sure the lexer lexes the line properly
+   and prints the correct "Test Passed" message to the test harness. |%
+
+print("Passed.")%

t/comments.simple

@@ -0,0 +1,25 @@
+%|--------------------------------------------------------------------------|%
+%| Testing "FlowerBox Comments..."                                          |%
+%| Test Set     : comments.simple                                           |%
+%| Created On   : 2014-10-21                                                |%
+%| Updated On   : 2014-10-21                                                |%
+%| Created By   : Larry Frieson                                             |%
+%|--------------------------------------------------------------------------|%
+print("FlowerBox Comments ok.")
+%= FlowerBox Comments ok.
+
+% Regular Simple-Lang comments...
+print("Regular Comments ok.")
+
+%= Regular Comments ok.
+
+%|
+    %|
+        %|
+            Testing Nested Comments...
+        |%
+    |%
+|%
+
+print("Nested Comments ok.")
+%= Nested Comments ok.