diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/parser/Lexer.h | |
parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/parser/Lexer.h')
-rw-r--r-- | Source/JavaScriptCore/parser/Lexer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/parser/Lexer.h b/Source/JavaScriptCore/parser/Lexer.h index 1ac832a2c..d75f2020d 100644 --- a/Source/JavaScriptCore/parser/Lexer.h +++ b/Source/JavaScriptCore/parser/Lexer.h @@ -100,12 +100,12 @@ public: // Functions for use after parsing. bool sawError() const { return m_error; } - UString getErrorMessage() const { return m_lexErrorMessage; } + String getErrorMessage() const { return m_lexErrorMessage; } void clear(); void setOffset(int offset) { m_error = 0; - m_lexErrorMessage = UString(); + m_lexErrorMessage = String(); m_code = m_codeStart + offset; m_buffer8.resize(0); m_buffer16.resize(0); @@ -137,7 +137,7 @@ private: int parseFourDigitUnicodeHex(); void shiftLineTerminator(); - UString invalidCharacterMessage() const; + String invalidCharacterMessage() const; ALWAYS_INLINE const T* currentCharacter() const; ALWAYS_INLINE int currentOffset() const { return m_code - m_codeStart; } ALWAYS_INLINE void setOffsetFromCharOffset(const T* charOffset) { setOffset(charOffset - m_codeStart); } @@ -181,7 +181,7 @@ private: bool m_isReparsing; bool m_atLineStart; bool m_error; - UString m_lexErrorMessage; + String m_lexErrorMessage; T m_current; |