@@ -2070,18 +2070,18 @@ TOKEN:
                 if (!allowEscape) {
                     pos = indexOfSequence(img, "\\'");
                     if (pos > 0) {
-                        matchedToken.image = "'" + image.substring( 0, image.indexOf("\\'") + 1 ) + "'";
+                        matchedToken.image = image.substring( 0, image.indexOf("\\'") + 1 ) + "'";
                         // `charLiteralIndex` defined in TokenManagerDeclaration above
                         matchedToken.kind = charLiteralIndex;
-                        input_stream.backup(image.length() + 1 - matchedToken.image.length());
+                        input_stream.backup(image.length() - matchedToken.image.length());
                     }
                 } else {
                     pos = lastIndexOfSequence(img, "\\''");
                     if (pos > 0) {
-                        matchedToken.image = "'" + image.substring( 0, image.lastIndexOf("\\'") + 3);
+                        matchedToken.image = image.substring( 0, image.lastIndexOf("\\'") + 3);
                         // `charLiteralIndex` defined in TokenManagerDeclaration above
                         matchedToken.kind = charLiteralIndex;
-                        input_stream.backup(image.length() + 1 - matchedToken.image.length() );
+                        input_stream.backup(image.length() - matchedToken.image.length() );
                     }
                 }
     }
