Postfix for #7608 - fix BLR to src mapping of DECLARE.

asfernandes · asfernandes · commit 2052bc5b99eb · 2025-05-20T08:57:34.000-03:00
diff --git a/src/dsql/StmtNodes.cpp b/src/dsql/StmtNodes.cpp
@@ -6426,8 +6426,6 @@ void LocalDeclarationsNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	{
 		auto parameter = *ptr;
 
-		dsqlScratch->putDebugSrcInfo(parameter->line, parameter->column);
-
 		if (const auto varNode = nodeAs<DeclareVariableNode>(parameter))
 		{
 			dsql_fld* field = varNode->dsqlDef->type;
@@ -6473,7 +6471,10 @@ void LocalDeclarationsNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	for (const auto parameter : statements)
 	{
 		if (const auto varNode = nodeAs<DeclareVariableNode>(parameter))
+		{
+			dsqlScratch->putDebugSrcInfo(parameter->line, parameter->column);
 			dsqlScratch->putLocalVariableInit(*declVarIt++, varNode);
+		}
 	}
 
 	if (!isSubRoutine)

Original file line number	Diff line number	Diff line change
`@@ -6426,8 +6426,6 @@ void LocalDeclarationsNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`6426`	`6426`	`{`
`6427`	`6427`	`auto parameter = *ptr;`
`6428`	`6428`
`6429`		`- dsqlScratch->putDebugSrcInfo(parameter->line, parameter->column);`
`6430`		`-`
`6431`	`6429`	`if (const auto varNode = nodeAs<DeclareVariableNode>(parameter))`
`6432`	`6430`	`{`
`6433`	`6431`	`dsql_fld* field = varNode->dsqlDef->type;`
`@@ -6473,7 +6471,10 @@ void LocalDeclarationsNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`6473`	`6471`	`for (const auto parameter : statements)`
`6474`	`6472`	`{`
`6475`	`6473`	`if (const auto varNode = nodeAs<DeclareVariableNode>(parameter))`
	`6474`	`+ {`
	`6475`	`+ dsqlScratch->putDebugSrcInfo(parameter->line, parameter->column);`
`6476`	`6476`	`dsqlScratch->putLocalVariableInit(*declVarIt++, varNode);`
	`6477`	`+ }`
`6477`	`6478`	`}`
`6478`	`6479`
`6479`	`6480`	`if (!isSubRoutine)`