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

Switching more verbose ("Action" tree with "foo" $x) syntax to `(foo

Browse Source 
`$x) when possible
This commit is contained in:
Bruce Hill 2019-03-20 16:16:41 -07:00
parent e665d9725c
commit 938adbfe44
12 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/compatibility/2.4.nom
View File

@ -30,7 +30,7 @@ upgrade $tree to "2.4" as:
$new_lines, add $line
($line.stub == "* else"):
$new_lines, add ("Action" tree with "else" $line.3)
$new_lines, add (else `$line.3)
else:
$conditions, add $line.2
@ -44,9 +44,7 @@ upgrade $tree to "2.4" as:
")
$conditions = []
return
"Action" tree with "when"
"Block" tree from $tree.2.source with (unpack $new_lines)
return `(when `("Block" tree from $tree.2.source with (unpack $new_lines)))
"if 1 is ?" "if 1 = ?":
$values = []
@ -66,7 +64,7 @@ upgrade $tree to "2.4" as:
$new_lines, add $line
($line.stub == "* else"):
$new_lines, add ("Action" tree with "else" $line.3)
$new_lines, add (else `$line.3)
else:
$values, add $line.2
@ -79,5 +77,7 @@ upgrade $tree to "2.4" as:
$values = []
return
"Action" tree with "if" ($tree.2 upgraded) "is"
"Block" tree from $tree.5.source with (unpack $new_lines)
`(
if `($tree.2 upgraded) is
`("Block" tree from $tree.5.source with (unpack $new_lines))
)

3
lib/compatibility/2.nom
View File

@ -17,8 +17,7 @@ upgrade $tree to "2" as:
unless ($false_body is "Block" syntax tree):
$false_body = (=lua "Block(\$false_body.source, \$false_body)")
return
"Action" tree with "if" ($tree.2 upgraded) $true_body "else" $false_body
return `(if `($tree.2 upgraded) `$true_body else `$false_body)
$need_blocks = [
"if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1", "repeat 1 times"

28
lib/compatibility/4.8.10.nom
View File

@ -13,12 +13,12 @@ upgrade action "local action" to "4.8.10" via
if $spec.type is:
"List":
if (#$spec == 1):
return ("Action" tree with $spec.1 "means" $body)
return `(`$spec.1 means `$body)
..else:
return ("Action" tree with $spec "all" "mean" $body)
return `(`$spec all mean `$body)
else:
return ("Action" tree with $spec "means" $body)
return `(`$spec means `$body)
upgrade action "action" to "4.8.10" via
for ($tree $end_version):
@ -28,14 +28,14 @@ upgrade action "action" to "4.8.10" via
if $spec.type is:
"List":
if (#$spec == 1):
return ("Action" tree with "externally" $spec.1 "means" $body)
return `(externally `$spec.1 means `$body)
..else:
return ("Action" tree with "externally" $spec "all" "mean" $body)
return `(externally `$spec all mean `$body)
else:
return ("Action" tree with "externally" $spec "means" $body)
return `(externally `$spec means `$body)
..else:
return ("Action" tree with $spec "'" "s" "meaning")
return `((`$spec)'s meaning)
upgrade action "compile 1 to" to "4.8.10" via
for ($tree $end_version):
@ -44,12 +44,12 @@ upgrade action "compile 1 to" to "4.8.10" via
if $spec.type is:
"List":
if (#$spec == 1):
return ("Action" tree with $spec.1 "compiles" "to" $body)
return `(`$spec.1 compiles to `$body)
..else:
return ("Action" tree with $spec "all" "compile" "to" $body)
return `(`$spec all compile to `$body)
else:
return ("Action" tree with $spec "compiles" "to" $body)
return `(`$spec compiles to `$body)
upgrade action "parse 1 as" to "4.8.10" via
for ($tree $end_version):
@ -58,12 +58,12 @@ upgrade action "parse 1 as" to "4.8.10" via
if $spec.type is:
"List":
if (#$spec == 1):
return ("Action" tree with $spec.1 "parses" "as" $body)
return `(`$spec.1 parses as `$body)
..else:
return ("Action" tree with $spec "all" "parse" "as" $body)
return `(`$spec all parse as `$body)
else:
return ("Action" tree with $spec "parse" "as" $body)
return `(`$spec parse as `$body)
upgrade action (compile as $) to "4.8.10" as (what $ compiles to)
upgrade action (remove action $) to "4.8.10" as (($'s meaning) = (nil))
upgrade action (remove action $) to "4.8.10" as (($'s meaning) = (nil))

2
lib/compatibility/4.9.nom
View File

@ -10,4 +10,4 @@ upgrade action "if" to "4.9" via
for ($tree $end_version):
if (#$tree > 2):
return $tree
return ("Action" tree with "when" $tree.2)
return `(when `$tree.2)

4
lib/compatibility/5.13.nom
View File

@ -17,6 +17,6 @@ upgrade action "with" to "5.13" via
when:
(($a.type == "DictEntry") and (#$a == 1)): $a = $a.1
(all of [$a.type == "DictEntry", #$a == 2]):
$a = ("Action" tree with $a.1 "=" $a.2)
$a = `(`$a.1 = `$a.2)
$new_assignments.$i = $a
return ("Action" tree with "with" $new_assignments $body)
return `(with `$new_assignments `$body)

4
lib/compatibility/6.14.nom
View File

@ -28,7 +28,7 @@ upgrade action (assume $assumption or barf $err) to "6.14" as
unless $assumption: fail $err
upgrade action (barf $msg) to "6.14" as (fail $msg)
upgrade action ("Action" tree with 1 "'" "s" "meaning").stub to "6.14" via
upgrade action (`(1's meaning)).stub to "6.14" via
$tree -> ("Var" tree from $tree.source with $tree.1)
upgrade action (log base $b of $n) to "6.14" as (log $n base $b)
upgrade action "use" to "6.14" via
@ -36,4 +36,4 @@ upgrade action "use" to "6.14" via
$path = $tree.2.1
$path = ($path, with "%.nom$" -> "")
$path = ($path, with "^lib/" -> "")
return ("Action" tree with "use" ("Text" tree from $tree.2.source with $path))
return `(use `("Text" tree from $tree.2.source with $path))

2
lib/compatibility/compatibility.nom
View File

@ -22,7 +22,7 @@ external:
(upgrade action $actions to $version as $body) compiles to:
if ($actions is "Action" syntax tree):
$actions = ("List" tree with $actions)
$actions = `[`$actions]
$lua = (Lua "")
for $action in $actions:
$replacements = {}

26
lib/core/control_flow.nom
View File

@ -232,18 +232,18 @@ test:
if ($body, contains `(do next)):
$lua, add "\n ::continue::"
if ($key and ($body, contains ("Action" tree with "do" "next" $key))):
$lua, add "\n " (("Action" tree with "---" "next" $key "---") as lua)
if ($key and ($body, contains `(do next `$key))):
$lua, add "\n " (`(---next `$key ---) as lua)
if ($body, contains ("Action" tree with "do" "next" $value)):
$lua, add "\n " (("Action" tree with "---" "next" $value "---") as lua)
if ($body, contains `(do next `$value)):
$lua, add "\n " (`(---next `$value ---) as lua)
$lua, add "\n end"
if ($key and ($body, contains ("Action" tree with "stop" $key))):
$lua, add "\n " (("Action" tree with "---" "stop" $key "---") as lua)
if ($key and ($body, contains `(stop `$key))):
$lua, add "\n " (`(---stop `$key ---) as lua)
if ($body, contains ("Action" tree with "stop" $value)):
$lua, add "\n " (("Action" tree with "---" "stop" $value "---") as lua)
if ($body, contains `(stop `$value)):
$lua, add "\n " (`(---stop `$value ---) as lua)
$lua, add "\nend -- for-loop"
$lua, remove free vars
@ -445,7 +445,7 @@ test:
assume ((result of: return 99) == 99)
### Inline thunk:
(result of $body) compiles to "\(("Action" tree with "->" $body) as lua)()"
(result of $body) compiles to "\(`(-> `$body) as lua)()"
test:
$t = [1, [2, [[3], 4], 5, [[[6]]]]]
$flat = []
@ -474,11 +474,11 @@ test:
if ($body, contains `(do next)):
$lua, add "\n ::continue::"
if ($body, contains ("Action" tree with "do" "next" $var)):
$lua, add "\n \(("Action" tree with "---" "next" $var "---") as lua)"
if ($body, contains `(do next `$var)):
$lua, add "\n \(`(---next `$var ---) as lua)"
$lua, add "\n end -- Recursive loop"
if ($body, contains ("Action" tree with "stop" $var)):
$lua, add "\n \(("Action" tree with "---" "stop" $var "---") as lua)"
if ($body, contains `(stop `$var)):
$lua, add "\n \(`(---stop `$var ---) as lua)"
$lua, add "\nend -- Recursive scope"
return $lua

2
lib/core/things.nom
View File

@ -121,4 +121,4 @@ external:
")
$lua, add free vars [$class_id]
return $lua
return $lua

7
lib/shell/init.nom
View File

@ -28,8 +28,5 @@ external:
"Command failure: Command `\($cmd)` was terminated by signal \$return"
### Attach callsite information for better error reporting
(=sh $cmd) compiles to
("Action" tree with "at" ("Text" tree with "\($cmd.source)") "=" "sh" $cmd) as lua
(sh> $cmd) compiles to
("Action" tree with "at" ("Text" tree with "\($cmd.source)") "sh" ">" $cmd) as lua
(=sh $cmd) compiles to `(at `("Text" tree with "\($cmd.source)") =sh `$cmd)
(sh> $cmd) compiles to `(at `("Text" tree with "\($cmd.source)") sh> `$cmd)

4
lib/tools/find.nom
View File

@ -43,7 +43,7 @@ command line program with $args:
for $ in (1 to #$patt):
if ($patt.$ is syntax tree):
if ($patt.$ == ("Var" tree with "multi_wildcard")): return (yes)
if ($patt.$ == `$multi_wildcard): return (yes)
unless ($tree.$ matches $patt.$): return (no)
..else:
unless ($tree.$ == $patt.$): return (no)
@ -99,4 +99,4 @@ command line program with $args:
..else:
sort $results by $ -> $.line
for $ in $results:
say $.text
say $.text

6
lib/tools/tutorial.nom
View File

@ -15,10 +15,10 @@ use "shell"
")
[<your code here>, ???] all compile to
(
"Action" tree with "at" ("Text" tree with "\((this tree).source)") "fail"
`(
at `("Text" tree with "\((this tree).source)") fail
`"Incomplete code: This needs to be filled in."
) as lua
)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~