diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
| commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
| tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /xfa/src/fxfa/src/fm2js/xfa_lexer.h | |
| parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
| download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz | |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'xfa/src/fxfa/src/fm2js/xfa_lexer.h')
| -rw-r--r-- | xfa/src/fxfa/src/fm2js/xfa_lexer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h index 709307046b..2850ce5f75 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h @@ -24,9 +24,9 @@ enum XFA_FM_TOKEN { struct XFA_FMKeyword {
XFA_FM_TOKEN m_type;
uint32_t m_uHash;
- FX_LPCWSTR m_keword;
+ const FX_WCHAR* m_keword;
};
-FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op);
+const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op);
class CXFA_FMToken
{
public:
@@ -44,10 +44,10 @@ public: CXFA_FMLexer(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo);
~CXFA_FMLexer();
CXFA_FMToken* NextToken();
- FX_DWORD Number(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd);
- FX_DWORD String(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd);
- FX_DWORD Identifiers(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd);
- void Comment(FX_LPCWSTR p, FX_LPCWSTR &pEnd);
+ FX_DWORD Number(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd);
+ FX_DWORD String(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd);
+ FX_DWORD Identifiers(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd);
+ void Comment(const FX_WCHAR* p, const FX_WCHAR* &pEnd);
XFA_FM_TOKEN IsKeyword(FX_WSTR p);
void SetCurrentLine(FX_DWORD line)
{
@@ -60,11 +60,11 @@ public: }
m_pToken = pToken;
}
- FX_LPCWSTR SavePos()
+ const FX_WCHAR* SavePos()
{
return m_ptr;
}
- void RestorePos(FX_LPCWSTR pPos)
+ void RestorePos(const FX_WCHAR* pPos)
{
m_ptr = pPos;
}
@@ -72,8 +72,8 @@ public: FX_BOOL HasError() const;
protected:
CXFA_FMToken* Scan();
- FX_LPCWSTR m_pScript;
- FX_LPCWSTR m_ptr;
+ const FX_WCHAR* m_pScript;
+ const FX_WCHAR* m_ptr;
FX_STRSIZE m_uLength;
FX_DWORD m_uCurrentLine;
CXFA_FMToken* m_pToken;
|