From 2111a6ca365c48ec5e59e9f8c4148fd96a95b334 Mon Sep 17 00:00:00 2001 From: Brad Nelson Date: Fri, 4 Feb 2022 19:26:18 -0800 Subject: [PATCH] Relocate tool, cleanup. --- ueforth/Makefile | 6 +++--- ueforth/tools/memuse.py | 4 ++-- ueforth/{common => tools}/replace.js | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename ueforth/{common => tools}/replace.js (100%) diff --git a/ueforth/Makefile b/ueforth/Makefile index 38dbeed..b7ccaa9 100644 --- a/ueforth/Makefile +++ b/ueforth/Makefile @@ -379,7 +379,7 @@ esp32_target: $(ESP32)/ESP32forth/ESP32forth.ino $(ESP32)/ESP32forth: mkdir -p $@ -ESP32_PARTS = common/replace.js \ +ESP32_PARTS = tools/replace.js \ esp32/template.ino \ common/opcodes.h \ common/extra_opcodes.h \ @@ -395,7 +395,7 @@ ESP32_PARTS = common/replace.js \ $(GEN)/esp32_boot.h $(ESP32)/ESP32forth/ESP32forth.ino: $(ESP32_PARTS) | $(ESP32)/ESP32forth - cat esp32/template.ino | common/replace.js \ + cat esp32/template.ino | tools/replace.js \ VERSION=$(VERSION) \ REVISION=$(REVISION) \ config=@esp32/config.h \ @@ -468,7 +468,7 @@ publish: publish-esp32 publish-linux publish-windows publish-index $(DEPLOY): mkdir -p $@ -REPLACE = common/replace.js \ +REPLACE = tools/replace.js \ COMMON=@site/common.html \ POSIX_COMMON=@site/posix_common.html \ DESKTOP_COMMON=@site/desktop_common.html \ diff --git a/ueforth/tools/memuse.py b/ueforth/tools/memuse.py index 5cf8421..564c52f 100755 --- a/ueforth/tools/memuse.py +++ b/ueforth/tools/memuse.py @@ -76,12 +76,12 @@ columns = [7, 7, 7, 15, 30] print(Columns(['START', 'SIZE', 'PARAMS', 'VOCABULARY', 'WORD'], columns, underline=True)) for item in layout: print(Columns(item, columns)) -print() +print('') columns = [7, 12, 7, 15] print(Columns(['SIZE', 'PARAM SIZE', 'COUNT', 'VOCABULARY'], columns, underline=True)) for item in vocab_table: print(Columns(item, columns)) -print() +print('') columns = [7, 7, 15] print(Columns(['SIZE', 'COUNT', 'CATEGORY'], columns, underline=True)) print(Columns([string_size, items, 'names'], columns)) diff --git a/ueforth/common/replace.js b/ueforth/tools/replace.js similarity index 100% rename from ueforth/common/replace.js rename to ueforth/tools/replace.js