From 750a8091691f8bfe5eabf3fed911ad47ad71f468 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 14 Aug 2021 06:29:28 -0700 Subject: [PATCH] python,scons: Break slicc's dependence on m5.util. The only dependence remaining was a small utility function makeDir which was only used by slicc. This change moves it to where it's used, and cleans up the additions to sys.path a little. Change-Id: I7415b53ea2e9c378b6dbf342b8b3a966f48e117c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49397 Tested-by: kokoro Reviewed-by: Hoa Nguyen Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/mem/slicc/symbols/SymbolTable.py | 11 ++++++++++- src/python/m5/util/__init__.py | 9 --------- util/slicc | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/mem/slicc/symbols/SymbolTable.py b/src/mem/slicc/symbols/SymbolTable.py index fb01b01b8e..f9f7a1041e 100644 --- a/src/mem/slicc/symbols/SymbolTable.py +++ b/src/mem/slicc/symbols/SymbolTable.py @@ -25,13 +25,22 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from m5.util import makeDir +import os from slicc.generate import html from slicc.symbols.StateMachine import StateMachine from slicc.symbols.Type import Type from slicc.util import Location +def makeDir(path): + """Make a directory if it doesn't exist. If the path does exist, + ensure that it is a directory""" + if os.path.exists(path): + if not os.path.isdir(path): + raise AttributeError("%s exists but is not directory" % path) + else: + os.mkdir(path) + class SymbolTable(object): def __init__(self, slicc): self.slicc = slicc diff --git a/src/python/m5/util/__init__.py b/src/python/m5/util/__init__.py index a99012ee06..71621e7fb6 100644 --- a/src/python/m5/util/__init__.py +++ b/src/python/m5/util/__init__.py @@ -155,15 +155,6 @@ def printList(items, indent=4): line += item print(line) -def makeDir(path): - """Make a directory if it doesn't exist. If the path does exist, - ensure that it is a directory""" - if os.path.exists(path): - if not os.path.isdir(path): - raise AttributeError("%s exists but is not directory" % path) - else: - os.mkdir(path) - def isInteractive(): """Check if the simulator is run interactively or in a batch environment""" diff --git a/util/slicc b/util/slicc index bc5f50dc89..201008ba01 100755 --- a/util/slicc +++ b/util/slicc @@ -31,7 +31,6 @@ if __name__ == "__main__": base = dirname(__file__) sys.path.insert(1, join(base, "../src/mem")) - sys.path.insert(1, join(base, "../src/python")) sys.path.insert(1, join(base, "../build_tools")) sys.path.insert(1, join(base, "../ext/ply"))