8055 2006-03-29 08:27:32 -0800 Fix most CSS grammar conflicts 2006-03-29 09:35:22 -0800 1 1 1 Unclassified WebKit CSS 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 6380 1 ap ap oldest_to_newest 37856 0 ap 2006-03-29 08:27:32 -0800 Bison currently reports 37+4 shift/reduce and reduce/reduce conflicts, this patch gets the number down to 7+0. I have fixed the reduce/reduce conflicts, then noticed that two of the fixes were already made in KDE tree (the other two are different because declaration blocks are described in quite different ways). Shift/reduce fixes are just merged from KDE, r332845 by Michael Matz. 37857 1 7373 ap 2006-03-29 08:29:10 -0800 Created attachment 7373 proposed patch 37860 2 7373 darin 2006-03-29 08:39:45 -0800 Comment on attachment 7373 proposed patch It's a little strange to give a space and a selector the same precedence as the "unimportant" token. I see that it might work, but it seems a bit obscure or subtle. But that's a nitpick. This change looks great! r=me 37863 3 ap 2006-03-29 09:35:22 -0800 (In reply to comment #2) The precedence changes are only needed for shift/reduce fixes, taken from KDE. I cannot say that I understood them particularly well. Landed, r13560. 7373 2006-03-29 08:29:10 -0800 2006-03-29 08:39:45 -0800 proposed patch 8055r1_patch.txt text/plain 6316 ap SW5kZXg6IFdlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nz cy9DU1NHcmFtbWFyLnkJKHJldmlzaW9uIDEzNTU5KQorKysgV2ViQ29yZS9jc3MvQ1NTR3JhbW1h ci55CSh3b3JraW5nIGNvcHkpCkBAIC0xNDQsNiArMTQ0LDggQEAgc3RhdGljIGludCBjc3N5eWxl eChZWVNUWVBFICp5eWx2YWwpIHsgcgogCiAvLyVleHBlY3QgMzcKIAorJWxlZnQgVU5JTVBPUlRB TlRfVE9LCisKICV0b2tlbiBXSElURVNQQUNFIFNHTUxfQ0QKIAogJXRva2VuIElOQ0xVREVTCkBA IC0xNTQsMTQgKzE1NiwxNSBAQCBzdGF0aWMgaW50IGNzc3l5bGV4KFlZU1RZUEUgKnl5bHZhbCkg eyByCiAKICV0b2tlbiA8c3RyaW5nPiBTVFJJTkcKIAotJXRva2VuIDxzdHJpbmc+IElERU5UCi0K LSV0b2tlbiA8c3RyaW5nPiBIQVNICi0ldG9rZW4gJzonCi0ldG9rZW4gJy4nCi0ldG9rZW4gJ1sn CislcmlnaHQgPHN0cmluZz4gSURFTlQKIAotJXRva2VuIDxzdHJpbmc+ICcqJworJW5vbmFzc29j IDxzdHJpbmc+IEhBU0gKKyVub25hc3NvYyAnOicKKyVub25hc3NvYyAnLicKKyVub25hc3NvYyAn WycKKyVub25hc3NvYyA8c3RyaW5nPiAnKicKKyVub25hc3NvYyBlcnJvcgorJWxlZnQgJ3wnCiAK ICV0b2tlbiBJTVBPUlRfU1lNCiAldG9rZW4gUEFHRV9TWU0KQEAgLTI4OSw3ICsyOTIsNyBAQCBr aHRtbF92YWx1ZToKIDsKIAogbWF5YmVfc3BhY2U6Ci0gICAgLyogZW1wdHkgKi8KKyAgICAvKiBl bXB0eSAqLyAlcHJlYyBVTklNUE9SVEFOVF9UT0sKICAgfCBtYXliZV9zcGFjZSBXSElURVNQQUNF CiAgIDsKIApAQCAtMzgwLDEwICszODMsNyBAQCBtYXliZV9tZWRpYV9saXN0OgogCiAKIG1lZGlh X2xpc3Q6Ci0gICAgLyogZW1wdHkgKi8gewotICAgICAgICAkJCA9IDA7Ci0gICAgfQotICAgIHwg bWVkaXVtIHsKKyAgICBtZWRpdW0gewogICAgICAgICAkJCA9IHN0YXRpY19jYXN0PENTU1BhcnNl cio+KHBhcnNlciktPmNyZWF0ZU1lZGlhTGlzdCgpOwogICAgICAgICAkJC0+YXBwZW5kTWVkaXVt KCBkb21TdHJpbmcoJDEpLmxvd2VyKCkgKTsKICAgICB9CkBAIC00MDEsNiArNDAxLDkgQEAgbWVk aWE6CiAgICAgTUVESUFfU1lNIG1heWJlX3NwYWNlIG1lZGlhX2xpc3QgJ3snIG1heWJlX3NwYWNl IHJ1bGVzZXRfbGlzdCAnfScgewogICAgICAgICAkJCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+ KHBhcnNlciktPmNyZWF0ZU1lZGlhUnVsZSgkMywgJDYpOwogICAgIH0KKyAgICB8IE1FRElBX1NZ TSBtYXliZV9zcGFjZSAneycgbWF5YmVfc3BhY2UgcnVsZXNldF9saXN0ICd9JyB7CisgICAgICAg ICQkID0gc3RhdGljX2Nhc3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKS0+Y3JlYXRlTWVkaWFSdWxlKDAs ICQ1KTsKKyAgICB9CiAgICAgOwogCiBydWxlc2V0X2xpc3Q6CkBAIC00NzQsMTAgKzQ3NywxMCBA QCBydWxlc2V0OgogICA7CiAKIHNlbGVjdG9yX2xpc3Q6Ci0gICAgc2VsZWN0b3IgeworICAgIHNl bGVjdG9yICVwcmVjIFVOSU1QT1JUQU5UX1RPSyB7CiAgICAgICAgICQkID0gJDE7CiAgICAgfQot ICAgIHwgc2VsZWN0b3JfbGlzdCAnLCcgbWF5YmVfc3BhY2Ugc2VsZWN0b3IgeworICAgIHwgc2Vs ZWN0b3JfbGlzdCAnLCcgbWF5YmVfc3BhY2Ugc2VsZWN0b3IgJXByZWMgVU5JTVBPUlRBTlRfVE9L IHsKICAgICAgICAgaWYgKCQxICYmICQ0KSB7CiAgICAgICAgICAgICBDU1NQYXJzZXIqIHAgPSBz dGF0aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJzZXIpOwogICAgICAgICAgICAgJCQgPSAkMTsKQEAg LTUyMiw5ICs1MjUsOSBAQCBzZWxlY3RvcjoKICAgICA7CiAKIG5hbWVzcGFjZV9zZWxlY3RvcjoK LSAgICAvKiBlbXB0eSAqLyB7ICQkLnN0cmluZyA9IDA7ICQkLmxlbmd0aCA9IDA7IH0KLSAgICB8 ICcqJyB7IHN0YXRpYyB1bnNpZ25lZCBzaG9ydCBzdGFyID0gJyonOyAkJC5zdHJpbmcgPSAmc3Rh cjsgJCQubGVuZ3RoID0gMTsgfQotICAgIHwgSURFTlQgeyAkJCA9ICQxOyB9CisgICAgLyogZW1w dHkgKi8gJ3wnIHsgJCQuc3RyaW5nID0gMDsgJCQubGVuZ3RoID0gMDsgfQorICAgIHwgJyonICd8 JyB7IHN0YXRpYyB1bnNpZ25lZCBzaG9ydCBzdGFyID0gJyonOyAkJC5zdHJpbmcgPSAmc3Rhcjsg JCQubGVuZ3RoID0gMTsgfQorICAgIHwgSURFTlQgJ3wnIHsgJCQgPSAkMTsgfQogOwogCiBzaW1w bGVfc2VsZWN0b3I6CkBAIC01NDYsMzIgKzU0OSwzMiBAQCBzaW1wbGVfc2VsZWN0b3I6CiAgICAg ICAgIGlmICgkJCAmJiBwLT5kZWZhdWx0TmFtZXNwYWNlICE9IHN0YXJBdG9tKQogICAgICAgICAg ICAgJCQtPnRhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0b20sIHN0YXJBdG9tLCBwLT5kZWZhdWx0 TmFtZXNwYWNlKTsKICAgICB9Ci0gICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3IgJ3wnIGVsZW1lbnRf bmFtZSBtYXliZV9zcGFjZSB7CisgICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3IgZWxlbWVudF9uYW1l IG1heWJlX3NwYWNlIHsKICAgICAgICAgQXRvbWljU3RyaW5nIG5hbWVzcGFjZVByZWZpeCA9IGF0 b21pY1N0cmluZygkMSk7CiAgICAgICAgIENTU1BhcnNlciAqcCA9IHN0YXRpY19jYXN0PENTU1Bh cnNlciAqPihwYXJzZXIpOwogICAgICAgICAkJCA9IHAtPmNyZWF0ZUZsb2F0aW5nU2VsZWN0b3Io KTsKICAgICAgICAgaWYgKHAtPnN0eWxlRWxlbWVudCAmJiBwLT5zdHlsZUVsZW1lbnQtPmlzQ1NT U3R5bGVTaGVldCgpKQogICAgICAgICAgICAgJCQtPnRhZyA9IFF1YWxpZmllZE5hbWUobmFtZXNw YWNlUHJlZml4LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXRvbWljU3Ry aW5nKCQzKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0b21pY1N0cmlu ZygkMiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxD U1NTdHlsZVNoZWV0Kj4ocC0+c3R5bGVFbGVtZW50KS0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5hbWVz cGFjZVByZWZpeCkpOwogICAgICAgICBlbHNlIC8vIEZJWE1FOiBTaG91bGRuJ3QgdGhpcyBjYXNl IGJlIGFuIGVycm9yPwotICAgICAgICAgICAgJCQtPnRhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0 b20sIGF0b21pY1N0cmluZygkMyksIHAtPmRlZmF1bHROYW1lc3BhY2UpOworICAgICAgICAgICAg JCQtPnRhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0b20sIGF0b21pY1N0cmluZygkMiksIHAtPmRl ZmF1bHROYW1lc3BhY2UpOwogICAgIH0KLSAgICB8IG5hbWVzcGFjZV9zZWxlY3RvciAnfCcgZWxl bWVudF9uYW1lIHNwZWNpZmllcl9saXN0IG1heWJlX3NwYWNlIHsKLSAgICAgICAgJCQgPSAkNDsK KyAgICB8IG5hbWVzcGFjZV9zZWxlY3RvciBlbGVtZW50X25hbWUgc3BlY2lmaWVyX2xpc3QgbWF5 YmVfc3BhY2UgeworICAgICAgICAkJCA9ICQzOwogICAgICAgICBpZiAoJCQpIHsKICAgICAgICAg ICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQcmVmaXggPSBhdG9taWNTdHJpbmcoJDEpOwogICAg ICAgICAgICAgQ1NTUGFyc2VyICpwID0gc3RhdGljX2Nhc3Q8Q1NTUGFyc2VyICo+KHBhcnNlcik7 CiAgICAgICAgICAgICBpZiAocC0+c3R5bGVFbGVtZW50ICYmIHAtPnN0eWxlRWxlbWVudC0+aXND U1NTdHlsZVNoZWV0KCkpCiAgICAgICAgICAgICAgICAgJCQtPnRhZyA9IFF1YWxpZmllZE5hbWUo bmFtZXNwYWNlUHJlZml4LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGF0b21pY1N0cmluZygkMyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXRvbWljU3RyaW5nKCQyKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdGF0aWNfY2FzdDxDU1NTdHlsZVNoZWV0Kj4ocC0+c3R5bGVFbGVtZW50KS0+ZGV0ZXJt aW5lTmFtZXNwYWNlKG5hbWVzcGFjZVByZWZpeCkpOwogICAgICAgICAgICAgZWxzZSAvLyBGSVhN RTogU2hvdWxkbid0IHRoaXMgY2FzZSBiZSBhbiBlcnJvcj8KLSAgICAgICAgICAgICAgICAkJC0+ dGFnID0gUXVhbGlmaWVkTmFtZShudWxsQXRvbSwgYXRvbWljU3RyaW5nKCQzKSwgcC0+ZGVmYXVs dE5hbWVzcGFjZSk7CisgICAgICAgICAgICAgICAgJCQtPnRhZyA9IFF1YWxpZmllZE5hbWUobnVs bEF0b20sIGF0b21pY1N0cmluZygkMiksIHAtPmRlZmF1bHROYW1lc3BhY2UpOwogICAgICAgICB9 CiAgICAgfQotICAgIHwgbmFtZXNwYWNlX3NlbGVjdG9yICd8JyBzcGVjaWZpZXJfbGlzdCBtYXli ZV9zcGFjZSB7Ci0gICAgICAgICQkID0gJDM7CisgICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3Igc3Bl Y2lmaWVyX2xpc3QgbWF5YmVfc3BhY2UgeworICAgICAgICAkJCA9ICQyOwogICAgICAgICBpZiAo JCQpIHsKICAgICAgICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQcmVmaXggPSBhdG9taWNT dHJpbmcoJDEpOwogICAgICAgICAgICAgQ1NTUGFyc2VyICpwID0gc3RhdGljX2Nhc3Q8Q1NTUGFy c2VyICo+KHBhcnNlcik7CkBAIC02NjksMjQgKzY3MiwyNCBAQCBhdHRyaWI6CiAgICAgICAgICQk LT5tYXRjaCA9IChDU1NTZWxlY3Rvcjo6TWF0Y2gpJDQ7CiAgICAgICAgICQkLT52YWx1ZSA9IGF0 b21pY1N0cmluZygkNik7CiAgICAgfQotICAgIHwgJ1snIG1heWJlX3NwYWNlIG5hbWVzcGFjZV9z ZWxlY3RvciAnfCcgYXR0cl9uYW1lICddJyB7CisgICAgfCAnWycgbWF5YmVfc3BhY2UgbmFtZXNw YWNlX3NlbGVjdG9yIGF0dHJfbmFtZSAnXScgewogICAgICAgICBBdG9taWNTdHJpbmcgbmFtZXNw YWNlUHJlZml4ID0gYXRvbWljU3RyaW5nKCQzKTsKICAgICAgICAgQ1NTUGFyc2VyICpwID0gc3Rh dGljX2Nhc3Q8Q1NTUGFyc2VyICo+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxv YXRpbmdTZWxlY3RvcigpOwogICAgICAgICAkJC0+YXR0ciA9IFF1YWxpZmllZE5hbWUobmFtZXNw YWNlUHJlZml4LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXRvbWljU3RyaW5n KCQ1KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0b21pY1N0cmluZygkNCks CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxDU1NTdHlsZVNo ZWV0Kj4ocC0+c3R5bGVFbGVtZW50KS0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5hbWVzcGFjZVByZWZp eCkpOwogICAgICAgICAkJC0+bWF0Y2ggPSBDU1NTZWxlY3Rvcjo6U2V0OwogICAgIH0KLSAgICB8 ICdbJyBtYXliZV9zcGFjZSBuYW1lc3BhY2Vfc2VsZWN0b3IgJ3wnIGF0dHJfbmFtZSBtYXRjaCBt YXliZV9zcGFjZSBpZGVudF9vcl9zdHJpbmcgbWF5YmVfc3BhY2UgJ10nIHsKKyAgICB8ICdbJyBt YXliZV9zcGFjZSBuYW1lc3BhY2Vfc2VsZWN0b3IgYXR0cl9uYW1lIG1hdGNoIG1heWJlX3NwYWNl IGlkZW50X29yX3N0cmluZyBtYXliZV9zcGFjZSAnXScgewogICAgICAgICBBdG9taWNTdHJpbmcg bmFtZXNwYWNlUHJlZml4ID0gYXRvbWljU3RyaW5nKCQzKTsKICAgICAgICAgQ1NTUGFyc2VyICpw ID0gc3RhdGljX2Nhc3Q8Q1NTUGFyc2VyICo+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3Jl YXRlRmxvYXRpbmdTZWxlY3RvcigpOwogICAgICAgICAkJC0+YXR0ciA9IFF1YWxpZmllZE5hbWUo bmFtZXNwYWNlUHJlZml4LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXRvbWlj U3RyaW5nKCQ1KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF0b21pY1N0cmlu ZygkNCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxDU1NT dHlsZVNoZWV0Kj4ocC0+c3R5bGVFbGVtZW50KS0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5hbWVzcGFj ZVByZWZpeCkpOwotICAgICAgICAkJC0+bWF0Y2ggPSAoQ1NTU2VsZWN0b3I6Ok1hdGNoKSQ2Owot ICAgICAgICAkJC0+dmFsdWUgPSBhdG9taWNTdHJpbmcoJDgpOworICAgICAgICAkJC0+bWF0Y2gg PSAoQ1NTU2VsZWN0b3I6Ok1hdGNoKSQ1OworICAgICAgICAkJC0+dmFsdWUgPSBhdG9taWNTdHJp bmcoJDcpOwogICAgIH0KICAgOwogCkBAIC04MTgsNyArODIxLDcgQEAgZGVjbGFyYXRpb246CiAg ICAgICAgICQkID0gZmFsc2U7CiAgICAgfQogICAgIHwKLSAgICBwcmlvIHsKKyAgICBJTVBPUlRB TlRfU1lNIG1heWJlX3NwYWNlIHsKICAgICAgICAgLyogSGFuZGxlIHRoaXMgY2FzZTogZGl2IHsg dGV4dC1hbGlnbjogY2VudGVyOyAhaW1wb3J0YW50IH0gSnVzdCByZWR1Y2UgYXdheSB0aGUgc3Ry YXkgIWltcG9ydGFudC4gKi8KICAgICAgICAgJCQgPSBmYWxzZTsKICAgICB9Cg==