Change TUI source window iteration

[external/binutils.git] / gdb / macroexp.h

diff --git a/gdb/macroexp.h b/gdb/macroexp.h
index ea72cdb..2f0848e 100644 (file)
--- a/gdb/macroexp.h
+++ b/gdb/macroexp.h
@@ -1,12 +1,12 @@
 /* Interface to C preprocessor macro expansion for GDB.
 /* Interface to C preprocessor macro expansion for GDB.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002-2019 Free Software Foundation, Inc.

    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 
 #ifndef MACROEXP_H
 
 
 #ifndef MACROEXP_H


@@ -39,9 +37,9 @@ typedef struct macro_definition *(macro_lookup_ftype) (const char *name,
    preprocessor definitions.  SOURCE is a null-terminated string.  The
    result is a null-terminated string, allocated using xmalloc; it is
    the caller's responsibility to free it.  */
    preprocessor definitions.  SOURCE is a null-terminated string.  The
    result is a null-terminated string, allocated using xmalloc; it is
    the caller's responsibility to free it.  */

-char *macro_expand (const char *source,
-                    macro_lookup_ftype *lookup_func,
-                    void *lookup_func_baton);
+gdb::unique_xmalloc_ptr<char> macro_expand (const char *source,
+                                           macro_lookup_ftype *lookup_func,
+                                           void *lookup_func_baton);

 
 
 /* Expand all preprocessor macro references that appear explicitly in
 
 
 /* Expand all preprocessor macro references that appear explicitly in


@@ -51,9 +49,9 @@ char *macro_expand (const char *source,
    SOURCE is a null-terminated string.  The result is a
    null-terminated string, allocated using xmalloc; it is the caller's
    responsibility to free it.  */
    SOURCE is a null-terminated string.  The result is a
    null-terminated string, allocated using xmalloc; it is the caller's
    responsibility to free it.  */

-char *macro_expand_once (const char *source,
-                         macro_lookup_ftype *lookup_func,
-                         void *lookup_func_baton);
+gdb::unique_xmalloc_ptr<char> macro_expand_once (const char *source,
+                                                macro_lookup_ftype *lookup_func,
+                                                void *lookup_func_baton);

 
 
 /* If the null-terminated string pointed to by *LEXPTR begins with a
 
 
 /* If the null-terminated string pointed to by *LEXPTR begins with a


@@ -82,9 +80,20 @@ char *macro_expand_once (const char *source,
    much have to do tokenization to find the end of the string that
    needs to be macro-expanded.  Our C/C++ tokenizer isn't really
    designed to be called by anything but the yacc parser engine.  */
    much have to do tokenization to find the end of the string that
    needs to be macro-expanded.  Our C/C++ tokenizer isn't really
    designed to be called by anything but the yacc parser engine.  */

-char *macro_expand_next (char **lexptr,
+char *macro_expand_next (const char **lexptr,

                          macro_lookup_ftype *lookup_func,
                          void *lookup_baton);
 
                          macro_lookup_ftype *lookup_func,
                          void *lookup_baton);
 

+/* Functions to classify characters according to cpp rules.  */
+
+int macro_is_whitespace (int c);
+int macro_is_identifier_nondigit (int c);
+int macro_is_digit (int c);
+
+
+/* Stringify STR according to C rules and return an xmalloc'd pointer
+   to the result.  */
+
+char *macro_stringify (const char *str);

 
 #endif /* MACROEXP_H */
 
 #endif /* MACROEXP_H */