Postfix for CORE-6466.

asfernandes · asfernandes · commit 781186257dc5 · 2021-01-31T17:38:28.000-03:00
diff --git a/src/dsql/Parser.cpp b/src/dsql/Parser.cpp
@@ -254,8 +254,8 @@ void Parser::yyReducePosn(YYPOSN& ret, YYPOSN* termPosns, YYSTYPE* /*termVals*/,
 		// Accessing termPosns[-1] seems to be the only way to get correct positions in this case.
 		ret.firstLine = ret.lastLine = termPosns[termNo - 1].lastLine;
 		ret.firstColumn = ret.lastColumn = termPosns[termNo - 1].lastColumn;
-		ret.firstPos = ret.lastPos = termPosns[termNo - 1].lastPos;
-		ret.leadingFirstPos = ret.trailingLastPos = termPosns[termNo - 1].trailingLastPos;
+		ret.firstPos = ret.lastPos = ret.trailingLastPos = termPosns[termNo - 1].trailingLastPos;
+		ret.leadingFirstPos = termPosns[termNo - 1].lastPos;
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,8 @@ void Parser::yyReducePosn(YYPOSN& ret, YYPOSN* termPosns, YYSTYPE* /termVals/,`
`254`	`254`	`// Accessing termPosns[-1] seems to be the only way to get correct positions in this case.`
`255`	`255`	`ret.firstLine = ret.lastLine = termPosns[termNo - 1].lastLine;`
`256`	`256`	`ret.firstColumn = ret.lastColumn = termPosns[termNo - 1].lastColumn;`
`257`		`- ret.firstPos = ret.lastPos = termPosns[termNo - 1].lastPos;`
`258`		`- ret.leadingFirstPos = ret.trailingLastPos = termPosns[termNo - 1].trailingLastPos;`
	`257`	`+ ret.firstPos = ret.lastPos = ret.trailingLastPos = termPosns[termNo - 1].trailingLastPos;`
	`258`	`+ ret.leadingFirstPos = termPosns[termNo - 1].lastPos;`
`259`	`259`	`}`
`260`	`260`	`else`
`261`	`261`	`{`