OSDN Git Service

LINEMAP_POSITION_FOR_COLUMN had the exact same effect as
authorgchare <gchare@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 15 Aug 2011 20:35:58 +0000 (20:35 +0000)
committergchare <gchare@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 15 Aug 2011 20:35:58 +0000 (20:35 +0000)
linemap_position_for_column, removed it and updated users
to use linemap_position_for_column instead

        libcpp/ChangeLog
* include/line-map.h (LINEMAP_POSITION_FOR_COLUMN): Remove.
Update all users to use linemap_position_for_column instead.

        gcc/go/ChangeLog
* gofrontend/lex.cc (Lex::location): Update to use
linemap_position_for_column instead.
        (Lex::earlier_location): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177768 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/go/ChangeLog
gcc/go/gofrontend/lex.cc
libcpp/ChangeLog
libcpp/directives-only.c
libcpp/include/line-map.h
libcpp/lex.c

index 549bc03..269d89a 100644 (file)
@@ -1,3 +1,9 @@
+2011-08-15  Gabriel Charette  <gchare@google.com>
+
+       * gofrontend/lex.cc (Lex::location): Update to use
+       linemap_position_for_column instead.
+       (Lex::earlier_location): Likewise.
+
 2011-08-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * Make-lang.in (gccgo$(exeext)): Add $(EXTRA_GCC_LIBS).
index 9f26911..167c7dd 100644 (file)
@@ -518,9 +518,7 @@ Lex::require_line()
 source_location
 Lex::location() const
 {
-  source_location location;
-  LINEMAP_POSITION_FOR_COLUMN(location, line_table, this->lineoff_ + 1);
-  return location;
+  return linemap_position_for_column (line_table, this->lineoff_ + 1);
 }
 
 // Get a location slightly before the current one.  This is used for
@@ -529,9 +527,7 @@ Lex::location() const
 source_location
 Lex::earlier_location(int chars) const
 {
-  source_location location;
-  LINEMAP_POSITION_FOR_COLUMN(location, line_table, this->lineoff_ + 1 - chars);
-  return location;
+  return linemap_position_for_column (line_table, this->lineoff_ + 1 - chars);
 }
 
 // Get the next token.
index 1b22418..e136852 100644 (file)
@@ -1,3 +1,8 @@
+2011-08-15  Gabriel Charette  <gchare@google.com>
+
+       * include/line-map.h (LINEMAP_POSITION_FOR_COLUMN): Remove.
+       Update all users to use linemap_position_for_column instead.
+
 2011-07-28  Gabriel Charette  <gchare@google.com>
 
        * include/line-map.h (struct line_maps):
index e19f806..c6772af 100644 (file)
@@ -142,7 +142,7 @@ _cpp_preprocess_dir_only (cpp_reader *pfile,
            flags |= DO_LINE_COMMENT;
          else if (!(flags & DO_SPECIAL))
            /* Mark the position for possible error reporting. */
-           LINEMAP_POSITION_FOR_COLUMN (loc, pfile->line_table, col);
+           loc = linemap_position_for_column (pfile->line_table, col);
 
          break;
 
index f1d5bee..3c84035 100644 (file)
@@ -165,23 +165,6 @@ extern const struct line_map *linemap_lookup
 /* Nonzero if the map is at the bottom of the include stack.  */
 #define MAIN_FILE_P(MAP) ((MAP)->included_from < 0)
 
-/* Set LOC to a source position that is the same line as the most recent
-   linemap_line_start, but with the specified TO_COLUMN column number.  */
-
-#define LINEMAP_POSITION_FOR_COLUMN(LOC, SET, TO_COLUMN) do { \
-  unsigned int to_column = (TO_COLUMN); \
-  struct line_maps *set = (SET); \
-  if (__builtin_expect (to_column >= set->max_column_hint, 0)) \
-    (LOC) = linemap_position_for_column (set, to_column); \
-  else { \
-    source_location r = set->highest_line; \
-    r = r + to_column; \
-    if (r >= set->highest_location) \
-      set->highest_location = r; \
-    (LOC) = r;                  \
-  }} while (0)
-    
-
 extern source_location
 linemap_position_for_column (struct line_maps *set, unsigned int to_column);
 
index d29f36d..d460b98 100644 (file)
@@ -1975,8 +1975,8 @@ _cpp_lex_direct (cpp_reader *pfile)
     }
   c = *buffer->cur++;
 
-  LINEMAP_POSITION_FOR_COLUMN (result->src_loc, pfile->line_table,
-                              CPP_BUF_COLUMN (buffer, buffer->cur));
+  result->src_loc = linemap_position_for_column (pfile->line_table,
+                                                           CPP_BUF_COLUMN (buffer, buffer->cur));
 
   switch (c)
     {