DanilaFe/bloglang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Touch up source index code.

Browse Source
This commit is contained in:
Danila Fedorin 2020-09-09 14:20:10 -07:00
parent c648e20a02
commit 2752703038
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
13/parse_driver.hpp
View File

@ -29,6 +29,7 @@ struct parse_driver {
void run_parse() { void run_parse() {
file_stream.open(file_name); file_stream.open(file_name);
if(!file_stream.good()) throw 0; if(!file_stream.good()) throw 0;
line_offsets.push_back(0);
yyscan_t scanner; yyscan_t scanner;
scanner_init(this, &scanner); scanner_init(this, &scanner);
yy::parser parser(scanner, *this); yy::parser parser(scanner, *this);
@ -47,15 +48,16 @@ struct parse_driver {
} }
size_t get_index(int line, int column) { size_t get_index(int line, int column) {
assert(line-1 < line_offsets.size()); assert(line > 0);
size_t file_offset = line ? 0 : line_offsets[line-1]; assert(line <= line_offsets.size());
size_t file_offset = line_offsets[line-1];
file_offset += column - 1; file_offset += column - 1;
return file_offset; return file_offset;
} }
size_t get_line_end(int line) { size_t get_line_end(int line) {
assert(line < line_offsets.size()); if(line > line_offsets.size()) return read_file.size();
return line_offsets[line] - 1; return get_index(line+1, 1);
} }
}; };