diff options
| author | dan sinclair <dsinclair@chromium.org> | 2018-02-19 18:22:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-19 18:22:44 +0000 |
| commit | 43e0be7b93c24d6a37aa3a0dca1f8c89dc78b165 (patch) | |
| tree | 1523edde4ccf22ad158a928e4bda734e728b9967 /xfa/fxfa/fm2js/cxfa_fmparser.cpp | |
| parent | 00961a731b4811f84b5610d0b752f2f2b610f8ff (diff) | |
| download | pdfium-43e0be7b93c24d6a37aa3a0dca1f8c89dc78b165.tar.xz | |
Cleanup FormCalc inheritance
This CL cleans up the FormCalc inheritance. The binary and unary items
all share ToJavaScript methods now.
Change-Id: I7bf0978449395fa2eb90b954cf2118d7aa3f71c6
Reviewed-on: https://pdfium-review.googlesource.com/27290
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/fm2js/cxfa_fmparser.cpp')
| -rw-r--r-- | xfa/fxfa/fm2js/cxfa_fmparser.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xfa/fxfa/fm2js/cxfa_fmparser.cpp b/xfa/fxfa/fm2js/cxfa_fmparser.cpp index 948d9eb2f6..d023159bbf 100644 --- a/xfa/fxfa/fm2js/cxfa_fmparser.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmparser.cpp @@ -365,7 +365,7 @@ CXFA_FMParser::ParseEqualityExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMEqualityExpression>( + e1 = pdfium::MakeUnique<CXFA_FMEqualExpression>( line, TOKeq, std::move(e1), std::move(e2)); continue; case TOKne: @@ -377,7 +377,7 @@ CXFA_FMParser::ParseEqualityExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMEqualityExpression>( + e1 = pdfium::MakeUnique<CXFA_FMNotEqualExpression>( line, TOKne, std::move(e1), std::move(e2)); continue; default: @@ -411,8 +411,8 @@ CXFA_FMParser::ParseRelationalExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMRelationalExpression>( - line, TOKlt, std::move(e1), std::move(e2)); + e1 = pdfium::MakeUnique<CXFA_FMLtExpression>(line, TOKlt, std::move(e1), + std::move(e2)); continue; case TOKgt: case TOKksgt: @@ -423,8 +423,8 @@ CXFA_FMParser::ParseRelationalExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMRelationalExpression>( - line, TOKgt, std::move(e1), std::move(e2)); + e1 = pdfium::MakeUnique<CXFA_FMGtExpression>(line, TOKgt, std::move(e1), + std::move(e2)); continue; case TOKle: case TOKksle: @@ -435,8 +435,8 @@ CXFA_FMParser::ParseRelationalExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMRelationalExpression>( - line, TOKle, std::move(e1), std::move(e2)); + e1 = pdfium::MakeUnique<CXFA_FMLeExpression>(line, TOKle, std::move(e1), + std::move(e2)); continue; case TOKge: case TOKksge: @@ -447,8 +447,8 @@ CXFA_FMParser::ParseRelationalExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMRelationalExpression>( - line, TOKge, std::move(e1), std::move(e2)); + e1 = pdfium::MakeUnique<CXFA_FMGeExpression>(line, TOKge, std::move(e1), + std::move(e2)); continue; default: break; @@ -480,7 +480,7 @@ CXFA_FMParser::ParseAddtiveExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMAdditiveExpression>( + e1 = pdfium::MakeUnique<CXFA_FMPlusExpression>( line, TOKplus, std::move(e1), std::move(e2)); continue; case TOKminus: @@ -491,7 +491,7 @@ CXFA_FMParser::ParseAddtiveExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMAdditiveExpression>( + e1 = pdfium::MakeUnique<CXFA_FMMinusExpression>( line, TOKminus, std::move(e1), std::move(e2)); continue; default: @@ -524,7 +524,7 @@ CXFA_FMParser::ParseMultiplicativeExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMMultiplicativeExpression>( + e1 = pdfium::MakeUnique<CXFA_FMMulExpression>( line, TOKmul, std::move(e1), std::move(e2)); continue; case TOKdiv: @@ -535,7 +535,7 @@ CXFA_FMParser::ParseMultiplicativeExpression() { if (!e2) return nullptr; - e1 = pdfium::MakeUnique<CXFA_FMMultiplicativeExpression>( + e1 = pdfium::MakeUnique<CXFA_FMDivExpression>( line, TOKdiv, std::move(e1), std::move(e2)); continue; default: |