daily update

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

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 45deffe4ab52592a5d0723477b4d2b8f1c7386cf..815294399e25e238f81c3fd00f4035bc3f894624 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -1,7 +1,7 @@
 /* Print in infix form a struct expression.
 
    Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2003, 2007, 2008, 2009, 2010
+   1998, 1999, 2000, 2003, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -42,6 +42,7 @@ void
 print_expression (struct expression *exp, struct ui_file *stream)
 {
   int pc = 0;
+
   print_subexp (exp, &pc, stream, PREC_NULL);
 }
 
@@ -96,6 +97,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_LONG:
       {
        struct value_print_options opts;
+
        get_raw_print_options (&opts);
        (*pos) += 3;
        value_print (value_from_longest (exp->elts[pc + 1].type,
@@ -107,6 +109,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_DOUBLE:
       {
        struct value_print_options opts;
+
        get_raw_print_options (&opts);
        (*pos) += 3;
        value_print (value_from_double (exp->elts[pc + 1].type,
@@ -118,6 +121,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_VAR_VALUE:
       {
        struct block *b;
+
        (*pos) += 3;
        b = exp->elts[pc + 1].block;
        if (b != NULL
@@ -140,6 +144,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_REGISTER:
       {
        const char *name = &exp->elts[pc + 2].string;
+
        (*pos) += 3 + BYTES_TO_EXP_ELEM (exp->elts[pc + 1].longconst + 1);
        fprintf_filtered (stream, "$%s", name);
        return;
@@ -181,6 +186,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_STRING:
       {
        struct value_print_options opts;
+
        nargs = longest_to_int (exp->elts[pc + 1].longconst);
        (*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
        /* LA_PRINT_STRING will print using the current repeat count threshold.
@@ -199,9 +205,11 @@ print_subexp_standard (struct expression *exp, int *pos,
       fprintf_unfiltered (stream, "B'<unimplemented>'");
       return;
 
-    case OP_OBJC_NSSTRING:     /* Objective-C Foundation Class NSString constant.  */
+    case OP_OBJC_NSSTRING:     /* Objective-C Foundation Class
+                                  NSString constant.  */
       {
        struct value_print_options opts;
+
        nargs = longest_to_int (exp->elts[pc + 1].longconst);
        (*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
        fputs_filtered ("@\"", stream);
@@ -215,6 +223,7 @@ print_subexp_standard (struct expression *exp, int *pos,
     case OP_OBJC_MSGCALL:
       {                        /* Objective C message (method) call.  */
        char *selector;
+
        (*pos) += 3;
        nargs = longest_to_int (exp->elts[pc + 2].longconst);
        fprintf_unfiltered (stream, "[");
@@ -228,6 +237,7 @@ print_subexp_standard (struct expression *exp, int *pos,
        if (nargs)
          {
            char *s, *nextS;
+
            s = alloca (strlen (selector) + 1);
            strcpy (s, selector);
            for (tem = 0; tem < nargs; tem++)
@@ -245,7 +255,7 @@ print_subexp_standard (struct expression *exp, int *pos,
            fprintf_unfiltered (stream, " %s", selector);
          }
        fprintf_unfiltered (stream, "]");
-       /* "selector" was malloc'd by target_read_string. Free it.  */
+       /* "selector" was malloc'd by target_read_string.  Free it.  */
        xfree (selector);
        return;
       }
@@ -267,7 +277,7 @@ print_subexp_standard (struct expression *exp, int *pos,
             does not match our expection of what we should find for
             a simple string, revert back to array printing.  Note that
             the last expression element is an explicit null terminator
-            byte, which doesn't get printed. */
+            byte, which doesn't get printed.  */
          tempstr = alloca (nargs);
          pc += 4;
          while (tem < nargs)
@@ -276,7 +286,8 @@ print_subexp_standard (struct expression *exp, int *pos,
                  || exp->elts[pc + 1].type
                     != builtin_type (exp->gdbarch)->builtin_char)
                {
-                 /* Not a simple array of char, use regular array printing. */
+                 /* Not a simple array of char, use regular array
+                    printing.  */
                  tem = 0;
                  break;
                }
@@ -291,6 +302,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       if (tem > 0)
        {
          struct value_print_options opts;
+
          get_user_print_options (&opts);
          LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
                           tempstr, nargs - 1, NULL, 0, &opts);
@@ -360,7 +372,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       fputs_filtered (&exp->elts[pc + 2].string, stream);
       return;
 
-      /* Will not occur for Modula-2 */
+      /* Will not occur for Modula-2.  */
     case STRUCTOP_PTR:
       tem = longest_to_int (exp->elts[pc + 1].longconst);
       (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
@@ -522,10 +534,6 @@ print_subexp_standard (struct expression *exp, int *pos,
       fprintf_unfiltered (stream, ")");
       return;
 
-    case BINOP_INCL:
-    case BINOP_EXCL:
-      error (_("print_subexp:  Not implemented."));
-
       /* Default ops */
 
     default:
@@ -545,7 +553,7 @@ print_subexp_standard (struct expression *exp, int *pos,
        error (_("Invalid expression"));
     }
 
-  /* Note that PREC_BUILTIN will always emit parentheses. */
+  /* Note that PREC_BUILTIN will always emit parentheses.  */
   if ((int) myprec < (int) prec)
     fputs_filtered ("(", stream);
   if ((int) opcode > (int) BINOP_END)
@@ -615,7 +623,7 @@ op_string (enum exp_opcode op)
 static char *op_name (struct expression *, enum exp_opcode);
 static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
 
-/* Name for OPCODE, when it appears in expression EXP. */
+/* Name for OPCODE, when it appears in expression EXP.  */
 
 static char *
 op_name (struct expression *exp, enum exp_opcode opcode)
@@ -704,10 +712,6 @@ op_name_standard (enum exp_opcode opcode)
       return "BINOP_ASSIGN_MODIFY";
     case BINOP_VAL:
       return "BINOP_VAL";
-    case BINOP_INCL:
-      return "BINOP_INCL";
-    case BINOP_EXCL:
-      return "BINOP_EXCL";
     case BINOP_CONCAT:
       return "BINOP_CONCAT";
     case BINOP_RANGE:
@@ -770,12 +774,6 @@ op_name_standard (enum exp_opcode opcode)
       return "UNOP_POSTDECREMENT";
     case UNOP_SIZEOF:
       return "UNOP_SIZEOF";
-    case UNOP_LOWER:
-      return "UNOP_LOWER";
-    case UNOP_UPPER:
-      return "UNOP_UPPER";
-    case UNOP_LENGTH:
-      return "UNOP_LENGTH";
     case UNOP_PLUS:
       return "UNOP_PLUS";
     case UNOP_CAP:
@@ -942,8 +940,6 @@ dump_subexp_body_standard (struct expression *exp,
     case BINOP_INTDIV:
     case BINOP_ASSIGN_MODIFY:
     case BINOP_VAL:
-    case BINOP_INCL:
-    case BINOP_EXCL:
     case BINOP_CONCAT:
     case BINOP_IN:
     case BINOP_RANGE:
@@ -972,12 +968,6 @@ dump_subexp_body_standard (struct expression *exp,
     case UNOP_MIN:
     case UNOP_ODD:
     case UNOP_TRUNC:
-    case UNOP_LOWER:
-    case UNOP_UPPER:
-    case UNOP_LENGTH:
-    case UNOP_CARD:
-    case UNOP_CHMAX:
-    case UNOP_CHMIN:
       elt = dump_subexp (exp, stream, elt);
       break;
     case OP_LONG: