Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

isolate Location specifics to private class variables to enforce correct line number ordering

Browse source
This commit is contained in:
Vern Paxson 2025-07-03 16:41:14 -07:00 • committed by Arne Welzel
parent eb6b4a0c46
commit 5c63133226
30 changed files with 172 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/Obj.h
View file

@ -3,6 +3,7 @@
#pragma once
#include <climits>
#include <string>
namespace zeek {
@ -13,7 +14,9 @@ namespace detail {
class Location final {
public:
constexpr Location(const char* fname, int line_f, int line_l, int col_f, int col_l) noexcept
: filename(fname), first_line(line_f), last_line(line_l), first_column(col_f), last_column(col_l) {}
: filename(fname), first_column(col_f), last_column(col_l) {
SetLines(line_f, line_l);
}
Location() = default;
@ -22,9 +25,42 @@ public:
bool operator==(const Location& l) const;
bool operator!=(const Location& l) const { return ! (*this == l); }
const char* FileName() const { return filename; }
int FirstLine() const { return first_line; }
int LastLine() const { return last_line; }
// Columns are actually not currently maintained.
auto FirstColumn() const { return first_column; }
auto LastColumn() const { return last_column; }
void SetFile(const char* fname) { filename = fname; }
void SetLine(int line) { SetLines(line, line); }
constexpr void SetLines(int first, int last) {
if ( first > last ) {
// We don't use std::swap() here because it's not
// constexpr-enabled on older versions of C++.
auto tmp = first;
first = last;
last = tmp;
}
first_line = first;
last_line = last;
}
void SetFirstLine(int line) { SetLines(line, last_line); }
void SetLastLine(int line) { SetLines(first_line, line); }
void IncrementLine(int incr = 1) {
first_line += incr;
last_line += incr;
}
void SetFirstColumn(int col) { first_column = col; }
void SetLastColumn(int col) { last_column = col; }
private:
const char* filename = nullptr;
int first_line = 0, last_line = 0;
int first_column = 0, last_column = 0;
int first_column = 0, last_column = 0; // not currently maintained
};
#define YYLTYPE zeek::detail::yyltype
@ -73,7 +109,7 @@ public:
// of 0, which should only happen if it's been assigned
// to no_location (or hasn't been initialized at all).
location = nullptr;
if ( detail::start_location.first_line != 0 )
if ( detail::start_location.FirstLine() != 0 )
SetLocationInfo(&detail::start_location, &detail::end_location);
}