[cwscore-commit] CVS update: MODIFIED: . ...

[Joe Bester]

  User: bester  
  Date: 06/05/12 14:40:33

  Modified:    .        Tag: query_resource_properties_impl_branch xpath.c
  Log:
  fix precedence of math in expression decompiler
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.3.6.2 +10 -0     libxml2/xpath.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: xpath.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/libxml2/xpath.c,v
  retrieving revision 1.1.1.3.6.1
  retrieving revision 1.1.1.3.6.2
  diff -u -b -r1.1.1.3.6.1 -r1.1.1.3.6.2
  --- xpath.c	12 May 2006 18:58:53 -0000	1.1.1.3.6.1
  +++ xpath.c	12 May 2006 19:40:33 -0000	1.1.1.3.6.2
  @@ -1035,10 +1035,14 @@
       }
       fprintf(output, "\n");
   finish:
  +    if (op->op != XPATH_OP_VALUE)
  +    {
       if (op->ch1 >= 0)
   	xmlXPathDebugDumpStepOp(output, comp, &comp->steps[op->ch1], depth + 1);
       if (op->ch2 >= 0)
   	xmlXPathDebugDumpStepOp(output, comp, &comp->steps[op->ch2], depth + 1);
  +
  +    }
   }
   
   /**
  @@ -11500,6 +11504,8 @@
                    infix_op_string = ">";
   	     if (!op->value2)
   		 infix_op_string = "=";
  +             prefix_op_string = "(";
  +             postfix_op_string = ")";
   	     break;
           case XPATH_OP_PLUS:
   	     if (op->value == 0)
  @@ -11510,6 +11516,8 @@
                    infix_op_string = "-";
   	     else if (op->value == 3)
                    infix_op_string = "- -";
  +             prefix_op_string = "(";
  +             postfix_op_string = ")";
   	     break;
           case XPATH_OP_MULT:
   	     if (op->value == 0)
  @@ -11518,6 +11526,8 @@
                    infix_op_string = " div ";
   	     else
                    infix_op_string = " mod ";
  +             prefix_op_string = "(";
  +             postfix_op_string = ")";
   	     break;
           case XPATH_OP_UNION:
                infix_op_string = "|"; break;