// }
}
} catch (IndexOutOfBoundsException e) {
+// reset end position for error reporting
+ currentPosition-=2;
throw new InvalidInputException(UNTERMINATED_STRING);
} catch (InvalidInputException e) {
if (e.getMessage().equals(INVALID_ESCAPE)) {
// }
}
} catch (IndexOutOfBoundsException e) {
+ // reset end position for error reporting
+ currentPosition-=2;
throw new InvalidInputException(UNTERMINATED_STRING);
} catch (InvalidInputException e) {
if (e.getMessage().equals(INVALID_ESCAPE)) {
// }
}
} catch (IndexOutOfBoundsException e) {
+// reset end position for error reporting
+ currentPosition-=2;
throw new InvalidInputException(UNTERMINATED_STRING);
} catch (InvalidInputException e) {
if (e.getMessage().equals(INVALID_ESCAPE)) {
case '{' :
if (encapsedChar == '$') {
if (getNextChar('$'))
- return TokenNameCURLY_OPEN;
+ return TokenNameLBRACE_DOLLAR;
}
return TokenNameLBRACE;
case '}' :
return TokenNameCOMMENT_BLOCK;
}
} catch (IndexOutOfBoundsException e) {
+// reset end position for error reporting
+ currentPosition-=2;
throw new InvalidInputException(UNTERMINATED_COMMENT);
}
break;
return "$";
case TokenNameDOLLAR_LBRACE :
return "${";
+ case TokenNameLBRACE_DOLLAR :
+ return "{$";
case TokenNameEOF :
return "EOF"; //$NON-NLS-1$
case TokenNameWHITESPACE :