Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgraded to 3.8 (text method changes) and fixed some bugs in

Browse Source 
tree_to_nomsu.
This commit is contained in:
Bruce Hill 2018-09-10 16:26:08 -07:00
parent c859eac2be
commit 7c6047254e
37 changed files with 101 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility/2.3.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <2.3 to Nomsu 2.3

2
compatibility/2.4.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <2.4 to Nomsu 2.4

2
compatibility/2.5.5.5.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <2.5.5.5 to Nomsu 2.5.5.5

2
compatibility/2.5.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <2.5 to Nomsu 2.5

2
compatibility/2.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu 1 to Nomsu 2

2
compatibility/3.5.5.6.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <3.5.5.6 to Nomsu 3.5.5.6

2
compatibility/3.6.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <3.6 to 3.6

2
compatibility/3.7.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <3.7 to 3.7

2
compatibility/3.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines upgrades from Nomsu <=2 to Nomsu 3

14
compatibility/compatibility.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains code for defining ways to upgrade code between different versions
of Nomsu.
@ -26,7 +26,7 @@ compile [upgrade action %actions to %version as %body] to:
if (%action.%i.type is "Var"):
%replacements.(%action.%i.1) = "\(\%tree as lua id)[\%i]"
%needs_mangle = (no)
define mangler
local action [make tree %t]:
when:
(%t is "Var" syntax tree):
@ -34,10 +34,7 @@ compile [upgrade action %actions to %version as %body] to:
return %replacements.(%t.1)
..else:
external %needs_mangle = (yes)
return ".."
\(%t.type){source=\(quote "\(%t.source)"), \(..)
quote "\(%t.1) \000\(=lua "string.format('%X', __MANGLE_INDEX)")"
..}
return "\(%t.type){source=\(quote "\(%t.source)"), \(quote (mangle %t.1))}"
(%t is syntax tree):
%args = []
@ -47,7 +44,7 @@ compile [upgrade action %actions to %version as %body] to:
..else:
%args::add "\(%k)=\(make tree %v)"
return "\(%t.type){\(%args joined with ", ")}"
return "\(%t.type){\(%args::joined with ", ")}"
else: return (quote %t)
@ -58,8 +55,7 @@ compile [upgrade action %actions to %version as %body] to:
upgrade_action_1_to_2_via_3(\(quote %action.stub), \(%version as lua expr), function(\(..)
\%tree as lua id
..)
\("__MANGLE_INDEX = (__MANGLE_INDEX or 0) + 1\n " if (%needs_mangle) else "")\
..return \%retval
return \%retval
end)
return %lua

2
core/collections.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains code that supports manipulating and using collections like lists
and dictionaries.

2
core/control_flow.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains compile-time actions that define basic control flow structures
like "if" statements and loops.

2
core/coroutines.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines the code that creates and manipulates coroutines

6
core/errors.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains basic error reporting code
@ -27,7 +27,9 @@ compile [assume %a == %b] to:
do
local \(mangle "a"), \(mangle "b") = \(%a as lua expr), \(%b as lua expr)
if \(mangle "a") ~= \(mangle "b") then
error(\(quote "\%assumption").."\\n"..tostring(\(mangle "a")).." != "..tostring(\(mangle "b")), 0)
error(\(quote "\%assumption").."\\n"..tostring(\(mangle "a")).." != "..tostring(\(..)
mangle "b"
..), 0)
end
end

