diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2014-11-04 13:40:35 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2014-11-04 13:40:35 +0000 |
| commit | f5be7c7ba5211361b1b15b1ce3cd6d7293fb6cd7 (patch) | |
| tree | 7c3b51e4a9e32246cffd8d5bec4244381c8d6768 /src/command_manager.cc | |
| parent | 60c1bb1315296fb2068f00390fc10f02efdcba59 (diff) | |
minor code cleanup
Diffstat (limited to 'src/command_manager.cc')
| -rw-r--r-- | src/command_manager.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc index 6f636e3c..a771ddeb 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -77,20 +77,6 @@ bool is_command_separator(char c) return c == ';' or c == '\n'; } -struct unterminated_string : parse_error -{ - unterminated_string(const String& open, const String& close, int nest = 0) - : parse_error{"unterminated string '" + open + "..." + close + "'" + - (nest > 0 ? "(nesting: " + to_string(nest) + ")" : "")} - {} -}; - -struct unknown_expand : parse_error -{ - unknown_expand(const String& name) - : parse_error{"unknown expand '" + name + "'"} {} -}; - String get_until_delimiter(StringView base, ByteCount& pos, char delimiter) { const ByteCount length = base.length(); @@ -134,6 +120,12 @@ String get_until_delimiter(StringView base, ByteCount& pos, return base.substr(start, pos - start); } +struct unknown_expand : parse_error +{ + unknown_expand(const String& name) + : parse_error{"unknown expand '" + name + "'"} {} +}; + template<bool throw_on_invalid> Token::Type token_type(StringView type_name) { @@ -177,6 +169,14 @@ void skip_blanks_and_comments(StringView base, ByteCount& pos) } } +struct unterminated_string : parse_error +{ + unterminated_string(const String& open, const String& close, int nest = 0) + : parse_error{"unterminated string '" + open + "..." + close + "'" + + (nest > 0 ? "(nesting: " + to_string(nest) + ")" : "")} + {} +}; + template<bool throw_on_unterminated> Token parse_percent_token(StringView line, ByteCount& pos) { |
