From f03668bd4ac75d853fb7b83c0e0e95a3d02cdc94 Mon Sep 17 00:00:00 2001
From: gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 2 Jan 2005 01:32:21 +0000
Subject: [PATCH] * internal.h: Update references to Cpp lib filenames.
* directives.c: Likewise. * init.c: Likewise. *
macro.c: Likewise. * traditional.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92799 138bc75d-0d04-0410-961f-82ee72b054a4
---
libcpp/ChangeLog | 8 ++++++++
libcpp/directives.c | 6 +++---
libcpp/init.c | 4 ++--
libcpp/internal.h | 28 ++++++++++++++--------------
libcpp/macro.c | 2 +-
libcpp/traditional.c | 2 +-
6 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 41e8aaec7d23..88e5b8f312ba 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-01 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * internal.h: Update references to Cpp lib filenames.
+ * directives.c: Likewise.
+ * init.c: Likewise.
+ * macro.c: Likewise.
+ * traditional.c: Likewise.
+
2004-12-15 Eric Botcazou <ebotcazou@libertysurf.fr>
PR preprocessor/15167
diff --git a/libcpp/directives.c b/libcpp/directives.c
index fe1867d569ad..6039862a95a2 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -326,7 +326,7 @@ directive_diagnostics (cpp_reader *pfile, const directive *dir, int indented)
/* Check if we have a known directive. INDENTED is nonzero if the
'#' of the directive was indented. This function is in this file
- to save unnecessarily exporting dtable etc. to cpplex.c. Returns
+ to save unnecessarily exporting dtable etc. to lex.c. Returns
nonzero if the line of tokens has been handled, zero if we should
continue processing the line. */
int
@@ -382,7 +382,7 @@ _cpp_handle_directive (cpp_reader *pfile, int indented)
does not cause '#define foo bar' to get executed when
compiled with -save-temps, we recognize directives in
- -fpreprocessed mode only if the # is in column 1. cppmacro.c
+ -fpreprocessed mode only if the # is in column 1. macro.c
puts a space in front of any '#' at the start of a macro. */
if (CPP_OPTION (pfile, preprocessed)
&& (indented || !(dir->flags & IN_I)))
@@ -503,7 +503,7 @@ lex_macro_node (cpp_reader *pfile)
return NULL;
}
-/* Process a #define directive. Most work is done in cppmacro.c. */
+/* Process a #define directive. Most work is done in macro.c. */
static void
do_define (cpp_reader *pfile)
{
diff --git a/libcpp/init.c b/libcpp/init.c
index b2be19a7136f..c3c738e250c1 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -275,7 +275,7 @@ cpp_destroy (cpp_reader *pfile)
There are two tables of these. builtin_array holds all the
"builtin" macros: these are handled by builtin_macro() in
- cppmacro.c. Builtin is somewhat of a misnomer -- the property of
+ macro.c. Builtin is somewhat of a misnomer -- the property of
interest is that these macros require special code to compute their
expansions. The value is a "builtin_type" enumerator.
@@ -567,7 +567,7 @@ cpp_finish (cpp_reader *pfile, FILE *deps_stream)
if (CPP_OPTION (pfile, warn_unused_macros))
cpp_forall_identifiers (pfile, _cpp_warn_if_unused_macro, NULL);
- /* cpplex.c leaves the final buffer on the stack. This it so that
+ /* lex.c leaves the final buffer on the stack. This it so that
it returns an unending stream of CPP_EOFs to the client. If we
popped the buffer, we'd dereference a NULL buffer pointer and
segfault. It's nice to allow the client to do worry-free excess
diff --git a/libcpp/internal.h b/libcpp/internal.h
index 32e938c5c54e..9f39b21ec8e5 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -396,11 +396,11 @@ struct cpp_reader
struct deps *deps;
/* Obstack holding all macro hash nodes. This never shrinks.
- See cpphash.c */
+ See identifiers.c */
struct obstack hash_ob;
/* Obstack holding buffer and conditional structures. This is a
- real stack. See cpplib.c. */
+ real stack. See directives.c. */
struct obstack buffer_ob;
/* Pragma table - dynamic, because a library user can add to the
@@ -435,7 +435,7 @@ struct cpp_reader
source_location first_line;
} out;
- /* Used for buffer overlays by cpptrad.c. */
+ /* Used for buffer overlays by traditional.c. */
const unsigned char *saved_cur, *saved_rlimit, *saved_line_base;
/* A saved list of the defined macros, for dependency checking
@@ -448,7 +448,7 @@ struct cpp_reader
definition of a pp-number in the C standard [section 6.4.8 of C99].
In the unlikely event that characters other than \r and \n enter
- the set is_vspace, the macro handle_newline() in cpplex.c must be
+ the set is_vspace, the macro handle_newline() in lex.c must be
updated. */
#define _dollar_ok(x) ((x) == '$' && CPP_OPTION (pfile, dollars_in_ident))
@@ -481,11 +481,11 @@ cpp_in_system_header (cpp_reader *pfile)
#define CPP_PEDANTIC(PF) CPP_OPTION (PF, pedantic)
#define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional)
-/* In cpperror.c */
+/* In errors.c */
extern int _cpp_begin_message (cpp_reader *, int,
source_location, unsigned int);
-/* In cppmacro.c */
+/* In macro.c */
extern void _cpp_free_definition (cpp_hashnode *);
extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *);
extern void _cpp_pop_context (cpp_reader *);
@@ -497,11 +497,11 @@ extern bool _cpp_arguments_ok (cpp_reader *, cpp_macro *, const cpp_hashnode *,
extern const unsigned char *_cpp_builtin_macro_text (cpp_reader *,
cpp_hashnode *);
int _cpp_warn_if_unused_macro (cpp_reader *, cpp_hashnode *, void *);
-/* In cpphash.c */
+/* In identifiers.c */
extern void _cpp_init_hashtable (cpp_reader *, hash_table *);
extern void _cpp_destroy_hashtable (cpp_reader *);
-/* In cppfiles.c */
+/* In files.c */
typedef struct _cpp_file _cpp_file;
extern _cpp_file *_cpp_find_file (cpp_reader *, const char *fname,
cpp_dir *start_dir, bool fake);
@@ -519,11 +519,11 @@ extern void _cpp_pop_file_buffer (cpp_reader *, struct _cpp_file *);
extern bool _cpp_save_file_entries (cpp_reader *pfile, FILE *f);
extern bool _cpp_read_file_entries (cpp_reader *, FILE *);
-/* In cppexp.c */
+/* In expr.c */
extern bool _cpp_parse_expr (cpp_reader *);
extern struct op *_cpp_expand_op_stack (cpp_reader *);
-/* In cpplex.c */
+/* In lex.c */
extern void _cpp_process_line_notes (cpp_reader *, int);
extern void _cpp_clean_line (cpp_reader *);
extern bool _cpp_get_fresh_line (cpp_reader *);
@@ -534,10 +534,10 @@ extern cpp_token *_cpp_lex_direct (cpp_reader *);
extern int _cpp_equiv_tokens (const cpp_token *, const cpp_token *);
extern void _cpp_init_tokenrun (tokenrun *, unsigned int);
-/* In cppinit.c. */
+/* In init.c. */
extern void _cpp_maybe_push_include_file (cpp_reader *);
-/* In cpplib.c */
+/* In directives.c */
extern int _cpp_test_assertion (cpp_reader *, unsigned int *);
extern int _cpp_handle_directive (cpp_reader *, int);
extern void _cpp_define_builtin (cpp_reader *, const char *);
@@ -550,7 +550,7 @@ extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *,
unsigned int, unsigned int);
extern void _cpp_pop_buffer (cpp_reader *);
-/* In cpptrad.c. */
+/* In traditional.c. */
extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *);
extern bool _cpp_read_logical_line_trad (cpp_reader *);
extern void _cpp_overlay_buffer (cpp_reader *pfile, const unsigned char *,
@@ -563,7 +563,7 @@ extern unsigned char *_cpp_copy_replacement_text (const cpp_macro *,
unsigned char *);
extern size_t _cpp_replacement_text_len (const cpp_macro *);
-/* In cppcharset.c. */
+/* In charset.c. */
extern cppchar_t _cpp_valid_ucn (cpp_reader *, const unsigned char **,
const unsigned char *, int);
extern void _cpp_destroy_iconv (cpp_reader *);
diff --git a/libcpp/macro.c b/libcpp/macro.c
index 77183343d9e1..e3824cbe5af7 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -1540,7 +1540,7 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node)
/* Restore lexer position because of games lex_expansion_token()
plays lexing the macro. We set the type for SEEN_EOL() in
- cpplib.c.
+ directives.c.
Longer term we should lex the whole line before coming here,
and just copy the expansion. */
diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index 38e301c43ff7..ba25301b14e7 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -76,7 +76,7 @@ enum ls {ls_none = 0, /* Normal state. */
ls_predicate, /* After the predicate, maybe paren? */
ls_answer}; /* In answer to predicate. */
-/* Lexing TODO: Maybe handle space in escaped newlines. Stop cpplex.c
+/* Lexing TODO: Maybe handle space in escaped newlines. Stop lex.c
from recognizing comments and directives during its lexing pass. */
static const uchar *skip_whitespace (cpp_reader *, const uchar *, int);
--
GitLab