29
core/id.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
A simple UUID function based on RFC 4122: http://www.ietf.org/rfc/rfc4122.txt
@ -10,14 +10,16 @@ use "core/control_flow.nom"
%NaN_surrogate = {}
%nil_surrogate = {}
%obj_by_id = {}
set %obj_by_id's metatable to {__mode: "v"}
set %obj_by_id's metatable to {__mode:"v"}
%id_by_obj = {}
set %id_by_obj's metatable to {..}
__mode: "k"
set %id_by_obj 's metatable to {..}
__mode:"k"
__index: (..)
[%self, %key] ->:
if (%key == (nil)): return %self.%nil_surrogate
if (%key != %key): return %self.%NaN_surrogate
if (%key == (nil)):
return %self.%nil_surrogate
if (%key != %key):
return %self.%NaN_surrogate
--- %retry ---
%id = (uuid)
if (%obj_by_id.%id != (nil)): go to %retry
@ -28,16 +30,18 @@ set %id_by_obj's metatable to {..}
action [uuid]:
# Set all the other bits to randomly (or pseudo-randomly) chosen values.
%bytes = [..]
randint (2^(4*8)), # time-low
randint (2^(2*8)), # time-mid
randint (2^(2*8 - 4)), # time-high-and-version
randint (2^(1*8 - 2)), # clock-seq-and-reserved
randint (2^(1*8)), # clock-seq-low
randint (2^(3*8)), randint (2^(3*8)), # node
# time-low, time-mid, time-high-and-version
randint (2 ^ (4 * 8)), randint (2 ^ (2 * 8)), randint (2 ^ (2 * 8 - 4))
# clock-seq-and-reserved, clock-seq-low
randint (2 ^ (1 * 8 - 2)), randint (2 ^ (1 * 8)), randint (2 ^ (3 * 8))
# node
randint (2 ^ (3 * 8))
# Set the four most significant bits (bits 12 through 15) of the
# time_hi_and_version field to the 4-bit version number from
# Section 4.1.3.
%bytes.3 += 0x4000
# Set the two most significant bits (bits 6 and 7) of the
# clock_seq_hi_and_reserved to zero and one, respectively.
%bytes.4 += 0xC0
@ -52,5 +56,4 @@ test:
seed random with 0
assume ((id of %x) != (id of []))
seed random
action [id of %, %'s id, %' id] %id_by_obj.%

2
core/io.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains basic input/output code

10
core/math.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines some common math literals and functions
@ -73,27 +73,27 @@ compile [all of %items, all %items] to:
unless (%items.type is "List"):
return (Lua value "utils.all(\(%items as lua expr))")
%clauses = ((% as lua expr) for % in %items)
return (Lua value "(\(%clauses joined with " and "))")
return (Lua value "(\(%clauses::joined with " and "))")
parse [not all of %items, not all %items] as (not (all of %items))
compile [any of %items, any %items] to:
unless (%items.type is "List"):
return (Lua value "utils.any(\(%items as lua expr))")
%clauses = ((% as lua expr) for % in %items)
return (Lua value "(\(%clauses joined with " or "))")
return (Lua value "(\(%clauses::joined with " or "))")
parse [none of %items, none %items] as (not (any of %items))
compile [sum of %items, sum %items] to:
unless (%items.type is "List"):
return (Lua value "utils.sum(\(%items as lua expr))")
%clauses = ((% as lua expr) for % in %items)
return (Lua value "(\(%clauses joined with " + "))")
return (Lua value "(\(%clauses::joined with " + "))")
compile [product of %items, product %items] to:
unless (%items.type is "List"):
return (Lua value "utils.product(\(%items as lua expr))")
%clauses = ((% as lua expr) for % in %items)
return (Lua value "(\(%clauses joined with " * "))")
return (Lua value "(\(%clauses::joined with " * "))")
action [avg of %items, average of %items] (=lua "(utils.sum(\%items)/#\%items)")
compile [min of %items, smallest of %items, lowest of %items] to (..)

5
core/metaprogramming.nom
View File

@ -1,9 +1,9 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This File contains actions for making actions and compile-time actions and some helper
functions to make that easier.
lua> "NOMSU_CORE_VERSION = 7"
lua> "NOMSU_CORE_VERSION = 8"
lua> ".."
do
local mangle_index = 0
@ -18,6 +18,7 @@ lua> ".."
COMPILE_ACTIONS["define mangler"] = function(nomsu, tree)
return LuaCode(tree.source, "local mangle_1 = mangler()")
end
lua> ".."
COMPILE_ACTIONS["1 -> 2"] = function(nomsu, tree, \%args, \%body)
local lua = LuaCode.Value(tree.source, "(function(")

