Tidy cfx_csssyntaxparser.h - remove unused CFX_CSSSYNTAXCHECK_* defines. - nest enum CFX_CSSSyntaxStatus. - shorten names of nested enums. Change-Id: Ic93828d8de711d369f7daef46ec2722927759acc Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80631 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcrt/css/cfx_cssstyleselector.cpp b/core/fxcrt/css/cfx_cssstyleselector.cpp index 3c7de1c..c31a75e 100644 --- a/core/fxcrt/css/cfx_cssstyleselector.cpp +++ b/core/fxcrt/css/cfx_cssstyleselector.cpp
@@ -148,13 +148,13 @@ const CFX_CSSData::Property* property = nullptr; WideString wsName; while (1) { - CFX_CSSSyntaxStatus eStatus = pSyntax->DoSyntaxParse(); - if (eStatus == CFX_CSSSyntaxStatus::kPropertyName) { + CFX_CSSSyntaxParser::Status eStatus = pSyntax->DoSyntaxParse(); + if (eStatus == CFX_CSSSyntaxParser::Status::kPropertyName) { WideStringView strValue = pSyntax->GetCurrentString(); property = CFX_CSSData::GetPropertyByName(strValue); if (!property) wsName = WideString(strValue); - } else if (eStatus == CFX_CSSSyntaxStatus::kPropertyValue) { + } else if (eStatus == CFX_CSSSyntaxParser::Status::kPropertyValue) { if (property || iLen2 > 0) { WideStringView strValue = pSyntax->GetCurrentString(); if (!strValue.IsEmpty()) {
diff --git a/core/fxcrt/css/cfx_cssstylesheet.cpp b/core/fxcrt/css/cfx_cssstylesheet.cpp index fc0591a..cd907b4 100644 --- a/core/fxcrt/css/cfx_cssstylesheet.cpp +++ b/core/fxcrt/css/cfx_cssstylesheet.cpp
@@ -29,41 +29,40 @@ m_RuleArray.clear(); auto pSyntax = std::make_unique<CFX_CSSSyntaxParser>(buffer); while (1) { - CFX_CSSSyntaxStatus eStatus = pSyntax->DoSyntaxParse(); - if (eStatus == CFX_CSSSyntaxStatus::kStyleRule) + CFX_CSSSyntaxParser::Status eStatus = pSyntax->DoSyntaxParse(); + if (eStatus == CFX_CSSSyntaxParser::Status::kStyleRule) eStatus = LoadStyleRule(pSyntax.get()); - if (eStatus == CFX_CSSSyntaxStatus::kEOS) + if (eStatus == CFX_CSSSyntaxParser::Status::kEOS) return true; - if (eStatus == CFX_CSSSyntaxStatus::kError) + if (eStatus == CFX_CSSSyntaxParser::Status::kError) return false; } } -CFX_CSSSyntaxStatus CFX_CSSStyleSheet::LoadStyleRule( +CFX_CSSSyntaxParser::Status CFX_CSSStyleSheet::LoadStyleRule( CFX_CSSSyntaxParser* pSyntax) { std::vector<std::unique_ptr<CFX_CSSSelector>> selectors; - CFX_CSSStyleRule* pStyleRule = nullptr; int32_t iValueLen = 0; const CFX_CSSData::Property* property = nullptr; WideString wsName; while (1) { switch (pSyntax->DoSyntaxParse()) { - case CFX_CSSSyntaxStatus::kSelector: { + case CFX_CSSSyntaxParser::Status::kSelector: { WideStringView strValue = pSyntax->GetCurrentString(); auto pSelector = CFX_CSSSelector::FromString(strValue); if (pSelector) selectors.push_back(std::move(pSelector)); break; } - case CFX_CSSSyntaxStatus::kPropertyName: { + case CFX_CSSSyntaxParser::Status::kPropertyName: { WideStringView strValue = pSyntax->GetCurrentString(); property = CFX_CSSData::GetPropertyByName(strValue); if (!property) wsName = WideString(strValue); break; } - case CFX_CSSSyntaxStatus::kPropertyValue: { + case CFX_CSSSyntaxParser::Status::kPropertyValue: { if (property || iValueLen > 0) { WideStringView strValue = pSyntax->GetCurrentString(); auto* decl = pStyleRule->GetDeclaration(); @@ -77,7 +76,7 @@ } break; } - case CFX_CSSSyntaxStatus::kDeclOpen: { + case CFX_CSSSyntaxParser::Status::kDeclOpen: { if (!pStyleRule && !selectors.empty()) { auto rule = std::make_unique<CFX_CSSStyleRule>(); pStyleRule = rule.get(); @@ -85,22 +84,22 @@ m_RuleArray.push_back(std::move(rule)); } else { SkipRuleSet(pSyntax); - return CFX_CSSSyntaxStatus::kNone; + return CFX_CSSSyntaxParser::Status::kNone; } break; } - case CFX_CSSSyntaxStatus::kDeclClose: { + case CFX_CSSSyntaxParser::Status::kDeclClose: { if (pStyleRule && pStyleRule->GetDeclaration()->empty()) { m_RuleArray.pop_back(); pStyleRule = nullptr; } - return CFX_CSSSyntaxStatus::kNone; + return CFX_CSSSyntaxParser::Status::kNone; } - case CFX_CSSSyntaxStatus::kEOS: - return CFX_CSSSyntaxStatus::kEOS; - case CFX_CSSSyntaxStatus::kError: + case CFX_CSSSyntaxParser::Status::kEOS: + return CFX_CSSSyntaxParser::Status::kEOS; + case CFX_CSSSyntaxParser::Status::kError: default: - return CFX_CSSSyntaxStatus::kError; + return CFX_CSSSyntaxParser::Status::kError; } } } @@ -108,14 +107,14 @@ void CFX_CSSStyleSheet::SkipRuleSet(CFX_CSSSyntaxParser* pSyntax) { while (1) { switch (pSyntax->DoSyntaxParse()) { - case CFX_CSSSyntaxStatus::kSelector: - case CFX_CSSSyntaxStatus::kDeclOpen: - case CFX_CSSSyntaxStatus::kPropertyName: - case CFX_CSSSyntaxStatus::kPropertyValue: + case CFX_CSSSyntaxParser::Status::kSelector: + case CFX_CSSSyntaxParser::Status::kDeclOpen: + case CFX_CSSSyntaxParser::Status::kPropertyName: + case CFX_CSSSyntaxParser::Status::kPropertyValue: break; - case CFX_CSSSyntaxStatus::kDeclClose: - case CFX_CSSSyntaxStatus::kEOS: - case CFX_CSSSyntaxStatus::kError: + case CFX_CSSSyntaxParser::Status::kDeclClose: + case CFX_CSSSyntaxParser::Status::kEOS: + case CFX_CSSSyntaxParser::Status::kError: default: return; }
diff --git a/core/fxcrt/css/cfx_cssstylesheet.h b/core/fxcrt/css/cfx_cssstylesheet.h index 92a0f77..318c722 100644 --- a/core/fxcrt/css/cfx_cssstylesheet.h +++ b/core/fxcrt/css/cfx_cssstylesheet.h
@@ -25,7 +25,7 @@ CFX_CSSStyleRule* GetRule(size_t index) const; private: - CFX_CSSSyntaxStatus LoadStyleRule(CFX_CSSSyntaxParser* pSyntax); + CFX_CSSSyntaxParser::Status LoadStyleRule(CFX_CSSSyntaxParser* pSyntax); void SkipRuleSet(CFX_CSSSyntaxParser* pSyntax); std::vector<std::unique_ptr<CFX_CSSStyleRule>> m_RuleArray;
diff --git a/core/fxcrt/css/cfx_csssyntaxparser.cpp b/core/fxcrt/css/cfx_csssyntaxparser.cpp index 91415b2..8b13d8e 100644 --- a/core/fxcrt/css/cfx_csssyntaxparser.cpp +++ b/core/fxcrt/css/cfx_csssyntaxparser.cpp
@@ -27,26 +27,26 @@ CFX_CSSSyntaxParser::~CFX_CSSSyntaxParser() = default; void CFX_CSSSyntaxParser::SetParseOnlyDeclarations() { - m_eMode = SyntaxMode::kPropertyName; + m_eMode = Mode::kPropertyName; } -CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() { +CFX_CSSSyntaxParser::Status CFX_CSSSyntaxParser::DoSyntaxParse() { m_Output.Clear(); if (m_bHasError) - return CFX_CSSSyntaxStatus::kError; + return Status::kError; while (!m_Input.IsEOF()) { wchar_t wch = m_Input.GetChar(); switch (m_eMode) { - case SyntaxMode::kRuleSet: + case Mode::kRuleSet: switch (wch) { case '}': m_bHasError = true; - return CFX_CSSSyntaxStatus::kError; + return Status::kError; case '/': if (m_Input.GetNextChar() == '*') { - SaveMode(SyntaxMode::kRuleSet); - m_eMode = SyntaxMode::kComment; + SaveMode(Mode::kRuleSet); + m_eMode = Mode::kComment; break; } FALLTHROUGH; @@ -54,35 +54,35 @@ if (wch <= ' ') { m_Input.MoveNext(); } else if (IsSelectorStart(wch)) { - m_eMode = SyntaxMode::kSelector; - return CFX_CSSSyntaxStatus::kStyleRule; + m_eMode = Mode::kSelector; + return Status::kStyleRule; } else { m_bHasError = true; - return CFX_CSSSyntaxStatus::kError; + return Status::kError; } break; } break; - case SyntaxMode::kSelector: + case Mode::kSelector: switch (wch) { case ',': m_Input.MoveNext(); if (!m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kSelector; + return Status::kSelector; break; case '{': if (!m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kSelector; + return Status::kSelector; m_Input.MoveNext(); - SaveMode(SyntaxMode::kRuleSet); // Back to validate ruleset again. - m_eMode = SyntaxMode::kPropertyName; - return CFX_CSSSyntaxStatus::kDeclOpen; + SaveMode(Mode::kRuleSet); // Back to validate ruleset again. + m_eMode = Mode::kPropertyName; + return Status::kDeclOpen; case '/': if (m_Input.GetNextChar() == '*') { - SaveMode(SyntaxMode::kSelector); - m_eMode = SyntaxMode::kComment; + SaveMode(Mode::kSelector); + m_eMode = Mode::kComment; if (!m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kSelector; + return Status::kSelector; break; } FALLTHROUGH; @@ -92,24 +92,24 @@ break; } break; - case SyntaxMode::kPropertyName: + case Mode::kPropertyName: switch (wch) { case ':': m_Input.MoveNext(); - m_eMode = SyntaxMode::kPropertyValue; - return CFX_CSSSyntaxStatus::kPropertyName; + m_eMode = Mode::kPropertyValue; + return Status::kPropertyName; case '}': m_Input.MoveNext(); if (!RestoreMode()) - return CFX_CSSSyntaxStatus::kError; + return Status::kError; - return CFX_CSSSyntaxStatus::kDeclClose; + return Status::kDeclClose; case '/': if (m_Input.GetNextChar() == '*') { - SaveMode(SyntaxMode::kPropertyName); - m_eMode = SyntaxMode::kComment; + SaveMode(Mode::kPropertyName); + m_eMode = Mode::kComment; if (!m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kPropertyName; + return Status::kPropertyName; break; } FALLTHROUGH; @@ -119,20 +119,20 @@ break; } break; - case SyntaxMode::kPropertyValue: + case Mode::kPropertyValue: switch (wch) { case ';': m_Input.MoveNext(); FALLTHROUGH; case '}': - m_eMode = SyntaxMode::kPropertyName; - return CFX_CSSSyntaxStatus::kPropertyValue; + m_eMode = Mode::kPropertyName; + return Status::kPropertyValue; case '/': if (m_Input.GetNextChar() == '*') { - SaveMode(SyntaxMode::kPropertyValue); - m_eMode = SyntaxMode::kComment; + SaveMode(Mode::kPropertyValue); + m_eMode = Mode::kComment; if (!m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kPropertyValue; + return Status::kPropertyValue; break; } FALLTHROUGH; @@ -142,10 +142,10 @@ break; } break; - case SyntaxMode::kComment: + case Mode::kComment: if (wch == '*' && m_Input.GetNextChar() == '/') { if (!RestoreMode()) - return CFX_CSSSyntaxStatus::kError; + return Status::kError; m_Input.MoveNext(); } m_Input.MoveNext(); @@ -155,13 +155,13 @@ break; } } - if (m_eMode == SyntaxMode::kPropertyValue && !m_Output.IsEmpty()) - return CFX_CSSSyntaxStatus::kPropertyValue; + if (m_eMode == Mode::kPropertyValue && !m_Output.IsEmpty()) + return Status::kPropertyValue; - return CFX_CSSSyntaxStatus::kEOS; + return Status::kEOS; } -void CFX_CSSSyntaxParser::SaveMode(SyntaxMode mode) { +void CFX_CSSSyntaxParser::SaveMode(Mode mode) { m_ModeStack.push(mode); }
diff --git a/core/fxcrt/css/cfx_csssyntaxparser.h b/core/fxcrt/css/cfx_csssyntaxparser.h index d8728ea..57b472d 100644 --- a/core/fxcrt/css/cfx_csssyntaxparser.h +++ b/core/fxcrt/css/cfx_csssyntaxparser.h
@@ -13,32 +13,29 @@ #include "core/fxcrt/css/cfx_cssoutputtextbuf.h" #include "core/fxcrt/fx_string.h" -#define CFX_CSSSYNTAXCHECK_AllowCharset 1 -#define CFX_CSSSYNTAXCHECK_AllowImport 2 - -enum class CFX_CSSSyntaxStatus : uint8_t { - kError, - kEOS, - kNone, - kStyleRule, - kSelector, - kDeclOpen, - kDeclClose, - kPropertyName, - kPropertyValue, -}; - class CFX_CSSSyntaxParser { public: + enum class Status : uint8_t { + kError, + kEOS, + kNone, + kStyleRule, + kSelector, + kDeclOpen, + kDeclClose, + kPropertyName, + kPropertyValue, + }; + explicit CFX_CSSSyntaxParser(WideStringView str); ~CFX_CSSSyntaxParser(); void SetParseOnlyDeclarations(); - CFX_CSSSyntaxStatus DoSyntaxParse(); + Status DoSyntaxParse(); WideStringView GetCurrentString() const; private: - enum class SyntaxMode : uint8_t { + enum class Mode : uint8_t { kRuleSet, kComment, kSelector, @@ -46,14 +43,14 @@ kPropertyValue, }; - void SaveMode(SyntaxMode eMode); + void SaveMode(Mode eMode); bool RestoreMode(); bool m_bHasError = false; - SyntaxMode m_eMode = SyntaxMode::kRuleSet; + Mode m_eMode = Mode::kRuleSet; CFX_CSSOutputTextBuf m_Output; CFX_CSSInputTextBuf m_Input; - std::stack<SyntaxMode> m_ModeStack; + std::stack<Mode> m_ModeStack; }; #endif // CORE_FXCRT_CSS_CFX_CSSSYNTAXPARSER_H_
diff --git a/core/fxcrt/css/cfx_csssyntaxparser_unittest.cpp b/core/fxcrt/css/cfx_csssyntaxparser_unittest.cpp index 024a067..e39706c 100644 --- a/core/fxcrt/css/cfx_csssyntaxparser_unittest.cpp +++ b/core/fxcrt/css/cfx_csssyntaxparser_unittest.cpp
@@ -14,109 +14,117 @@ const wchar_t* input = L""; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseBlank) { const wchar_t* input = L" \n\r\t"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMissingColon) { const wchar_t* input = L"foo "; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMissingValue) { const wchar_t* input = L"foo: "; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseSingleProp1) { const wchar_t* input = L"foo:bar"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseSingleProp2) { const wchar_t* input = L"foo:bar;"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMissingColonMultiple) { const wchar_t* input = L"foo:bar; baz"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMissingPropertyMultiple) { const wchar_t* input = L"foo:bar; baz: "; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"baz", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMultipleProp1) { const wchar_t* input = L"foo : bar; baz : bam"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"baz", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bam", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseMultipleProp2) { const wchar_t* input = L"foo:bar;baz:bam;"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"baz", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bam", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kEOS, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kEOS, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseOpenBrace1) { @@ -125,11 +133,12 @@ parser.SetParseOnlyDeclarations(); // TODO(tsepez): these should fail on stray punctuation. - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"{a", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"3", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseOpenBrace2) { @@ -138,11 +147,12 @@ parser.SetParseOnlyDeclarations(); // TODO(tsepez): these should fail on stray punctuation. - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo {a", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"3", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseOpenBrace3) { @@ -151,62 +161,67 @@ parser.SetParseOnlyDeclarations(); // TODO(tsepez): these should fail on stray punctuation. - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar {a:3", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseOpenBrace4) { const wchar_t* input = L"foo: bar; {a:3}"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); // TODO(tsepez): these should fail on stray punctuation. - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"{a", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"3", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseCloseBrace1) { const wchar_t* input = L"} foo:bar"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseCloseBrace2) { const wchar_t* input = L"foo}:bar"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseCloseBrace3) { const wchar_t* input = L"foo:bar}"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); } TEST(CSSSyntaxParserTest, ParseCloseBrace4) { const wchar_t* input = L"foo:bar;}"; CFX_CSSSyntaxParser parser(input); parser.SetParseOnlyDeclarations(); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyName, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyName, parser.DoSyntaxParse()); EXPECT_EQ(L"foo", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kPropertyValue, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kPropertyValue, + parser.DoSyntaxParse()); EXPECT_EQ(L"bar", parser.GetCurrentString()); - EXPECT_EQ(CFX_CSSSyntaxStatus::kError, parser.DoSyntaxParse()); + EXPECT_EQ(CFX_CSSSyntaxParser::Status::kError, parser.DoSyntaxParse()); }
diff --git a/testing/fuzzers/pdf_css_fuzzer.cc b/testing/fuzzers/pdf_css_fuzzer.cc index fb8c876..2213fbd 100644 --- a/testing/fuzzers/pdf_css_fuzzer.cc +++ b/testing/fuzzers/pdf_css_fuzzer.cc
@@ -15,10 +15,10 @@ return 0; CFX_CSSSyntaxParser parser(input.AsStringView()); - CFX_CSSSyntaxStatus status; + CFX_CSSSyntaxParser::Status status; do { status = parser.DoSyntaxParse(); - } while (status != CFX_CSSSyntaxStatus::kError && - status != CFX_CSSSyntaxStatus::kEOS); + } while (status != CFX_CSSSyntaxParser::Status::kError && + status != CFX_CSSSyntaxParser::Status::kEOS); return 0; }