aboutsummaryrefslogtreecommitdiff
path: root/lib/tools
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2019-02-06 15:33:10 -0800
committerBruce Hill <bruce@bruce-hill.com>2019-02-06 15:34:00 -0800
commit057f5b74ebb7851f6ba824129b3e3316cae23260 (patch)
tree2561ca637f5db834cb8f8b82831cbbbbc26d71ae /lib/tools
parent618e48ad98c0e2b36eb22c75251dddc141d822e6 (diff)
Moving to better, more centralized versioning system. Now the Nomsu
version is just defined as a list at the top of nomsu.moon, and uses X.Y.Z form instead of X.Y.Z.W. Added a ([...], from 2) method and a ([...], up to 5) method, and fixed a few upgrade bugs.
Diffstat (limited to 'lib/tools')
-rwxr-xr-xlib/tools/repl.nom4
-rwxr-xr-xlib/tools/upgrade.nom4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/tools/repl.nom b/lib/tools/repl.nom
index 5e8336f..716c899 100755
--- a/lib/tools/repl.nom
+++ b/lib/tools/repl.nom
@@ -11,7 +11,7 @@ use "commandline"
external:
(help) means:
say ("
- This is the Nomsu v\(Nomsu version) interactive console.
+ This is the Nomsu v\($(NOMSU VERSION), joined with ".") interactive console.
You can type in Nomsu code here and hit 'enter' twice to run it.
To exit, type 'exit' or 'quit' and hit enter twice.
")
@@ -23,7 +23,7 @@ external:
command line program with $args:
say ("
- \(bright)\(underscore)Welcome to the Nomsu v\(Nomsu version) interactive console!\
+ \(bright)\(underscore)Welcome to the Nomsu v\($(NOMSU VERSION), joined with ".") interactive console!\
..\(reset color)
press 'enter' twice to run a command
type 'tutorial' to run the tutorial
diff --git a/lib/tools/upgrade.nom b/lib/tools/upgrade.nom
index 30b6cab..f4a2b8c 100755
--- a/lib/tools/upgrade.nom
+++ b/lib/tools/upgrade.nom
@@ -20,7 +20,7 @@ command line program with $args:
use $start_version
..if it fails:
fail "Could not find upgrade rules for \$start_version"
- $version = ($args."upgrade-to" or (Nomsu version))
+ $version = ($args."upgrade-to" or $(NOMSU VERSION))
$test = ($args.t or $args.test)
for $filename in $args.extras:
$file = (read file $filename)
@@ -30,7 +30,7 @@ command line program with $args:
$code = (NomsuCode from (Source $filename 1 (size of $file)) $file)
$tree = ($code parsed $start_version)
$uptree =
- $tree upgraded from ($start_version or ($tree.version or (Nomsu version))) to
+ $tree upgraded from ($start_version or ($tree.version or $(NOMSU VERSION))) to
$version
$text = "\$leading_indent\($uptree as nomsu, text, with "\n" -> "\n\$leading_indent")"
when: