[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a6bb294d9dd11334e8363c999f42a9dfdec79ecf
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 18 05:30:37 2003 +0000

            Patch from Harri Porten reviewed by me.
    
    	- fixed 3487371 - operator precedence for bitwise or, xor and and is wrong
    
            * kjs/grammar.y: Correct the precedence.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5564 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3c7fcb7..96a1b10 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Patch from Harri Porten reviewed by me.
+
+	- fixed 3487371 - operator precedence for bitwise or, xor and and is wrong
+
+        * kjs/grammar.y: Correct the precedence.
+
 2003-11-16  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.
diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/kjs/grammar.y
index c46b850..ec599b7 100644
--- a/JavaScriptCore/kjs/grammar.y
+++ b/JavaScriptCore/kjs/grammar.y
@@ -332,12 +332,12 @@ BitwiseANDExpr:
 
 BitwiseXORExpr:
     BitwiseANDExpr
-  | BitwiseXORExpr '^' EqualityExpr { $$ = new BitOperNode($1, OpBitXOr, $3); }
+  | BitwiseXORExpr '^' BitwiseANDExpr { $$ = new BitOperNode($1, OpBitXOr, $3); }
 ;
 
 BitwiseORExpr:
     BitwiseXORExpr
-  | BitwiseORExpr '|' EqualityExpr  { $$ = new BitOperNode($1, OpBitOr, $3); }
+  | BitwiseORExpr '|' BitwiseXORExpr { $$ = new BitOperNode($1, OpBitOr, $3); }
 ;
 
 LogicalANDExpr:

-- 
WebKit Debian packaging