tools/gn: rename char_offset to column_number

tools/gn/tokenizer.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/tokenizer.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "tools/gn/input_file.h"
 
@@ skipping 56 matching lines @@
 }
 
 }  // namespace
 
 Tokenizer::Tokenizer(const InputFile* input_file, Err* err)
     : input_file_(input_file),
       input_(input_file->contents()),
       err_(err),
       cur_(0),
       line_number_(1),
-      char_in_line_(1) {
+      column_number_(1) {
 }
 
 Tokenizer::~Tokenizer() {
 }
 
 // static
 std::vector<Token> Tokenizer::Tokenize(const InputFile* input_file, Err* err) {
   Tokenizer t(input_file, err);
   return t.Run();
 }
@@ skipping 31 matching lines @@
         type = Token::TRUE_TOKEN;
       else if (token_value == "false")
         type = Token::FALSE_TOKEN;
     } else if (type == Token::UNCLASSIFIED_COMMENT) {
       if (AtStartOfLine(token_begin) &&
           // If it's a standalone comment, but is a continuation of a comment on
           // a previous line, then instead make it a continued suffix comment.
           (tokens_.empty() || tokens_.back().type() != Token::SUFFIX_COMMENT ||
            tokens_.back().location().line_number() + 1 !=
                location.line_number() ||
-           tokens_.back().location().char_offset() != location.char_offset())) {
+           tokens_.back().location().column_number() !=
+               location.column_number())) {
         type = Token::LINE_COMMENT;
         if (!at_end())  // Could be EOF.
           Advance();  // The current \n.
         // If this comment is separated from the next syntax element, then we
         // want to tag it as a block comment. This will become a standalone
         // statement at the parser level to keep this comment separate, rather
         // than attached to the subsequent statement.
         while (!at_end() && IsCurrentWhitespace()) {
           if (IsCurrentNewline()) {
             type = Token::BLOCK_COMMENT;
@@ skipping 227 matching lines @@
 }
 
 bool Tokenizer::IsCurrentNewline() const {
   return IsNewline(input_, cur_);
 }
 
 void Tokenizer::Advance() {
   DCHECK(cur_ < input_.size());
   if (IsCurrentNewline()) {
     line_number_++;
-    char_in_line_ = 1;
+    column_number_ = 1;
   } else {
-    char_in_line_++;
+    column_number_++;
   }
   cur_++;
 }
 
 Location Tokenizer::GetCurrentLocation() const {
   return Location(
-      input_file_, line_number_, char_in_line_, static_cast<int>(cur_));
+      input_file_, line_number_, column_number_, static_cast<int>(cur_));
 }
 
 Err Tokenizer::GetErrorForInvalidToken(const Location& location) const {
   std::string help;
   if (cur_char() == ';') {
     // Semicolon.
     help = "Semicolons are not needed, delete this one.";
   } else if (cur_char() == '\t') {
     // Tab.
     help = "You got a tab character in here. Tabs are evil. "
            "Convert to spaces.";
   } else if (cur_char() == '/' && cur_ + 1 < input_.size() &&
       (input_[cur_ + 1] == '/' || input_[cur_ + 1] == '*')) {
     // Different types of comments.
     help = "Comments should start with # instead";
   } else if (cur_char() == '\'') {
     help = "Strings are delimited by \" characters, not apostrophes.";
   } else {
     help = "I have no idea what this is.";
   }
 
   return Err(location, "Invalid token.", help);
 }