Nested comment fix

Author: pfreitag

TagParser.cfc

@@ -142,7 +142,7 @@ component extends="AbstractParser" {
 							//no nested comments 
 							endTagPos = endTagPos+3;
 						} else {
-							nestedComment = 0;
+							nestedComment = 1;
 							while (charPos < contentLength) {
 								c = mid(content, charPos,1);
 								if (c == "<" && mid(content, charPos, 5) == "<!---") {

box.json

@@ -1,6 +1,6 @@
 {
     "name":"cfmlparser",
-    "version":"1.1.8",
+    "version":"1.1.9",
     "author":"Pete Freitag / Foundeo Inc.",
     "location":"",
     "directory":"",

tests/tests/TestTagParser.cfc

@@ -51,6 +51,66 @@ component extends="BaseTest" {
 
 	}
 
+	function testNestedComment() {
+		var parser = getParser("tag/nested-comment.cfm");
+		var statements = parser.getStatements();
+		var tag = "";
+
+		$assert.isTrue(isArray(statements), "getStatements returns array");
+		$assert.isTrue(arrayLen(statements) == 1, "should have 1 elements: " & serializeJSON(statements));
+
+		tag = statements[1]; //should only have one comment element
+		$assert.isTrue(tag.isComment(), "isComment");
+
+	}
+
+	function testNestedDoubleComment() {
+		var parser = getParser("tag/nested-double-comment.cfm");
+		var statements = parser.getStatements();
+		var tag = "";
+
+		$assert.isTrue(isArray(statements), "getStatements returns array");
+		$assert.isTrue(arrayLen(statements) == 2, "should have 2 elements: " & serializeJSON(statements));
+
+		tag = statements[1]; //should only have one comment element
+		$assert.isTrue(tag.isComment(), "isComment");
+
+		tag = statements[2];
+		$assert.isFalse(tag.isComment(), "second tag not a comment");
+		$assert.isEqual("cfset", tag.getName());
+
+	}
+
+	function testNestedTripleComment() {
+		var parser = getParser("tag/nested-triple-comment.cfm");
+		var statements = parser.getStatements();
+		var tag = "";
+
+		$assert.isTrue(isArray(statements), "getStatements returns array");
+		$assert.isTrue(arrayLen(statements) == 2, "should have 2 elements: " & serializeJSON(statements));
+
+		tag = statements[1]; //should only have one comment element
+		$assert.isTrue(tag.isComment(), "isComment");
+
+		tag = statements[2];
+		$assert.isFalse(tag.isComment(), "second tag not a comment");
+		$assert.isEqual("cfset", tag.getName());
+
+	}
+
+	function testUnclosedComment() {
+		var parser = getParser("tag/unclosed-comment.cfm");
+		var statements = parser.getStatements();
+		var tag = "";
+
+		$assert.isTrue(isArray(statements), "getStatements returns array");
+		$assert.isTrue(arrayLen(statements) == 1, "should have 1 elements: " & serializeJSON(statements));
+
+		tag = statements[1]; //should only have one comment element
+		$assert.isTrue(tag.isComment(), "isComment");
+		
+	}
+
 	function testGtInTag() {
 		var parser = getParser("tag/gt-in-tag.cfm");
 		var statements = parser.getStatements();

tests/tests/templates/tag/nested-comment.cfm

@@ -0,0 +1,4 @@
+<!--- outer comment
+    <!--- nested comment --->
+    <cfquery>SELECT 1</cfquery>
+--->

tests/tests/templates/tag/nested-double-comment.cfm

@@ -0,0 +1,8 @@
+<!--- outer comment
+    <!--- nested comment 
+        <!--- double comment --->
+        <cfquery>SELECT 1</cfquery>
+
+    --->
+--->
+<cfset x = 1>

tests/tests/templates/tag/nested-triple-comment.cfm

@@ -0,0 +1,13 @@
+<!--- outer comment
+    <!--- nested comment 
+        <!--- another one --->
+        <!--- double comment 
+            <!--- triple comment --->
+            <cfquery>SELECT 1</cfquery>
+
+        --->
+        <cfabort>
+        <!--- one more --->
+    --->
+--->
+<cfset x = 1>

tests/tests/templates/tag/unclosed-comment.cfm

@@ -0,0 +1,4 @@
+<!---
+    this comment is not closed
+    <cfquery>SELECT 1</cfquery>
+    so it should just look like one big comment