* expr.c (operand): Remove `if (0 && ..)' statement and

        subsequently unused target_op label.  Collapse `if (1 || ..)'
        statement.
        * app.c (do_scrub_chars): Remove unused case 0, as it is handled
        separately above the switch.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 942cbf7630ff56800b86cd321d1e9e23adf9d941..c099fb015974f92d3b63599ad92809fd827ddce7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-09  Ben Elliston  <bje@au.ibm.com>
+
+       * expr.c (operand): Remove `if (0 && ..)' statement and
+       subsequently unused target_op label.  Collapse `if (1 || ..)'
+       statement.
+       * app.c (do_scrub_chars): Remove unused case 0, as it is handled
+       separately above the switch.
+
 2006-05-08  Nick Clifton  <nickc@redhat.com>
 
        PR gas/2623

diff --git a/gas/app.c b/gas/app.c
index 275ad68ebb0b4eba6eb925280942bd2243e89faf..882a128b1aa9219f0d5e64112d40c2f023808a1a 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -888,9 +888,6 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 
          switch (state)
            {
-           case 0:
-             state++;
-             goto recycle;     /* Punted leading sp */
            case 1:
              /* We can arrive here if we leave a leading whitespace
                 character at the beginning of a line.  */

diff --git a/gas/expr.c b/gas/expr.c
index 69f0aaccdb64b42da016bf5ad54aa08b35c3b22f..746d7a2d889b4677a9694d14d69b832b7267cfb9 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1003,11 +1003,6 @@ operand (expressionS *expressionP, enum expr_mode mode)
     case '-':
     case '+':
       {
-       /* Do not accept ++e or --e as +(+e) or -(-e)
-          Disabled, since the preprocessor removes whitespace.  */
-       if (0 && (c == '-' || c == '+') && *input_line_pointer == c)
-         goto target_op;
-       
        operand (expressionP, mode);
        if (expressionP->X_op == O_constant)
          {
@@ -1291,7 +1286,6 @@ operand (expressionS *expressionP, enum expr_mode mode)
        }
       else
        {
-       target_op:
          /* Let the target try to parse it.  Success is indicated by changing
             the X_op field to something other than O_absent and pointing
             input_line_pointer past the expression.  If it can't parse the
@@ -1552,11 +1546,7 @@ operator (int *num_chars)
 
     case '+':
     case '-':
-      /* Do not allow a++b and a--b to be a + (+b) and a - (-b)
-        Disabled, since the preprocessor removes whitespace.  */
-      if (1 || input_line_pointer[1] != c)
-       return op_encoding[c];
-      return O_illegal;
+      return op_encoding[c];
 
     case '<':
       switch (input_line_pointer[1])