diff options
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | src/mem/slicc/parser.py | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -45,4 +45,4 @@ Copyright (c) 1994-1996 Carnegie-Mellon University. Copyright (c) 1993-1994 Christopher G. Demetriou Copyright (c) 1997-2002 Makoto Matsumoto and Takuji Nishimura Copyright (c) 1998,2001 Manuel Bouyer. -Copyright (c) 2016 Google Inc. +Copyright (c) 2016-2017 Google Inc. diff --git a/src/mem/slicc/parser.py b/src/mem/slicc/parser.py index 4afe0d367..5c2b212a2 100644 --- a/src/mem/slicc/parser.py +++ b/src/mem/slicc/parser.py @@ -1,4 +1,5 @@ # Copyright (c) 2009 The Hewlett-Packard Development Company +# Copyright (c) 2017 Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,6 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Authors: Nathan Binkert +# Lena Olson import os.path import re @@ -158,7 +160,8 @@ class SLICC(Grammar): precedence = ( ('left', 'INCR', 'DECR'), - ('left', 'AND', 'OR'), + ('left', 'OR'), + ('left', 'AND'), ('left', 'EQ', 'NE'), ('left', 'LT', 'GT', 'LE', 'GE'), ('left', 'RIGHTSHIFT', 'LEFTSHIFT'), |