diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-05 15:16:49 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-05 15:16:49 +0200 |
| commit | b7f1f4f6c23c45745c37e65c7d8bd088e0e1ae95 (patch) | |
| tree | ff85c47162c263f11c5fe470dd35a90a6d767ddd /build2/lexer.cxx | |
| parent | 073838d6f0d7846dc537bf1d0308392a79320f06 (diff) | |
Merge 'value' and 'pairs' lexer_mode, call it 'value'
We only really used pairs.
Diffstat (limited to 'build2/lexer.cxx')
| -rw-r--r-- | build2/lexer.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build2/lexer.cxx b/build2/lexer.cxx index 84e972e..6b599fd 100644 --- a/build2/lexer.cxx +++ b/build2/lexer.cxx @@ -61,9 +61,9 @@ namespace build2 // case '\n': { - // Expire value/pairs mode at the end of the line. + // Expire value mode at the end of the line. // - if (m == lexer_mode::value || m == lexer_mode::pairs) + if (m == lexer_mode::value) state_.pop (); return token (type::newline, sep, ln, cn); @@ -79,13 +79,12 @@ namespace build2 // Handle pair separator. // - if (m == lexer_mode::pairs && c == ps) + if (m == lexer_mode::value && c == ps) return token (type::pair_separator, sep, ln, cn); - // The following characters are not treated as special in the - // value or pairs mode. + // The following characters are not treated as special in the value mode. // - if (m != lexer_mode::value && m != lexer_mode::pairs) + if (m != lexer_mode::value) { switch (c) { @@ -223,9 +222,9 @@ namespace build2 { bool done (false); - // Handle pair separator. + // Handle the pair separator. // - if (m == lexer_mode::pairs && c == ps) + if (m == lexer_mode::value && c == ps) break; // The following characters are only special in the normal and |