forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few infinite loop bugs

This commit is contained in:
Hackerpilot 2013-01-20 03:51:52 +00:00
parent 36ff7d043c
commit fb66baa36a
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
highlighter.d
View File

@ -24,12 +24,11 @@ void highlight(R)(R tokens)
<body> <body>
<style type="text/css"> <style type="text/css">
html { background-color: #111; color: #ccc; } html { background-color: #111; color: #ccc; }
.keyword { font-weight: bold; color: DeepSkyBlue; } .kwrd { font-weight: bold; color: DeepSkyBlue; }
.comment { color: lightgreen; font-style: italic;} .com { color: lightgreen; font-style: italic;}
.number { color: red; font-weigth: bold; } .num { color: red; font-weigth: bold; }
.string { color: Tomato; font-style: italic; } .str { color: Tomato; font-style: italic; }
.property { color: HotPink; font-weight: bold;} .op { color: tan; font-weight: bold; }
.operator { color: tan; font-weight: bold; }
.type { color: cyan; font-weight: bold; } .type { color: cyan; font-weight: bold; }
</style> </style>
<pre>]"); <pre>]");
@ -39,22 +38,22 @@ html { background-color: #111; color: #ccc; }
switch (t.type) switch (t.type)
{ {
case TokenType.KEYWORDS_BEGIN: .. case TokenType.KEYWORDS_END: case TokenType.KEYWORDS_BEGIN: .. case TokenType.KEYWORDS_END:
writeSpan("keyword", t.value); writeSpan("kwrd", t.value);
break; break;
case TokenType.TYPES_BEGIN: .. case TokenType.TYPES_END: case TokenType.TYPES_BEGIN: .. case TokenType.TYPES_END:
writeSpan("type", t.value); writeSpan("type", t.value);
break; break;
case TokenType.Comment: case TokenType.Comment:
writeSpan("comment", t.value); writeSpan("com", t.value);
break; break;
case TokenType.STRINGS_BEGIN: .. case TokenType.STRINGS_END: case TokenType.STRINGS_BEGIN: .. case TokenType.STRINGS_END:
writeSpan("string", t.value); writeSpan("str", t.value);
break; break;
case TokenType.NUMBERS_BEGIN: .. case TokenType.NUMBERS_END: case TokenType.NUMBERS_BEGIN: .. case TokenType.NUMBERS_END:
writeSpan("number", t.value); writeSpan("num", t.value);
break; break;
case TokenType.OPERATORS_BEGIN: .. case TokenType.OPERATORS_END: case TokenType.OPERATORS_BEGIN: .. case TokenType.OPERATORS_END:
writeSpan("operator", t.value); writeSpan("op", t.value);
break; break;
default: default:
stdout.write(t.value.replace("<", "&lt;")); stdout.write(t.value.replace("<", "&lt;"));

28
tokenizer.d
View File

@ -517,6 +517,7 @@ body
t.startIndex = index; t.startIndex = index;
t.type = TokenType.StringLiteral; t.type = TokenType.StringLiteral;
auto app = appender!(char[])(); auto app = appender!(char[])();
bool isWysiwyg = input.front == 'r' || input.front == '`';
if (input.front == 'r') if (input.front == 'r')
{ {
if (style & StringStyle.IncludeQuotes) if (style & StringStyle.IncludeQuotes)
@ -542,7 +543,7 @@ body
{ {
auto r = input.save(); auto r = input.save();
r.popFront(); r.popFront();
if (r.front == quote) if (r.front == quote && !isWysiwyg)
{ {
app.put('\\'); app.put('\\');
app.put(quote); app.put(quote);
@ -550,7 +551,7 @@ body
input.popFront(); input.popFront();
index += 2; index += 2;
} }
else if (r.front == '\\') else if (r.front == '\\' && !isWysiwyg)
{ {
app.put('\\'); app.put('\\');
app.put('\\'); app.put('\\');
@ -1394,14 +1395,14 @@ struct TokenRange(R) if (isForwardRange!(R) && isSomeChar!(ElementType!(R)))
current = lexString(range, index, lineNumber, stringStyle); current = lexString(range, index, lineNumber, stringStyle);
break; break;
case 'q': case 'q':
auto r = range.save; /+auto r = range.save;
r.popFront(); r.popFront();
if (!r.isEoF() && r.front == '{') if (!r.isEoF() && r.front == '{')
{ {
writeln("ParseTokenString"); writeln("ParseTokenString");
break; break;
} }
else else+/
goto default; goto default;
case '/': case '/':
auto r = range.save(); auto r = range.save();
@ -1410,6 +1411,8 @@ struct TokenRange(R) if (isForwardRange!(R) && isSomeChar!(ElementType!(R)))
{ {
current.type = TokenType.Div; current.type = TokenType.Div;
current.value = "/"; current.value = "/";
range.popFront();
++index;
break; break;
} }
switch (r.front) switch (r.front)
@ -1422,19 +1425,23 @@ struct TokenRange(R) if (isForwardRange!(R) && isSomeChar!(ElementType!(R)))
case '=': case '=':
current.type = TokenType.DivEquals; current.type = TokenType.DivEquals;
current.value = "/="; current.value = "/=";
range.popFront();
range.popFront();
index += 2;
break outer; break outer;
default: default:
current.type = TokenType.Div; current.type = TokenType.Div;
current.value = "/"; current.value = "/";
break; ++index;
range.popFront();
break outer;
} }
break;
case 'r': case 'r':
auto r = range.save(); auto r = range.save();
r.popFront(); r.popFront();
if (!r.isEoF() && r.front == '"') if (!r.isEoF() && r.front == '"')
{ {
current = lexString(range, index, lineNumber, StringStyle.NotEscaped); current = lexString(range, index, lineNumber, stringStyle);
break; break;
} }
else else
@ -1455,6 +1462,7 @@ struct TokenRange(R) if (isForwardRange!(R) && isSomeChar!(ElementType!(R)))
{ {
app.put(range.front); app.put(range.front);
range.popFront(); range.popFront();
++index;
} }
current.value = to!string(app.data); current.value = to!string(app.data);
current.type = lookupTokenTypeOptimized(current.value); current.type = lookupTokenTypeOptimized(current.value);
@ -1475,7 +1483,7 @@ private:
unittest unittest
{ {
auto c = "rust r\"\\ntest\" r`eh?`"; auto c = `r"d:\path\foo.bat"`;
foreach (t; byToken(c)) foreach (t; byToken(c, IterationStyle.CodeOnly, StringStyle.Source))
writeln(t); writeln(t.type, ": {", t.value, "}");
} }