forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more css lexer hacks. now supports \: for namespace selectors

This commit is contained in:
Adam D. Ruppe 2012-10-19 20:41:44 -04:00
parent 245f487702
commit 0d8478592d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dom.d
View File

@ -4003,6 +4003,7 @@ int intFromHex(string hex) {
sizediff_t tid = -1; sizediff_t tid = -1;
char c = str[position]; char c = str[position];
foreach(a, token; selectorTokens) foreach(a, token; selectorTokens)
if(c == token[0]) { if(c == token[0]) {
if(token.length > 1) { if(token.length > 1) {
if(position + 1 >= str.length || str[position+1] != token[1]) if(position + 1 >= str.length || str[position+1] != token[1])
@ -4038,20 +4039,35 @@ int intFromHex(string hex) {
selector = selector.replace("< ", "<"); selector = selector.replace("< ", "<");
// FIXME: this is ugly ^^^^^. It should just ignore that whitespace somewhere else. // FIXME: this is ugly ^^^^^. It should just ignore that whitespace somewhere else.
// FIXME: another ugly hack. maybe i should just give in and do this the right way......
string fixupEscaping(string input) {
auto lol = input.replace("\\", "\u00ff");
lol = lol.replace("\u00ff\u00ff", "\\");
return lol.replace("\u00ff", "");
}
bool escaping = false;
foreach(i, c; selector) { // kill useless leading/trailing whitespace too foreach(i, c; selector) { // kill useless leading/trailing whitespace too
if(skip) { if(skip) {
skip = false; skip = false;
continue; continue;
} }
auto tid = idToken(selector, i); sizediff_t tid = -1;
if(escaping)
escaping = false;
else if(c == '\\')
escaping = true;
else
tid = idToken(selector, i);
if(tid == -1) { if(tid == -1) {
if(start == -1) if(start == -1)
start = i; start = i;
} else { } else {
if(start != -1) { if(start != -1) {
tokens ~= selector[start..i]; tokens ~= fixupEscaping(selector[start..i]);
start = -1; start = -1;
} }
tokens ~= selectorTokens[tid]; tokens ~= selectorTokens[tid];
@ -4061,7 +4077,7 @@ int intFromHex(string hex) {
skip = true; skip = true;
} }
if(start != -1) if(start != -1)
tokens ~= selector[start..$]; tokens ~= fixupEscaping(selector[start..$]);
return tokens; return tokens;
} }