Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: tools/gn/location.h

Issue 23532076: GN: Add logging for the location of an invocation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iadd .cc file Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/input_file_manager.cc ('k') | tools/gn/location.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/location.h
diff --git a/tools/gn/location.h b/tools/gn/location.h
index 20551256e141e723bcd2b345de5f20aa34af8667..aad3960deb002e9d425d11948c2fdb3c7c15a66d 100644
--- a/tools/gn/location.h
+++ b/tools/gn/location.h
@@ -5,42 +5,28 @@
#ifndef TOOLS_GN_LOCATION_H_
#define TOOLS_GN_LOCATION_H_
-#include <algorithm>
-
-#include "base/logging.h"
+#include <string>
class InputFile;
// Represents a place in a source file. Used for error reporting.
class Location {
public:
- Location()
- : file_(NULL),
- line_number_(-1),
- char_offset_(-1) {
- }
- Location(const InputFile* file, int line_number, int char_offset)
- : file_(file),
- line_number_(line_number),
- char_offset_(char_offset) {
- }
+ Location();
+ Location(const InputFile* file, int line_number, int char_offset);
const InputFile* file() const { return file_; }
int line_number() const { return line_number_; }
int char_offset() const { return char_offset_; }
- bool operator==(const Location& other) const {
- return other.file_ == file_ &&
- other.line_number_ == line_number_ &&
- other.char_offset_ == char_offset_;
- }
+ bool operator==(const Location& other) const;
+ bool operator!=(const Location& other) const;
+ bool operator<(const Location& other) const;
- bool operator<(const Location& other) const {
- DCHECK(file_ == other.file_);
- if (line_number_ != other.line_number_)
- return line_number_ < other.line_number_;
- return char_offset_ < other.char_offset_;
- }
+ // Returns a string with the file, line, and (optionally) the character
+ // offset for this location. If this location is null, returns an empty
+ // string.
+ std::string Describe(bool include_char_offset) const;
private:
const InputFile* file_; // Null when unset.
@@ -52,22 +38,13 @@ class Location {
// The end is exclusive i.e. [begin, end)
class LocationRange {
public:
- LocationRange() {}
- LocationRange(const Location& begin, const Location& end)
- : begin_(begin),
- end_(end) {
- DCHECK(begin_.file() == end_.file());
- }
+ LocationRange();
+ LocationRange(const Location& begin, const Location& end);
const Location& begin() const { return begin_; }
const Location& end() const { return end_; }
- LocationRange Union(const LocationRange& other) const {
- DCHECK(begin_.file() == other.begin_.file());
- return LocationRange(
- begin_ < other.begin_ ? begin_ : other.begin_,
- end_ < other.end_ ? other.end_ : end_);
- }
+ LocationRange Union(const LocationRange& other) const;
private:
Location begin_;
« no previous file with comments | « tools/gn/input_file_manager.cc ('k') | tools/gn/location.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698