shadowfacts
/
tree-sitter-html
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use explicit types instead of auto

This commit is contained in:
Max Brunsfeld 2018-06-15 15:32:21 -07:00
parent 6923b13394
commit 8afd99e35e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scanner.cc
View File

@ -74,9 +74,8 @@ struct Scanner {
lexer->advance(lexer, false); lexer->advance(lexer, false);
unsigned dashes = 0; unsigned dashes = 0;
auto c = lexer->lookahead; while (lexer->lookahead) {
while (c) { switch (lexer->lookahead) {
switch (c) {
case '-': case '-':
++dashes; ++dashes;
break; break;
@ -92,7 +91,6 @@ struct Scanner {
dashes = 0; dashes = 0;
} }
lexer->advance(lexer, false); lexer->advance(lexer, false);
c = lexer->lookahead;
} }
return false; return false;
} }
@ -137,7 +135,7 @@ struct Scanner {
} }
} }
auto tag_name = scan_tag_name(lexer); string tag_name = scan_tag_name(lexer);
if (tag_name.empty()) return false; if (tag_name.empty()) return false;
Tag next_tag = Tag::for_name(tag_name); Tag next_tag = Tag::for_name(tag_name);
@ -163,7 +161,7 @@ struct Scanner {
} }
bool scan_start_tag_name(TSLexer *lexer) { bool scan_start_tag_name(TSLexer *lexer) {
auto tag_name = scan_tag_name(lexer); string tag_name = scan_tag_name(lexer);
if (tag_name.empty()) return false; if (tag_name.empty()) return false;
Tag tag = Tag::for_name(tag_name); Tag tag = Tag::for_name(tag_name);
tags.push_back(tag); tags.push_back(tag);
@ -176,7 +174,7 @@ struct Scanner {
} }
bool scan_end_tag_name(TSLexer *lexer) { bool scan_end_tag_name(TSLexer *lexer) {
auto tag_name = scan_tag_name(lexer); string tag_name = scan_tag_name(lexer);
if (tag_name.empty()) return false; if (tag_name.empty()) return false;
Tag tag = Tag::for_name(tag_name); Tag tag = Tag::for_name(tag_name);
if (!tags.empty() && tags.back() == tag) { if (!tags.empty() && tags.back() == tag) {

2
src/tag.h
View File

@ -358,7 +358,7 @@ struct Tag {
} }
static inline Tag for_name(const string &name) { static inline Tag for_name(const string &name) {
auto type = TAG_TYPES_BY_TAG_NAME.find(name); unordered_map<string, TagType>::const_iterator type = TAG_TYPES_BY_TAG_NAME.find(name);
if (type != TAG_TYPES_BY_TAG_NAME.end()) { if (type != TAG_TYPES_BY_TAG_NAME.end()) {
return Tag { type->second, "" }; return Tag { type->second, "" };
} }