@@ -7132,7 +7132,7 @@ List<InterpolateElement> InterpolateClause():
 }
 {
     <K_INTERPOLATE>
-    [ "("
+    [ LOOKAHEAD(2) "("
         [ interpolateElement = InterpolateElement() { interpolateElements.add(interpolateElement); }
           ( "," interpolateElement = InterpolateElement() { interpolateElements.add(interpolateElement); } )*
         ]
@@ -9718,11 +9718,18 @@ IntervalExpression IntervalExpression() : {
         }
     }
     [
-        // Standard qualifier (field [TO field] [(precision)]) such as DAY or DAY TO SECOND.
-        LOOKAHEAD(2, { getToken(1).kind == K_DATE_LITERAL }) qualifier = IntervalQualifier() { interval.setIntervalQualifier(qualifier); }
-        // Non-standard single identifier field (e.g. MySQL `INTERVAL 1 foo`), kept for
-        // backwards compatibility.
-        | LOOKAHEAD(2) (token = <S_IDENTIFIER>) { interval.setIntervalType(token.image); }
+        // The entry decision for this optional block has to be stated explicitly: <S_IDENTIFIER>
+        // also starts whatever follows IntervalExpression() at its call sites (an alias, for
+        // instance), so one token of lookahead cannot decide whether to enter.
+        LOOKAHEAD({ getToken(1).kind == K_DATE_LITERAL || getToken(1).kind == S_IDENTIFIER })
+        (
+            // Standard qualifier (field [TO field] [(precision)]) such as DAY or DAY TO SECOND.
+            LOOKAHEAD({ getToken(1).kind == K_DATE_LITERAL }) qualifier = IntervalQualifier() { interval.setIntervalQualifier(qualifier); }
+            |
+            // Non-standard single identifier field (e.g. MySQL `INTERVAL 1 foo`), kept for
+            // backwards compatibility.
+            token = <S_IDENTIFIER> { interval.setIntervalType(token.image); }
+        )
     ]
     {
         return interval;
Original file line number	Diff line number	Diff line change
`@@ -2070,18 +2070,18 @@ TOKEN:`
`2070`	`2070`	`if (!allowEscape) {`
`2071`	`2071`	`pos = indexOfSequence(img, "\\'");`
`2072`	`2072`	`if (pos > 0) {`
`2073`		`- matchedToken.image = "'" + image.substring( 0, image.indexOf("\\'") + 1 ) + "'";`
	`2073`	`+ matchedToken.image = image.substring( 0, image.indexOf("\\'") + 1 ) + "'";`
`2074`	`2074`	// `charLiteralIndex` defined in TokenManagerDeclaration above
`2075`	`2075`	`matchedToken.kind = charLiteralIndex;`
`2076`		`- input_stream.backup(image.length() + 1 - matchedToken.image.length());`
	`2076`	`+ input_stream.backup(image.length() - matchedToken.image.length());`
`2077`	`2077`	`}`
`2078`	`2078`	`} else {`
`2079`	`2079`	`pos = lastIndexOfSequence(img, "\\''");`
`2080`	`2080`	`if (pos > 0) {`
`2081`		`- matchedToken.image = "'" + image.substring( 0, image.lastIndexOf("\\'") + 3);`
	`2081`	`+ matchedToken.image = image.substring( 0, image.lastIndexOf("\\'") + 3);`
`2082`	`2082`	// `charLiteralIndex` defined in TokenManagerDeclaration above
`2083`	`2083`	`matchedToken.kind = charLiteralIndex;`
`2084`		`- input_stream.backup(image.length() + 1 - matchedToken.image.length() );`
	`2084`	`+ input_stream.backup(image.length() - matchedToken.image.length() );`
`2085`	`2085`	`}`
`2086`	`2086`	`}`
`2087`	`2087`	`}`
`@@ -7132,7 +7132,7 @@ List<InterpolateElement> InterpolateClause():`
`7132`	`7132`	`}`
`7133`	`7133`	`{`
`7134`	`7134`	`<K_INTERPOLATE>`
`7135`		`- [ "("`
	`7135`	`+ [ LOOKAHEAD(2) "("`
`7136`	`7136`	`[ interpolateElement = InterpolateElement() { interpolateElements.add(interpolateElement); }`
`7137`	`7137`	`( "," interpolateElement = InterpolateElement() { interpolateElements.add(interpolateElement); } )*`
`7138`	`7138`	`]`
`@@ -9718,11 +9718,18 @@ IntervalExpression IntervalExpression() : {`
`9718`	`9718`	`}`
`9719`	`9719`	`}`
`9720`	`9720`	`[`
`9721`		`- // Standard qualifier (field [TO field] [(precision)]) such as DAY or DAY TO SECOND.`
`9722`		`- LOOKAHEAD(2, { getToken(1).kind == K_DATE_LITERAL }) qualifier = IntervalQualifier() { interval.setIntervalQualifier(qualifier); }`
`9723`		- // Non-standard single identifier field (e.g. MySQL `INTERVAL 1 foo`), kept for
`9724`		`- // backwards compatibility.`
`9725`		`- \| LOOKAHEAD(2) (token = <S_IDENTIFIER>) { interval.setIntervalType(token.image); }`
	`9721`	`+ // The entry decision for this optional block has to be stated explicitly: <S_IDENTIFIER>`
	`9722`	`+ // also starts whatever follows IntervalExpression() at its call sites (an alias, for`
	`9723`	`+ // instance), so one token of lookahead cannot decide whether to enter.`
	`9724`	`+ LOOKAHEAD({ getToken(1).kind == K_DATE_LITERAL \|\| getToken(1).kind == S_IDENTIFIER })`
	`9725`	`+ (`
	`9726`	`+ // Standard qualifier (field [TO field] [(precision)]) such as DAY or DAY TO SECOND.`
	`9727`	`+ LOOKAHEAD({ getToken(1).kind == K_DATE_LITERAL }) qualifier = IntervalQualifier() { interval.setIntervalQualifier(qualifier); }`
	`9728`	`+ \|`
	`9729`	+ // Non-standard single identifier field (e.g. MySQL `INTERVAL 1 foo`), kept for
	`9730`	`+ // backwards compatibility.`
	`9731`	`+ token = <S_IDENTIFIER> { interval.setIntervalType(token.image); }`
	`9732`	`+ )`
`9726`	`9733`	`]`
`9727`	`9734`	`{`
`9728`	`9735`	`return interval;`