LDEV-5989 preserve original source in AST raw field for SimpleExprTransformer

Author: zspitzer

core/src/main/java/lucee/transformer/bytecode/literal/LitStringImpl.java

@@ -50,6 +50,7 @@ public class LitStringImpl extends ExpressionBase implements LitString, ExprStri
 	public static final int TYPE_LOWER = 2;
 
 	private String str;
+	private String rawSource; // Original source representation for AST dump
 	private boolean fromBracket;
 
 	/*
@@ -195,13 +196,32 @@ public boolean fromBracket() {
 		return fromBracket;
 	}
 
+	/**
+	 * Set the original source representation for AST dump.
+	 * This preserves the exact source text including quotes.
+	 */
+	public void setRawSource(String rawSource) {
+		this.rawSource = rawSource;
+	}
+
+	/**
+	 * Get the original source representation.
+	 */
+	public String getRawSource() {
+		return rawSource;
+	}
+
 	@Override
 	public void dump(Struct sct) {
 		super.dump(sct);
 		sct.setEL(KeyConstants._type, "StringLiteral");
 		sct.setEL(KeyConstants._value, str);
-		// Raw must be valid CFML source: escape # to ## and " to ""
-		if (str != null) {
+		// Use rawSource if available (preserves original source representation)
+		// Otherwise compute from value: escape # to ## and " to ""
+		if (rawSource != null) {
+			sct.setEL(KeyConstants._raw, rawSource);
+		}
+		else if (str != null) {
 			String escaped = str.replace("#", "##").replace("\"", "\"\"");
 			sct.setEL(KeyConstants._raw, "\"" + escaped + "\"");
 		}

core/src/main/java/lucee/transformer/cfml/expression/SimpleExprTransformer.java

@@ -24,6 +24,7 @@
 import lucee.transformer.cfml.Data;
 import lucee.transformer.cfml.ExprTransformer;
 import lucee.transformer.expression.Expression;
+import lucee.transformer.bytecode.literal.LitStringImpl;
 import lucee.transformer.expression.literal.LitString;
 import lucee.transformer.util.SourceCode;
 
@@ -56,7 +57,7 @@ public Expression transform(Data data) throws TemplateException {
 
 	/**
 	 * Liest den String ein
-	 * 
+	 *
 	 * @return Element
 	 * @throws TemplateException
 	 */
@@ -65,6 +66,8 @@ public Expression string(Factory f, SourceCode cfml) throws TemplateException {
 		char quoter = cfml.getCurrentLower();
 		if (quoter != '"' && quoter != '\'') return null;
 		StringBuilder str = new StringBuilder();
+		StringBuilder rawSource = new StringBuilder();
+		rawSource.append(quoter); // Start with opening quote
 		boolean insideSpecial = false;
 
 		Position line = cfml.getPosition();
@@ -74,14 +77,16 @@ public Expression string(Factory f, SourceCode cfml) throws TemplateException {
 			if (cfml.isCurrent(specialChar)) {
 				insideSpecial = !insideSpecial;
 				str.append(specialChar);
-
+				rawSource.append(specialChar);
 			}
 			// check quoter
 			else if (!insideSpecial && cfml.isCurrent(quoter)) {
 				// Ecaped sharp
 				if (cfml.isNext(quoter)) {
 					cfml.next();
 					str.append(quoter);
+					rawSource.append(quoter);
+					rawSource.append(quoter); // escaped quote in raw
 				}
 				// finish
 				else {
@@ -91,12 +96,18 @@ else if (!insideSpecial && cfml.isCurrent(quoter)) {
 			// all other character
 			else {
 				str.append(cfml.getCurrent());
+				rawSource.append(cfml.getCurrent());
 			}
 		}
 
 		if (!cfml.forwardIfCurrent(quoter)) throw new TemplateException(cfml, "Invalid Syntax Closing [" + quoter + "] not found");
 
+		rawSource.append(quoter); // End with closing quote
 		LitString rtn = f.createLitString(str.toString(), line, cfml.getPosition());
+		// Set raw source to preserve original representation for AST dump
+		if (rtn instanceof LitStringImpl) {
+			((LitStringImpl) rtn).setRawSource(rawSource.toString());
+		}
 		cfml.removeSpace();
 		return rtn;
 	}

test/tickets/LDEV5989.cfc

@@ -0,0 +1,81 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="ast" {
+
+	variables.testDir = getDirectoryFromPath( getCurrentTemplatePath() ) & "LDEV5989/";
+
+	function run( testResults, testBox ) {
+
+		describe( "LDEV-5989: Interpolated attribute values have escaped hashes in raw field", function() {
+
+			it( "raw should contain original single hashes for interpolated attributes", function() {
+				var code = fileRead( variables.testDir & "interpolatedAttr.cfm" );
+				var ast = astFromString( code );
+
+				// Find the condition attribute
+				var attr = findAttribute( ast, "condition" );
+				expect( attr ).notToBeNull( "condition attribute should be present in AST" );
+
+				// The raw field should contain single hashes like the original source
+				// NOT escaped hashes like "##it.hasNext()##"
+				var rawValue = attr.value.raw;
+
+				// Check for doubled hashes (##) in raw - use chr(35) to avoid CFML escaping issues
+				// If raw has ##, find() will locate chr(35)&chr(35) sequence
+				var doubleHash = chr( 35 ) & chr( 35 );
+				var hasDoubleHash = find( doubleHash, rawValue ) > 0;
+
+				// If hasDoubleHash is true, raw contains ## which is the bug
+				expect( hasDoubleHash ).toBeFalse( "Raw should contain single hashes, not escaped ## - got: " & rawValue );
+			});
+
+			it( "round-trip should preserve interpolated attribute values", function() {
+				// Parse file with interpolated attribute
+				var code1 = fileRead( variables.testDir & "roundtrip1.cfm" );
+				var ast1 = astFromString( code1 );
+
+				var attr1 = findAttribute( ast1, "condition" );
+				expect( attr1 ).notToBeNull( "First parse should find condition attribute" );
+				var raw1 = attr1.value.raw;
+
+				// Build round-trip file using template
+				var template = fileRead( variables.testDir & "loopTemplate.txt" );
+				var code2 = replace( template, "%%CONDITION%%", raw1 );
+				fileWrite( variables.testDir & "roundtrip2.cfm", code2 );
+
+				// Parse the round-trip file
+				var ast2 = astFromString( code2 );
+				var attr2 = findAttribute( ast2, "condition" );
+				expect( attr2 ).notToBeNull( "Second parse should find condition attribute" );
+
+				// Raw should be stable - not doubling hashes each round
+				expect( attr2.value.raw ).toBe( raw1, "Raw should be stable after round-trip, not doubling hashes" );
+			});
+
+		});
+
+	}
+
+	/**
+	 * Recursively find an Attribute node by name
+	 */
+	private function findAttribute( required struct node, required string name ) {
+		if ( ( node.type ?: "" ) == "Attribute" && ( node.name ?: "" ) == name ) {
+			return node;
+		}
+		for ( var key in node ) {
+			var val = node[ key ];
+			if ( isStruct( val ) ) {
+				var result = findAttribute( val, name );
+				if ( !isNull( result ) ) return result;
+			} else if ( isArray( val ) ) {
+				for ( var item in val ) {
+					if ( isStruct( item ) ) {
+						var result = findAttribute( item, name );
+						if ( !isNull( result ) ) return result;
+					}
+				}
+			}
+		}
+		return;
+	}
+
+}

test/tickets/LDEV5989/interpolatedAttr.cfm

@@ -0,0 +1 @@
+<cfloop condition="#it.hasNext()#"></cfloop>

test/tickets/LDEV5989/loopTemplate.txt

@@ -0,0 +1 @@
+<cfloop condition=%%CONDITION%%></cfloop>

test/tickets/LDEV5989/roundtrip1.cfm

@@ -0,0 +1 @@
+<cfloop condition="#x.hasNext()#"></cfloop>

test/tickets/LDEV5989/roundtrip2.cfm

@@ -0,0 +1 @@
+<cfloop condition="#x.hasNext()#"></cfloop>