Update unquoted tag expression handling

For a normal CFML tag an unquoted attribute, eg cfinput type=radio the string radio will be passed to the type attribute, if you have a variable named radio it will be ignored. However for a script mode tag cfinput(type=radio) it will use the radio variable instead.

Author: pfreitag

Statement.cfc

@@ -313,7 +313,12 @@ component accessors="false" {
 							variables.attributeStruct[attributeName] = attributeValue;
 							e = {expression=attributeValue, position=0};
 							e.position = getStartPosition() + len(getName()) + i - len(attributeValue) + e.position;
-							arrayAppend(variables.attributeExpressions, e);
+							
+							if (isScriptModeTag()) {
+								//only add to attributeExpressions if script as tag mode
+								//in legacy / normal tags unquoted attributes are converted to strings
+								arrayAppend(variables.attributeExpressions, e);
+							}
 							attributeName = "";
 							mode = "new";
 							attributeValue = "";
@@ -376,9 +381,12 @@ component accessors="false" {
 				if (quotedValue == "" && bracketStack == 0 && parenStack == 0) {
 					//end of unquoted expr value
 					variables.attributeStruct[attributeName] = attributeValue;
-					e = {expression=attributeValue, position=0};
-					e.position = e.position + getStartPosition() + len(getName()) + (len(variables.attributeContent)- len(attributeValue));
-					arrayAppend(variables.attributeExpressions, e);
+					if (isScriptModeTag()) {
+						//unquoted attr treated as expression in script mode tag, string in regular tags
+						e = {expression=attributeValue, position=0};
+						e.position = e.position + getStartPosition() + len(getName()) + (len(variables.attributeContent)- len(attributeValue));
+						arrayAppend(variables.attributeExpressions, e);
+					}
 				}
 			}
 

box.json

@@ -1,6 +1,6 @@
 {
     "name":"cfmlparser",
-    "version":"1.2.0",
+    "version":"1.2.1",
     "author":"Pete Freitag / Foundeo Inc.",
     "location":"",
     "directory":"",
@@ -42,7 +42,7 @@
     "contributors":[],
     "dependencies":{},
     "devDependencies":{
-        "testbox":"^2.3"
+        "testbox":"^6"
     },
     "installPaths":{
         "testbox":"tests/testbox/"

tests/tests/TestScriptParser.cfc

@@ -85,6 +85,15 @@ component extends="BaseTest" {
 				$assert.key(local.attribs, "value", "cfheader should have value attribute");
 				$assert.isEqual("##boo##", local.attribs.value);
 
+			}
+			if (stmt.getTagName() == "cfhttp") {
+				local.attribs = stmt.getAttributes();
+				$assert.isEqual("getMethod()", local.attribs.method);
+				//should be an expression
+				local.exprs = stmt.getExpressions();
+				$assert.isEqual(1, arrayLen(local.exprs), "cfhttp tag should have 1 expression");
+				$assert.isEqual("getMethod()", local.exprs[1].expression, "cfhttp tag should have 1 expression: getMethod()");
+
 			}
 			if (stmt.isScriptModeTag()) {
 				scriptModeTags++;

tests/tests/TestTag.cfc

@@ -114,6 +114,7 @@ component extends="BaseTest" {
 		$assert.isEqual(attr.url, "go.cfm");
 		$assert.key(attr, "addtoken");
 		$assert.isEqual(attr.addtoken, "false");
+		$assert.isEqual(0, arrayLen(tag.getExpressions()), "Should be no expressions in plain tag mode here.");
 
 	}
 

tests/tests/templates/script/tag.cfc

@@ -2,8 +2,12 @@ component {
 
 	function onRequest() {
 		cfheader(name="foo", value="#boo#");
-		cfhttp(url="address.cfm") {
+		cfhttp(url="address.cfm", method=getMethod()) {
 			cfhttpparam(name="foo", value="moo", type="header");
 		}
 	}
+
+	function getMethod() {
+		return "GET";
+	}
 }