2
core/operators.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains definitions of operators like "+" and "and".

2
core/scopes.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains definitions pertaining to variable scoping

26
core/text.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains some definitions of text escape sequences, including ANSI console
color codes.
@ -26,36 +26,12 @@ test:
assume ("asdf"::uppercase) == "ASDF"
assume ("asdf"::with "s" -> "X") == "aXdf"
assume ("one\ntwo\n"::lines) == ["one", "two", ""]
parse [アクション %spec %body] as (action %spec %body)
test:
%こんにちは = "こんにちは"
アクション [% と言う] "\(%)世界"
assume (%こんにちは と言う) == "こんにちは世界"
# Text functions
parse [%texts joined with %glue] as (%texts::joined with %glue)
parse [%texts joined, joined %texts] as (%texts::joined)
parse [byte %i of %text] as (%text::byte %i)
parse [bytes %start to %stop of %text] as (%text::bytes %start to %stop)
parse [bytes of %text] as (%text::bytes)
parse [capitalized %text, %text capitalized] as (%text::capitalized)
parse [uppercase %text, %text uppercase] as (%text::uppercase)
parse [..]
%text with %sub instead of %patt, %text with %patt replaced by %sub
%text s/ %patt / %sub
..as (%text::with %patt -> %sub)
parse [%text matches %pattern] as (%text::matches %pattern)
parse [%text matching %pattern] as ((%text::matching %pattern).1)
compile [for %match in %text matching %patt %body] to (..)
Lua ".."
for \(%match as lua expr) in (\(%text as lua expr)):gmatch(\(%patt as lua expr)) do
\(%body as lua statements)
\(compile as (===next %match ===))
end
\(compile as (===stop %match ===))
compile [%expr for %match in %text matching %patt] to (..)
Lua value ".."
(function()

4
examples/how_do_i.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
# How do I...
# Write a comment? Put a # and go till the end of the line
# How do I write a multi-line comment?
@ -190,7 +190,7 @@ action [..]
I think %worse_things are worse than %better_things
I like %better_things more than %worse_things
..:
say "\(%better_things capitalized) rule and \%worse_things drool!"
say "\(%better_things::capitalized) rule and \%worse_things drool!"
I like "dogs" more than "cats"
I think "chihuahuas" are worse than "corgis"

6
lib/base64.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines actions for encoding/decoding base 64, as specified in:
https://tools.ietf.org/html/rfc4648
@ -39,7 +39,7 @@ action [base64 %str, base64 encode %str, %str base64]:
%chars::add "="
%chars::add "="
return (%chars joined)
return (%chars::joined)
action [chr %] (=lua "string.char(\%)")
action [decode base64 %str, %str base64 decoded, base64 decode %str]:
@ -52,4 +52,4 @@ action [decode base64 %str, %str base64 decoded, base64 decode %str]:
if (%str.(%i + 3) == "="): stop
%chars::add (chr (((%indices.3 & 3) << 6) + %indices.4))
return (%chars joined)
return (%chars::joined)

2
lib/consolecolor.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines actions for ANSI console color escape codes.

7
lib/file_hash.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines some actions for hashing files and looking up files by hash.
@ -31,9 +31,10 @@ if %use_sha1:
return (base64 %hash)
..else:
# TODO: remove warning?
say "\027[31;1mWARNING: OpenSSL module not found. Defaulting to a non-cryptographically secure hash function.\027[0m"
say ".."
\027[31;1mWARNING: OpenSSL module not found. Defaulting to a non-cryptographically secure hash function.\027[0m
action [hash %]:
%bytes = (bytes of %)
%bytes = (%::bytes)
%hash = (%bytes.1 << 7)
for %i in 2 to (size of %bytes):
%hash = ((1000003 * %hash) ~ %bytes.%i)

6
lib/object.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains the implementation of an Object-Oriented programming system.
@ -8,7 +8,7 @@ test:
my action [set up]: %me.barks or= 0
my action [bark, woof]:
%barks = ("Bark!" for % in 1 to %me.barks)
return (%barks joined with " ")
return (%barks::joined with " ")
my action [get pissed off]: %me.barks += 1
@ -31,7 +31,7 @@ test:
my action [sploot] "splooted"
my action [bark, woof]:
%barks = ("Yip!" for % in 1 to %me.barks)
return (%barks joined with " ")
return (%barks::joined with " ")
%corg = (new Corgi)
assume (%corg.barks == 0)

4
lib/os.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file defines some actions that interact with the operating system and filesystem.
@ -66,4 +66,4 @@ action [source lines of %tree]:
(..)
(line % in %file) for % in (line number of %source.start in %file) to (..)
line number of %source.stop in %file
..joined with "\n"
..::joined with "\n"

2
lib/training_wheels.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
This file contains a set of definitions that bring some familiar language features
from other languages into nomsu (e.g. "||" and "continue")

2
lib/version.nom
View File

@ -1,3 +1,3 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
# This file sets the current library version.
lua> "NOMSU_LIB_VERSION = 6"

15
nomsu_compiler.lua
View File

@ -963,8 +963,15 @@ do
end
local space = MAX_LINE - pos
local inline
local check
check = function(prefix, nomsu, tree)
if type(tree) == 'number' then
require('ldt').breakpoint()
end
return coroutine.yield(prefix, nomsu, tree)
end
for prefix, nomsu, tree in coroutine.wrap(function()
inline = self:tree_to_inline_nomsu(t, false, coroutine.yield)
inline = self:tree_to_inline_nomsu(t, false, check)
end) do
local len = #tostring(nomsu)
if prefix + len > MAX_LINE then
@ -1083,7 +1090,11 @@ do
nomsu:append(pop_comments(tree.source.stop, '\n'))
return nomsu
elseif "EscapedNomsu" == _exp_0 then
return NomsuCode(tree.source, "\\", recurse(tree[1], 1))
local val_nomsu = recurse(tree[1], 1)
if tree[1].type == "Action" and not val_nomsu:is_multiline() then
val_nomsu:parenthesize()
end
return NomsuCode(tree.source, "\\", val_nomsu)
elseif "Block" == _exp_0 then
local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
for i, line in ipairs(tree) do

10
nomsu_compiler.moon
View File

@ -621,7 +621,10 @@ with NomsuCompiler
if type(pos) != 'number' then pos = #tostring(pos)\match("[ ]*([^\n]*)$")
space = MAX_LINE - pos
local inline
for prefix, nomsu, tree in coroutine.wrap(-> inline = @tree_to_inline_nomsu(t, false, coroutine.yield))
check = (prefix,nomsu,tree)->
if type(tree) == 'number' then require('ldt').breakpoint!
coroutine.yield(prefix,nomsu,tree)
for prefix, nomsu, tree in coroutine.wrap(-> inline = @tree_to_inline_nomsu(t, false, check))
len = #tostring(nomsu)
break if prefix+len > MAX_LINE
break if tree.type == "Block" and (#tree > 1 or len > 20)
@ -700,7 +703,10 @@ with NomsuCompiler
return nomsu
when "EscapedNomsu"
return NomsuCode tree.source, "\\", recurse(tree[1], 1)
val_nomsu = recurse(tree[1], 1)
if tree[1].type == "Action" and not val_nomsu\is_multiline!
val_nomsu\parenthesize!
return NomsuCode tree.source, "\\", val_nomsu
when "Block"
nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))

4
tools/autoformat.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Auto-format Nomsu code. Usage:
nomsu tools/autoformat.nom [-i] file1 file2 directory1 ...
@ -15,7 +15,7 @@ if (%args.1 is "-i"):
for %path in %args:
for file %filename in %path:
unless (%filename matches "%.nom$"): do next %filename
unless (%filename::matches "%.nom$"): do next %filename
%formatted = ".."
#!/usr/bin/env nomsu -V\(Nomsu version)
\((parse (read file %filename) from %filename) as nomsu)

4
tools/find_action.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Find an action by its stub. Usage:
nomsu tools/find_action.nom "foo %" file1 file2 directory1 ...
@ -12,7 +12,7 @@ say "Looking for stub: \%stub..."
%files = ((command line args).% for % in 2 to (size of (command line args)))
for %path in %files:
for file %filename in %path:
unless (%filename matches "%.nom$") (do next %filename)
unless (%filename::matches "%.nom$") (do next %filename)
%file = (read file %filename)
%tree = (parse %file from %filename)
for %t in recursive %tree:

4
tools/parse.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Tool to print out a parse tree of files in an easy-to-read format. Usage:
nomsu tools/parse.nom file1 file2 directory1 ...
@ -32,5 +32,5 @@ action [print tree %t at indent %indent]:
for %path in (=lua "arg"):
for file %filename in %path:
unless (%filename matches "%.nom$"): do next %filename
unless (%filename::matches "%.nom$"): do next %filename
print tree (parse (read file %filename) from %filename) at indent ""

4
tools/replace.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Tool to find and replace one tree with another.
nomsu tools/replace.nom [-i] tree_to_replace replacement file1 file2 directory1 ...
@ -21,7 +21,7 @@ if ((size of %args) < 3):
%replacement = (parse (%args::remove index 1))
for %path in %args:
for file %filename in %path:
unless (any [%filename matches "%.nom$", %filename == "-", %filename == "stdin"]):
unless (any [%filename::matches "%.nom$", %filename == "-", %filename == "stdin"]):
do next %filename
%tree = (parse (read file %filename) from %filename)
%tree2 = (%tree with %pattern ~> %replacement)

8
tools/test.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Tool to run all tests in a file (i.e. the code block inside a call to 'test %'). Usage:
nomsu tools/test.nom file1 file2 directory1 ...
@ -14,13 +14,13 @@ if (%args.1 == "-v"):
# Make sure all the files get run
for %path in (command line args):
for file %filename in %path:
if (%filename matches "%.nom$"): use %filename
if (%filename::matches "%.nom$"): use %filename
for %path in (command line args): use %path
%tests = ((=lua "Source:from_string(\%s)") = %t for %s = %t in (tests))
for %path in (command line args):
for file %filename in %path:
unless (%filename matches "%.nom$"): do next %filename
unless (%filename::matches "%.nom$"): do next %filename
%file_tests = []
for %src = %test in %tests:
if (%src.filename == %filename):
@ -32,7 +32,7 @@ for %path in (command line args):
if %verbose: say ""
for % in %file_tests:
if %verbose:
say " \(yellow (%.test with "\n" replaced by "\n "))"
say " \(yellow (%.test::with "\n" -> "\n "))"
run %.test
if %verbose: say (green "PASS")

4
tools/upgrade.nom
View File

@ -1,4 +1,4 @@
#!/usr/bin/env nomsu -V3.7.5.6
#!/usr/bin/env nomsu -V3.8.7.6
#
Tool to automatically update code from old versions of Nomsu. Usage:
nomsu tools/upgrade.nom [-i] file1 file2 directory1 ...
@ -21,7 +21,7 @@ if (%args.1 is "-t"):
for %path in %args:
for file %filename in %path:
unless (%filename matches "%.nom$"): do next %filename
unless (%filename::matches "%.nom$"): do next %filename
%tree = (parse (read file %filename) from %filename)
%uptree = (%tree upgraded)
%text = ".."