From b5d88fdedd08034235f26bd33a00ff6ba810fac8 Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 16 Jun 2012 15:49:53 +0000
Subject: [PATCH] Mark commutative operators as such (no change in code until
 now).

git-svn-id: svn://svn.cc65.org/cc65/trunk@5720 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/cc65/expr.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 0bafb8ccf..894545229 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -48,6 +48,7 @@
 
 /* Generator attributes */
 #define GEN_NOPUSH	0x01		/* Don't push lhs */
+#define GEN_COMM        0x02            /* Operator is commutative */
 
 /* Map a generator function and its attributes to a token */
 typedef struct {
@@ -1756,7 +1757,7 @@ void hie10 (ExprDesc* Expr)
 
      	       	/* A typecast */
     	       	TypeCast (Expr);
-
+                        
      	    } else {
 
                 /* An expression */
@@ -2287,10 +2288,10 @@ static void hie9 (ExprDesc *Expr)
 /* Process * and / operators. */
 {
     static const GenDesc hie9_ops[] = {
-        { TOK_STAR,   	GEN_NOPUSH,	g_mul   },
-        { TOK_DIV,    	GEN_NOPUSH,     g_div   },
-        { TOK_MOD,    	GEN_NOPUSH,     g_mod   },
-        { TOK_INVALID,  0,              0       }
+        { TOK_STAR,     GEN_NOPUSH | GEN_COMM,  g_mul   },
+        { TOK_DIV,      GEN_NOPUSH,             g_div   },
+        { TOK_MOD,      GEN_NOPUSH,             g_mod   },
+        { TOK_INVALID,  0,                      0       }
     };
     int UsedGen;
 
@@ -2751,8 +2752,8 @@ static void hie4 (ExprDesc* Expr)
 /* Handle & (bitwise and) */
 {
     static const GenDesc hie4_ops[] = {
-        { TOK_AND,    	GEN_NOPUSH,     g_and   },
-        { TOK_INVALID,  0,              0       }
+        { TOK_AND,      GEN_NOPUSH | GEN_COMM,  g_and   },
+        { TOK_INVALID,  0,                      0       }
     };
     int UsedGen;
 
@@ -2765,8 +2766,8 @@ static void hie3 (ExprDesc* Expr)
 /* Handle ^ (bitwise exclusive or) */
 {
     static const GenDesc hie3_ops[] = {
-        { TOK_XOR,    	GEN_NOPUSH,     g_xor   },
-        { TOK_INVALID,  0,              0       }
+        { TOK_XOR,     	GEN_NOPUSH | GEN_COMM,  g_xor   },
+        { TOK_INVALID,  0,                      0       }
     };
     int UsedGen;
 
@@ -2779,8 +2780,8 @@ static void hie2 (ExprDesc* Expr)
 /* Handle | (bitwise or) */
 {
     static const GenDesc hie2_ops[] = {
-        { TOK_OR,    	GEN_NOPUSH,     g_or    },
-        { TOK_INVALID,  0,              0       }
+        { TOK_OR,    	GEN_NOPUSH | GEN_COMM,  g_or    },
+        { TOK_INVALID,  0,                      0       }
     };
     int UsedGen;
 
-- 
2.39.5