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

Slight tweaking and updating syntax

Browse Source
This commit is contained in:
Bruce Hill 2019-03-20 14:15:17 -07:00
parent a09b66d725
commit 12db69cdd6
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tools/format.nom
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nomsu -V6.15.13.8 #!/usr/bin/env nomsu -V7
# ###
Auto-format Nomsu code. Usage: Auto-format Nomsu code. Usage:
nomsu -t format [-i] file1 file2... nomsu -t format [-i] file1 file2...
@ -14,7 +14,7 @@ use "commandline"
command line program with $args: command line program with $args:
$filenames = $args.extras $filenames = $args.extras
if ((#$filenames) == 0): if (#$filenames == 0):
say (" say ("
Warning: reading from stdin (ctrl-d to abort). To avoid this message, use nomsu -t format - Warning: reading from stdin (ctrl-d to abort). To avoid this message, use nomsu -t format -
") ")
@ -25,20 +25,17 @@ command line program with $args:
unless $file: unless $file:
fail "File does not exist: \$filename" fail "File does not exist: \$filename"
$leading_indent = ($file, matching "^\n*([ ]*)") $leading_indent = ($file, matching "^\n*([ ]*)")
$code = (NomsuCode from ($Source $filename 1 (size of $file)) $file) $code = (NomsuCode from (Source $filename 1 #$file) $file)
try: try:
$tree = ($code parsed) $tree = ($code parsed)
$formatted = ($tree as nomsu, text, indented $leading_indent)
..if it fails with $msg: ..if it fails with $msg:
$tree = (nil)
if $args.q: if $args.q:
$formatted = $file $formatted = $file
..else: ..else:
say $msg say $msg
do next $filename
if $tree:
$formatted = ($tree as nomsu, text, indented $leading_indent)
if $formatted:
if $args.i: if $args.i:
write $formatted to file $filename write $formatted to file $filename
..else: ..else: