From 3f6ced102dddee2a41f6ae4e96c42a6580f8e279 Mon Sep 17 00:00:00 2001
From: Gabriel Charette <gchare@google.com>
Date: Mon, 15 Aug 2011 20:35:58 +0000
Subject: [PATCH] LINEMAP_POSITION_FOR_COLUMN had the exact same effect as
linemap_position_for_column...
LINEMAP_POSITION_FOR_COLUMN had the exact same effect as
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.
From-SVN: r177768
---
gcc/go/ChangeLog | 6 ++++++
gcc/go/gofrontend/lex.cc | 8 ++------
libcpp/ChangeLog | 5 +++++
libcpp/directives-only.c | 2 +-
libcpp/include/line-map.h | 17 -----------------
libcpp/lex.c | 4 ++--
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 549bc03712f7..269d89a2b6cf 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -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).
diff --git a/gcc/go/gofrontend/lex.cc b/gcc/go/gofrontend/lex.cc
index 9f26911a16c8..167c7ddffc02 100644
--- a/gcc/go/gofrontend/lex.cc
+++ b/gcc/go/gofrontend/lex.cc
@@ -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.
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1b224182368b..e136852231b2 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -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):
diff --git a/libcpp/directives-only.c b/libcpp/directives-only.c
index e19f80696141..c6772afb83d8 100644
--- a/libcpp/directives-only.c
+++ b/libcpp/directives-only.c
@@ -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;
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index f1d5bee801b9..3c84035e95fd 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -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);
diff --git a/libcpp/lex.c b/libcpp/lex.c
index d29f36d436d7..d460b98d5d22 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -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)
{
--
GitLab