* gdb.ada/print_chars/pck.ads, gdb.ada/print_chars/pck.adb,

[deliverable/binutils-gdb.git] / gdb / macrocmd.c

diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index 40b31541f908e408dd32810defb17de1792c63a8..06a191f385afff9902e5ca4c4422a507c1d36d2b 100644 (file)
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -1,12 +1,12 @@
 /* C preprocessor macro expansion commands for GDB.
 /* C preprocessor macro expansion commands for GDB.

-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 
 #include "defs.h"
 
 
 #include "defs.h"


@@ -59,9 +57,9 @@ macro_expand_command (char *exp, int from_tty)
      at the moment, the `print' commands don't save the last expression
      evaluated, just its value.  */
   if (! exp || ! *exp)
      at the moment, the `print' commands don't save the last expression
      evaluated, just its value.  */
   if (! exp || ! *exp)

-    error ("You must follow the `macro expand' command with the"
+    error (_("You must follow the `macro expand' command with the"

            " expression you\n"
            " expression you\n"

-           "want to expand.");
+           "want to expand."));

 
   ms = default_macro_scope ();
   if (ms)
 
   ms = default_macro_scope ();
   if (ms)


@@ -95,9 +93,9 @@ macro_expand_once_command (char *exp, int from_tty)
      expression'.  That way, you could just hit return over and over and
      see the expression expanded one level at a time.  */
   if (! exp || ! *exp)
      expression'.  That way, you could just hit return over and over and
      see the expression expanded one level at a time.  */
   if (! exp || ! *exp)

-    error ("You must follow the `macro expand-once' command with"
+    error (_("You must follow the `macro expand-once' command with"

            " the expression\n"
            " the expression\n"

-           "you want to expand.");
+           "you want to expand."));

 
   ms = default_macro_scope ();
   if (ms)
 
   ms = default_macro_scope ();
   if (ms)


@@ -142,13 +140,13 @@ info_macro_command (char *name, int from_tty)
   struct macro_definition *d;
   
   if (! name || ! *name)
   struct macro_definition *d;
   
   if (! name || ! *name)

-    error ("You must follow the `info macro' command with the name"
+    error (_("You must follow the `info macro' command with the name"

            " of the macro\n"
            " of the macro\n"

-           "whose definition you want to see.");
+           "whose definition you want to see."));

 
   ms = default_macro_scope ();
   if (! ms)
 
   ms = default_macro_scope ();
   if (! ms)

-    error ("GDB has no preprocessor macro information for that code.\n");
+    error (_("GDB has no preprocessor macro information for that code."));

 
   d = macro_lookup_definition (ms->file, ms->line, name);
   if (d)
 
   d = macro_lookup_definition (ms->file, ms->line, name);
   if (d)


@@ -201,27 +199,29 @@ static struct macro_table *user_macros;
 static void
 macro_define_command (char *exp, int from_tty)
 {
 static void
 macro_define_command (char *exp, int from_tty)
 {

-  error ("Command not implemented yet.");
+  error (_("Command not implemented yet."));

 }
 
 
 static void
 macro_undef_command (char *exp, int from_tty)
 {
 }
 
 
 static void
 macro_undef_command (char *exp, int from_tty)
 {

-  error ("Command not implemented yet.");
+  error (_("Command not implemented yet."));

 }
 
 
 static void
 macro_list_command (char *exp, int from_tty)
 {
 }
 
 
 static void
 macro_list_command (char *exp, int from_tty)
 {

-  error ("Command not implemented yet.");
+  error (_("Command not implemented yet."));

 }
 
 
 \f
 /* Initializing the `macrocmd' module.  */
 
 }
 
 
 \f
 /* Initializing the `macrocmd' module.  */
 

