summaryrefslogtreecommitdiffstats
path: root/src/eval_env.h
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-12-29 21:00:27 (GMT)
committerEvan Martin <martine@danga.com>2011-12-29 21:14:39 (GMT)
commit8a0c96075786c1983bdfa2f37f32b75200ea0334 (patch)
tree95e2b0c24aedcda9ec5ed09329e69fd7a1925212 /src/eval_env.h
parentad7d9f43f1bd8e04321d8fdb07ebf7b96ab525a1 (diff)
downloadNinja-8a0c96075786c1983bdfa2f37f32b75200ea0334.zip
Ninja-8a0c96075786c1983bdfa2f37f32b75200ea0334.tar.gz
Ninja-8a0c96075786c1983bdfa2f37f32b75200ea0334.tar.bz2
switch the core ninja parser to use re2c for the lexer
- Delete the old "Tokenizer" code. - Write separate tests for the lexer distinct from the parser. - Switch the parser to use the new code. - New lexer error output has file:line numbers so e.g. Emacs can jump your editor to the syntax error. - The EvalEnv ($-interpolation) code is now part of the lexer as well.
Diffstat (limited to 'src/eval_env.h')
-rw-r--r--src/eval_env.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/eval_env.h b/src/eval_env.h
index ed7c2f4..8c144f0 100644
--- a/src/eval_env.h
+++ b/src/eval_env.h
@@ -20,6 +20,8 @@
#include <vector>
using namespace std;
+#include "string_piece.h"
+
/// An interface for a scope for variable (e.g. "$foo") lookups.
struct Env {
virtual ~Env() {}
@@ -41,14 +43,18 @@ struct BindingEnv : public Env {
/// A tokenized string that contains variable references.
/// Can be evaluated relative to an Env.
struct EvalString {
- bool Parse(const string& input, string* err, size_t* err_index=NULL);
string Evaluate(Env* env) const;
- const string& unparsed() const { return unparsed_; }
- bool empty() const { return unparsed_.empty(); }
+ void Clear() { parsed_.clear(); }
+ bool empty() const { return parsed_.empty(); }
- string unparsed_;
enum TokenType { RAW, SPECIAL };
+ void Add(TokenType type, StringPiece text);
+
+ /// Construct a human-readable representation of the parsed state,
+ /// for use in tests.
+ string Serialize() const;
+
typedef vector<pair<string, TokenType> > TokenList;
TokenList parsed_;
};