diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-09-15 13:02:54 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-09-15 13:02:54 -0700 |
commit | 263eb77d6f44e822e59028d5347f4e393c05cf56 (patch) | |
tree | 245a015555545ce72893db1fda38c68e4c3a76e9 /tangle | |
parent | 207b980555f1e21681b8095ee49afe0aacbaddb6 (diff) | |
download | mu-263eb77d6f44e822e59028d5347f4e393c05cf56.tar.gz |
3361
Diffstat (limited to 'tangle')
-rw-r--r-- | tangle/003tangle.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tangle/003tangle.cc b/tangle/003tangle.cc index 5cb80b3e..276cad67 100644 --- a/tangle/003tangle.cc +++ b/tangle/003tangle.cc @@ -307,13 +307,13 @@ void emit_test(const string& name, list<Line>& lines, list<Line>& result) { } if (lines.empty()) break; result.push_back(input_lines(lines)); - if (!lines.empty() && !front(lines).contents.empty() && front(lines).contents[0] == '+') + if (!lines.empty() && !front(lines).contents.empty() && front(lines).contents.at(0) == '+') result.push_back(expected_in_trace(lines)); - while (!lines.empty() && !front(lines).contents.empty() && front(lines).contents[0] == '-') { + while (!lines.empty() && !front(lines).contents.empty() && front(lines).contents.at(0) == '-') { result.push_back(expected_not_in_trace(front(lines))); lines.pop_front(); } - if (!lines.empty() && front(lines).contents[0] == '$') { + if (!lines.empty() && front(lines).contents.at(0) == '$') { const string& in = front(lines).contents; size_t pos = in.find(": "); string layer = in.substr(1, pos-1); @@ -335,7 +335,7 @@ void emit_test(const string& name, list<Line>& lines, list<Line>& result) { bool is_input(const string& line) { if (line.empty()) return true; - return line != "===" && line[0] != '+' && line[0] != '-' && line[0] != '$' && line[0] != '?'; + return line != "===" && line.at(0) != '+' && line.at(0) != '-' && line.at(0) != '$' && line.at(0) != '?'; } Line input_lines(list<Line>& hunk) { @@ -355,7 +355,7 @@ Line expected_in_trace(list<Line>& hunk) { Line result; result.line_number = hunk.front().line_number; result.filename = hunk.front().filename; - while (!hunk.empty() && !front(hunk).contents.empty() && front(hunk).contents[0] == '+') { + while (!hunk.empty() && !front(hunk).contents.empty() && front(hunk).contents.at(0) == '+') { hunk.front().contents.erase(0, 1); result.contents += hunk.front().contents+""; hunk.pop_front(); @@ -422,14 +422,14 @@ bool any_non_input_line(const list<Line>& lines) { // pat can't start with whitespace bool starts_with(const string& s, const string& pat) { for (size_t pos = 0; pos < s.size(); ++pos) - if (!isspace(s[pos])) + if (!isspace(s.at(pos))) return s.compare(pos, pat.size(), pat) == 0; return false; } string indent(const string& s) { for (size_t pos = 0; pos < s.size(); ++pos) - if (!isspace(s[pos])) + if (!isspace(s.at(pos))) return s.substr(0, pos); return ""; } |