diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 08:17:01 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 08:29:22 +0200 |
| commit | 7efdbab3cd38b7e1693f0a4a85a9933adb50fb9d (patch) | |
| tree | 85cc082c989123ad173a673a0b499e8904018bf6 /build2/parser.cxx | |
| parent | ae579402c8c64ea8ceea2e9fcee5097b3c53e353 (diff) | |
Handle printing of extended tokens
Diffstat (limited to 'build2/parser.cxx')
| -rw-r--r-- | build2/parser.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 0853c04..c7ede35 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -178,7 +178,7 @@ namespace build2 enter_buildfile (p); // Needs scope_. - token t (type::eos, false, 0, 0); + token t; type tt; next (t, tt); @@ -198,8 +198,8 @@ namespace build2 target_ = nullptr; scope_ = &s; + token t; type tt; - token t (type::eos, false, 0, 0); variable (t, tt, var, kind); return t; } @@ -212,8 +212,8 @@ namespace build2 target_ = nullptr; scope_ = &s; + token t; type tt; - token t (type::eos, false, 0, 0); value rhs (variable_value (t, tt)); value lhs; @@ -805,7 +805,7 @@ namespace build2 lexer* ol (lexer_); lexer_ = &l; - token t (type::eos, false, 0, 0); + token t; type tt; next (t, tt); clause (t, tt); @@ -938,7 +938,7 @@ namespace build2 target* odt (default_target_); default_target_ = nullptr; - token t (type::eos, false, 0, 0); + token t; type tt; next (t, tt); clause (t, tt); @@ -2040,7 +2040,8 @@ namespace build2 tt != type::lparen) || peeked ().separated)) { tt = type::name; - t = token (move (concat), true, false, t.line, t.column); + t = token ( + move (concat), true, false, t.line, t.column, token_printer); concat.clear (); } else if (!first) @@ -2744,7 +2745,7 @@ namespace build2 // mode (lexer_mode::value); - token t (type::eos, false, 0, 0); + token t; type tt; next (t, tt); |