# # # patch "rcs_file.cc" # from [3846fcd9f03c09140267d0da6e9ac3aacce284ff] # to [eca78bb569543a13e1853f9b3143be8f59852731] # ============================================================ --- rcs_file.cc 3846fcd9f03c09140267d0da6e9ac3aacce284ff +++ rcs_file.cc eca78bb569543a13e1853f9b3143be8f59852731 @@ -222,8 +222,8 @@ get_token(file_source & ist, static token_type get_token(file_source & ist, string & str, - size_t & line, - size_t & col) + size_t & line, + size_t & col) { bool saw_idchar = false; int i = ist.peek(); @@ -269,10 +269,10 @@ get_token(file_source & ist, break; } else - { - adv(i, line, col); - str += c; - } + { + adv(i, line, col); + str += c; + } } return TOK_STRING; break; @@ -284,7 +284,7 @@ get_token(file_source & ist, && !isspace(i)) { ist.get(c); - ++col; + ++col; if (! isdigit(c) && c != '.') saw_idchar = true; str += c; @@ -352,7 +352,7 @@ struct parser { if (ttype != want) throw oops((F("parse failure %d:%d: expecting %s, got %s with value '%s'") - % line % col % tt2str(want) % tt2str(ttype) % token).str()); + % line % col % tt2str(want) % tt2str(ttype) % token).str()); advance(); } @@ -371,7 +371,7 @@ struct parser string tmp; if (!symp(expected)) throw oops((F("parse failure %d:%d: expecting word '%s'") - % line % col % expected).str()); + % line % col % expected).str()); advance(); } @@ -386,7 +386,7 @@ struct parser { if (!wordp()) throw oops((F("parse failure %d:%d: expecting word") - % line % col).str()); + % line % col).str()); advance(); } @@ -415,14 +415,14 @@ struct parser while(symp() || nump()) { string stmp, ntmp; - if (symp()) - { - sym(stmp); colon(); num(ntmp); - } - else - { - num(stmp); colon(); num(ntmp); - } + if (symp()) + { + sym(stmp); colon(); num(ntmp); + } + else + { + num(stmp); colon(); num(ntmp); + } r.admin.symbols.insert(make_pair(ntmp, stmp)); } semi();