From 529d7087eb28e66d580c781db4d63e78d7f28e49 Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.com>
Date: Mon, 28 Jun 2021 16:41:36 -0500
Subject: [PATCH] fix operatore precedence of */ vs +- in pioasm

---
 tools/pioasm/gen/parser.cpp | 18 +++++++++---------
 tools/pioasm/parser.yy      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/pioasm/gen/parser.cpp b/tools/pioasm/gen/parser.cpp
index 1e41a09..c9bd036 100644
--- a/tools/pioasm/gen/parser.cpp
+++ b/tools/pioasm/gen/parser.cpp
@@ -1945,9 +1945,9 @@ namespace yy {
      -52,    97,   132,   -52,   -52,   -52,   -52,    87,   -52,   -52,
        1,     5,     5,     5,     5,   -52,     5,     5,   -52,   -52,
      -52,   -52,    29,   118,     5,   -52,   170,   -52,   -52,   -52,
-     107,   177,     1,     1,     1,     1,     1,     1,     1,   -52,
+     182,   177,     1,     1,     1,     1,     1,     1,     1,   -52,
      -52,   -51,   -52,   177,   119,   -52,   -52,   -52,   -52,   -52,
-     -52,   -52,    82,   -52,   -52,   -52,   107,   107,   184,   184,
+     -52,   -52,    82,   -52,   -52,   -52,   182,   182,   107,   107,
      -52,   -52,   -52,   -52,   -52,   -52,   -52,   -52,   -52,   -52,
      -52,   -52,   -52,   -52,   -52
   };
@@ -1979,9 +1979,9 @@ namespace yy {
   const short
   parser::yypgoto_[] =
   {
-     -52,   -52,   -52,    98,   -52,   -52,   -52,    -7,   -14,   168,
-     -52,    99,   102,   -52,   148,    25,   -52,   -52,   -52,   -52,
-     -52,   -52,   -52,   -52,   128,   -52,   199
+     -52,   -52,   -52,   102,   -52,   -52,   -52,    -7,   -14,   172,
+     -52,    99,   103,   -52,   146,    25,   -52,   -52,   -52,   -52,
+     -52,   -52,   -52,   -52,   128,   -52,   198
   };
 
   const short
@@ -2014,8 +2014,8 @@ namespace yy {
       12,    13,    14,    15,    16,    17,    18,    19,    20,   149,
      163,   176,   142,   143,   144,   145,   146,   147,   148,   165,
      142,   143,   144,   145,   146,   147,   148,   142,   143,   144,
-     145,   146,   147,   148,   142,   143,   135,    99,   146,   147,
-     148,   125,   139,   131,   138,    36
+     145,   146,   147,   148,   144,   145,   146,   147,   148,   125,
+     135,    99,   139,   131,    36,   138
   };
 
   const unsigned char
@@ -2040,8 +2040,8 @@ namespace yy {
       31,    32,    33,    34,    35,    36,    37,    38,    39,     7,
       52,    52,    10,    11,    12,    13,    14,    15,    16,     9,
       10,    11,    12,    13,    14,    15,    16,    10,    11,    12,
-      13,    14,    15,    16,    10,    11,    98,    29,    14,    15,
-      16,    53,   103,    75,   102,     6
+      13,    14,    15,    16,    12,    13,    14,    15,    16,    53,
+      98,    29,   103,    75,     6,   102
   };
 
   const signed char
diff --git a/tools/pioasm/parser.yy b/tools/pioasm/parser.yy
index f1f51dd..467ca89 100644
--- a/tools/pioasm/parser.yy
+++ b/tools/pioasm/parser.yy
@@ -124,8 +124,8 @@
 
 
 %left REVERSE
-%left MULTIPLY DIVIDE
 %left PLUS MINUS
+%left MULTIPLY DIVIDE
 %left AND OR XOR
 
 %printer { yyo << "..."; } <*>;