Merge GDB 7.5.1

gdb/cli/cli-decode.h

 /* Header file for GDB command decoding library.
 
    Copyright (c) 2000, 2003, 2007-2012 Free Software Foundation, Inc.
 
    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 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (CLI_DECODE_H)
 #define CLI_DECODE_H 1
 
+/* This file defines the private interfaces for any code implementing
+   command internals.  */
+
+/* Include the public interfaces.  */
 #include "command.h"
 
 struct re_pattern_buffer;
 
 #if 0
 /* FIXME: cagney/2002-03-17: Once cmd_type() has been removed, ``enum
    cmd_types'' can be moved from "command.h" to "cli-decode.h".  */
 /* Not a set/show command.  Note that some commands which begin with
    "set" or "show" might be in this category, if their syntax does
    not fall into one of the following categories.  */
@@ skipping 126 matching lines @@
        (rl_point) and is '\0' terminated.
 
        Return value is a malloc'd vector of pointers to possible
        completions terminated with NULL.  If there are no completions,
        returning a pointer to a NULL would work but returning NULL
        itself is also valid.  WORD points in the same buffer as TEXT,
        and completions should be returned relative to this position.
        For example, suppose TEXT is "foo" and we want to complete to
        "foobar".  If WORD is "oo", return "oobar"; if WORD is
        "baz/foo", return "baz/foobar".  */
-    char **(*completer) (struct cmd_list_element *cmd, 
-                         char *text, char *word);
+    completer_ftype *completer;
 
     /* Destruction routine for this command.  If non-NULL, this is
        called when this command instance is destroyed.  This may be
        used to finalize the CONTEXT field, if needed.  */
     void (*destroyer) (struct cmd_list_element *self, void *context);
 
     /* Type of "set" or "show" command (or SET_NOT_SET if not "set"
        or "show").  */
     cmd_types type;
 
     /* Pointer to variable affected by "set" and "show".  Doesn't
        matter if type is not_set.  */
     void *var;
 
     /* What kind of variable is *VAR?  */
     var_types var_type;
 
     /* Pointer to NULL terminated list of enumerated values (like
        argv).  */
-    const char **enums;
+    const char *const *enums;
 
     /* Pointer to command strings of user-defined commands */
     struct command_line *user_commands;
 
     /* Pointer to command that is hooked by this one, (by hook_pre)
        so the hook can be removed when this one is deleted.  */
     struct cmd_list_element *hookee_pre;
 
     /* Pointer to command that is hooked by this one, (by hook_post)
        so the hook can be removed when this one is deleted.  */
     struct cmd_list_element *hookee_post;
 
     /* Pointer to command that is aliased by this one, so the
        aliased command can be located in case it has been hooked.  */
     struct cmd_list_element *cmd_pointer;
 
     /* Start of a linked list of all aliases of this command.  */
     struct cmd_list_element *aliases;
 
     /* Link pointer for aliases on an alias list.  */
     struct cmd_list_element *alias_chain;
   };
 
-/* Flag for an ambiguous cmd_list result.  */
-#define CMD_LIST_AMBIGUOUS ((struct cmd_list_element *) -1)
-
-/* API to the manipulation of command lists.  */
-
-extern struct cmd_list_element *add_cmd (char *, enum command_class,
-                                         void (*fun) (char *, int), char *,
-                                         struct cmd_list_element **);
-
-extern struct cmd_list_element *add_alias_cmd (char *, char *,
-                                               enum command_class, int,
-                                               struct cmd_list_element **);
-
-extern struct cmd_list_element *add_prefix_cmd (char *, enum command_class,
-                                                void (*fun) (char *, int),
-                                                char *,
-                                                struct cmd_list_element **,
-                                                char *, int,
-                                                struct cmd_list_element **);
-
-extern struct cmd_list_element *add_abbrev_prefix_cmd (char *,
-                                                       enum command_class,
-                                                       void (*fun) (char *,
-                                                                    int),
-                                                       char *,
-                                                       struct cmd_list_element
-                                                       **, char *, int,
-                                                       struct cmd_list_element
-                                                       **);
-
-/* Set the commands corresponding callback.  */
-
-extern void set_cmd_cfunc (struct cmd_list_element *cmd,
-                           void (*cfunc) (char *args, int from_tty));
-
-extern void set_cmd_sfunc (struct cmd_list_element *cmd,
-                           void (*sfunc) (char *args, int from_tty,
-                                          struct cmd_list_element * c));
-
-extern void set_cmd_completer (struct cmd_list_element *cmd,
-                               char **(*completer) (struct cmd_list_element *self,
-                                                    char *text, char *word));
-
-/* HACK: cagney/2002-02-23: Code, mostly in tracepoints.c, grubs
-   around in cmd objects to test the value of the commands sfunc().  */
-extern int cmd_cfunc_eq (struct cmd_list_element *cmd,
-                         void (*cfunc) (char *args, int from_tty));
-
-/* Access to the command's local context.  */
-extern void set_cmd_context (struct cmd_list_element *cmd, void *context);
-extern void *get_cmd_context (struct cmd_list_element *cmd);
-
-extern struct cmd_list_element *lookup_cmd (char **,
-                                            struct cmd_list_element *, char *,
-                                            int, int);
-
-extern struct cmd_list_element *lookup_cmd_1 (char **,
-                                              struct cmd_list_element *,
-                                              struct cmd_list_element **,
-                                              int);
-
-extern struct cmd_list_element *
-  deprecate_cmd (struct cmd_list_element *, char * );
-
-extern void
-  deprecated_cmd_warning (char **);
-
-extern int
-  lookup_cmd_composition (char *text,
-                        struct cmd_list_element **alias,
-                        struct cmd_list_element **prefix_cmd,
-                        struct cmd_list_element **cmd);
-
-extern struct cmd_list_element *add_com (char *, enum command_class,
-                                         void (*fun) (char *, int), char *);
-
-extern struct cmd_list_element *add_com_alias (char *, char *,
-                                               enum command_class, int);
-
-extern struct cmd_list_element *add_info (char *, void (*fun) (char *, int),
-                                          char *);
-
-extern struct cmd_list_element *add_info_alias (char *, char *, int);
-
-extern char **complete_on_cmdlist (struct cmd_list_element *, char *, char *);
-
-extern char **complete_on_enum (const char *enumlist[], char *, char *);
-
 extern void help_cmd_list (struct cmd_list_element *, enum command_class,
                            char *, int, struct ui_file *);
 
 /* Functions that implement commands about CLI commands.  */
 
 extern void help_cmd (char *, struct ui_file *);
 
-extern void help_list (struct cmd_list_element *, char *,
-                       enum command_class, struct ui_file *);
-
 extern void apropos_cmd (struct ui_file *, struct cmd_list_element *,
                          struct re_pattern_buffer *, char *);
 
 /* Used to mark commands that don't do anything.  If we just leave the
    function field NULL, the command is interpreted as a help topic, or
    as a class of commands.  */
 
 extern void not_just_help_class_command (char *arg, int from_tty);
 
 /* Exported to cli/cli-setshow.c */
 
 extern void print_doc_line (struct ui_file *, char *);
 
 
 #endif /* !defined (CLI_DECODE_H) */