Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: Source/core/css/CSSGrammar.y.in

Issue 15660004: Reporing invalid CSS selectors. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2012 Intel Corporation. All rights reserved. 6 * Copyright (C) 2012 Intel Corporation. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 | 1542 |
1543 property ':' maybe_space error_location expr prio { 1543 property ':' maybe_space error_location expr prio {
1544 $$ = false; 1544 $$ = false;
1545 bool isPropertyParsed = false; 1545 bool isPropertyParsed = false;
1546 if ($1 && $5) { 1546 if ($1 && $5) {
1547 parser->m_valueList = parser->sinkFloatingValueList($5); 1547 parser->m_valueList = parser->sinkFloatingValueList($5);
1548 int oldParsedProperties = parser->m_parsedProperties.size(); 1548 int oldParsedProperties = parser->m_parsedProperties.size();
1549 $$ = parser->parseValue(static_cast<CSSPropertyID>($1), $6); 1549 $$ = parser->parseValue(static_cast<CSSPropertyID>($1), $6);
1550 if (!$$) { 1550 if (!$$) {
1551 parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties); 1551 parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
1552 parser->reportError(parser->getSource($4, parser->currentLocatio n()).trimTrailingWhitespace(), CSSParser::InvalidPropertyValueError); 1552 parser->reportError($4, CSSParser::InvalidPropertyValueError);
1553 } else 1553 } else
1554 isPropertyParsed = true; 1554 isPropertyParsed = true;
1555 parser->m_valueList = nullptr; 1555 parser->m_valueList = nullptr;
1556 } 1556 }
1557 parser->endProperty($6, isPropertyParsed); 1557 parser->endProperty($6, isPropertyParsed);
1558 } 1558 }
1559 | 1559 |
1560 property declaration_recovery { 1560 property declaration_recovery {
1561 parser->endProperty(false, false, CSSParser::GeneralError); 1561 parser->endProperty(false, false, CSSParser::GeneralError);
1562 $$ = false; 1562 $$ = false;
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1904 $$ = 0; 1904 $$ = 0;
1905 } 1905 }
1906 ; 1906 ;
1907 1907
1908 at_rule_recovery: 1908 at_rule_recovery:
1909 error ';' 1909 error ';'
1910 | error invalid_block 1910 | error invalid_block
1911 ; 1911 ;
1912 1912
1913 invalid_rule: 1913 invalid_rule:
1914 error rule_error_recovery invalid_block { 1914 error rule_error_recovery at_invalid_rule_header_end invalid_block {
1915 parser->resumeErrorLogging();
1915 $$ = 0; 1916 $$ = 0;
1916 } 1917 }
1917 ; 1918 ;
1918 1919
1920 at_invalid_rule_header_end:
1921 /* empty */ {
1922 parser->endInvalidRuleHeader();
1923 }
1924 ;
1925
1919 invalid_block: 1926 invalid_block:
1920 '{' error_recovery closing_brace { 1927 '{' error_recovery closing_brace {
1921 parser->invalidBlockHit(); 1928 parser->invalidBlockHit();
1922 } 1929 }
1923 ; 1930 ;
1924 1931
1925 invalid_square_brackets_block: 1932 invalid_square_brackets_block:
1926 '[' error_recovery ']' 1933 '[' error_recovery ']'
1927 | '[' error_recovery TOKEN_EOF 1934 | '[' error_recovery TOKEN_EOF
1928 ; 1935 ;
(...skipping 20 matching lines...) Expand all
1949 1956
1950 rule_error_recovery: 1957 rule_error_recovery:
1951 /* empty */ 1958 /* empty */
1952 | rule_error_recovery error 1959 | rule_error_recovery error
1953 | rule_error_recovery invalid_square_brackets_block 1960 | rule_error_recovery invalid_square_brackets_block
1954 | rule_error_recovery invalid_parentheses_block 1961 | rule_error_recovery invalid_parentheses_block
1955 ; 1962 ;
1956 1963
1957 %% 1964 %%
1958 1965
OLDNEW
« no previous file with comments | « LayoutTests/inspector/console/console-css-warnings-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698