+extern initialize_file_ftype _initialize_macrocmd; /* -Wmissing-prototypes */
+

 void
 _initialize_macrocmd (void)
 {
 void
 _initialize_macrocmd (void)
 {


@@ -229,59 +229,50 @@ _initialize_macrocmd (void)
 
   /* We introduce a new command prefix, `macro', under which we'll put
      the various commands for working with preprocessor macros.  */
 
   /* We introduce a new command prefix, `macro', under which we'll put
      the various commands for working with preprocessor macros.  */

-  add_prefix_cmd
-    ("macro", class_info, macro_command,
-     "Prefix for commands dealing with C preprocessor macros.",
-     &macrolist, "macro ", 0, &cmdlist);
-
-  add_cmd
-    ("expand", no_class, macro_expand_command,
-     "Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n"
-     "Show the expanded expression.",
-     &macrolist);
+  add_prefix_cmd ("macro", class_info, macro_command,
+                 _("Prefix for commands dealing with C preprocessor macros."),
+                 &macrolist, "macro ", 0, &cmdlist);
+
+  add_cmd ("expand", no_class, macro_expand_command, _("\
+Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n\
+Show the expanded expression."),
+          &macrolist);

   add_alias_cmd ("exp", "expand", no_class, 1, &macrolist);
   add_alias_cmd ("exp", "expand", no_class, 1, &macrolist);

-  add_cmd
-    ("expand-once", no_class, macro_expand_once_command,
-     "Expand C/C++ preprocessor macro invocations appearing directly in"
-     " EXPRESSION.\n"
-     "Show the expanded expression.\n"
-     "\n"
-     "This command differs from `macro expand' in that it only expands macro\n"
-     "invocations that appear directly in EXPRESSION; if expanding a macro\n"
-     "introduces further macro invocations, those are left unexpanded.\n"
-     "\n"
-     "`macro expand-once' helps you see how a particular macro expands,\n"
-     "whereas `macro expand' shows you how all the macros involved in an\n"
-     "expression work together to yield a pre-processed expression.",
-     &macrolist);
+  add_cmd ("expand-once", no_class, macro_expand_once_command, _("\
+Expand C/C++ preprocessor macro invocations appearing directly in EXPRESSION.\n\
+Show the expanded expression.\n\
+\n\
+This command differs from `macro expand' in that it only expands macro\n\
+invocations that appear directly in EXPRESSION; if expanding a macro\n\
+introduces further macro invocations, those are left unexpanded.\n\
+\n\
+`macro expand-once' helps you see how a particular macro expands,\n\
+whereas `macro expand' shows you how all the macros involved in an\n\
+expression work together to yield a pre-processed expression."),
+          &macrolist);

   add_alias_cmd ("exp1", "expand-once", no_class, 1, &macrolist);
 
   add_alias_cmd ("exp1", "expand-once", no_class, 1, &macrolist);
 

-  add_cmd
-    ("macro", no_class, info_macro_command,
-     "Show the definition of MACRO, and its source location.",
-     &infolist);
-
-  add_cmd
-    ("define", no_class, macro_define_command,
-     "Define a new C/C++ preprocessor macro.\n"
-     "The GDB command `macro define DEFINITION' is equivalent to placing a\n"
-     "preprocessor directive of the form `#define DEFINITION' such that the\n"
-     "definition is visible in all the inferior's source files.\n"
-     "For example:\n"
-     "  (gdb) macro define PI (3.1415926)\n"
-     "  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))",
-     &macrolist);
-
-  add_cmd
-    ("undef", no_class, macro_undef_command,
-     "Remove the definition of the C/C++ preprocessor macro with the"
-     " given name.",
-     &macrolist);
-
-  add_cmd
-    ("list", no_class, macro_list_command,
-     "List all the macros defined using the `macro define' command.",
-     &macrolist);
+  add_cmd ("macro", no_class, info_macro_command,
+          _("Show the definition of MACRO, and its source location."),
+          &infolist);
+
+  add_cmd ("define", no_class, macro_define_command, _("\
+Define a new C/C++ preprocessor macro.\n\
+The GDB command `macro define DEFINITION' is equivalent to placing a\n\
+preprocessor directive of the form `#define DEFINITION' such that the\n\
+definition is visible in all the inferior's source files.\n\
+For example:\n\
+  (gdb) macro define PI (3.1415926)\n\
+  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))"),
+          &macrolist);
+
+  add_cmd ("undef", no_class, macro_undef_command, _("\
+Remove the definition of the C/C++ preprocessor macro with the given name."),
+          &macrolist);
+
+  add_cmd ("list", no_class, macro_list_command,
+          _("List all the macros defined using the `macro define' command."),
+          &macrolist);

 
   user_macros = new_macro_table (0, 0);
 }
 
   user_macros = new_macro_table (0, 0);
 }