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

Merge pull request #29 from blackwhale/no-aa-please 

avoid creating html-entity AA at start-up - 10% speed up(!)
This commit is contained in:
Hackerpilot 2013-02-22 13:22:01 -08:00
parent 119c6b917d e4baf99ca4
commit db3fa83146
3 changed files with 2143 additions and 2140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.d
View File

@ -97,9 +97,9 @@ int main(string[] args)
{ {
string[] importDirs; string[] importDirs;
bool sloc; bool sloc;
/+bool dotComplete;+/ bool dotComplete;
/+bool json;+/ bool json;
/+bool parenComplete;+/ bool parenComplete;
bool highlight; bool highlight;
bool ctags; bool ctags;
bool recursiveCtags; bool recursiveCtags;
@ -110,8 +110,8 @@ int main(string[] args)
try try
{ {
getopt(args, "I", &importDirs,/+ "dotComplete|d", &dotComplete,+/ "sloc|l", &sloc, getopt(args, "I", &importDirs, "dotComplete|d", &dotComplete, "sloc|l", &sloc,
/+"json|j", &json,+/ /+"parenComplete|p", &parenComplete,+/ "highlight", &highlight, "json|j", &json, "parenComplete|p", &parenComplete, "highlight", &highlight,
"ctags|c", &ctags, "recursive|r|R", &recursiveCtags, "help|h", &help, "ctags|c", &ctags, "recursive|r|R", &recursiveCtags, "help|h", &help,
"tokenCount", &tokenCount, "frequencyCount", &frequencyCount); "tokenCount", &tokenCount, "frequencyCount", &frequencyCount);
} }

4262
std/d/entities.d
View File

File diff suppressed because it is too large Load Diff

11
std/d/lexer.d
View File

@ -2010,15 +2010,18 @@ private:
return idx; return idx;
} }
} }
auto chunk = buffer[0..idx]; //TODO: avoid looking up as UTF string, use raw bytes
auto entity = cast(string)chunk in characterEntities; string chunk = cast(string)buffer[0..idx];
if (entity is null) auto names = assumeSorted(map!"a.name"(characterEntities));
auto place = names.lowerBound(chunk).length;
if (place == names.length || names[place] != chunk)
{ {
errorMessage("Invalid character entity \"&%s;\"" errorMessage("Invalid character entity \"&%s;\""
.format(cast(string) chunk)); .format(cast(string) chunk));
return 1; return 1;
} }
dest.put(cast(ubyte[]) (*entity)[0..$]); auto entity = characterEntities[place].value;
dest.put(cast(ubyte[]) entity);
return entity.length; return entity.length;
default: default:
errorMessage("Invalid escape sequence"); errorMessage("Invalid escape sequence");