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

Restoring `(foo) syntax to \(foo)

Browse Source
This commit is contained in:
Bruce Hill 2019-03-20 16:41:44 -07:00
parent b44afbf417
commit 56e3a0c48c
14 changed files with 79 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/compatibility/2.4.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <2.4 to Nomsu 2.4 This file defines upgrades from Nomsu <2.4 to Nomsu 2.4
@ -30,7 +29,7 @@ upgrade $tree to "2.4" as:
$new_lines, add $line $new_lines, add $line
($line.stub == "* else"): ($line.stub == "* else"):
$new_lines, add (else `$line.3) $new_lines, add (else \$line.3)
else: else:
$conditions, add $line.2 $conditions, add $line.2
@ -44,7 +43,7 @@ upgrade $tree to "2.4" as:
") ")
$conditions = [] $conditions = []
return `(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 = ?": "if 1 is ?" "if 1 = ?":
$values = [] $values = []
@ -64,7 +63,7 @@ upgrade $tree to "2.4" as:
$new_lines, add $line $new_lines, add $line
($line.stub == "* else"): ($line.stub == "* else"):
$new_lines, add (else `$line.3) $new_lines, add (else \$line.3)
else: else:
$values, add $line.2 $values, add $line.2
@ -77,7 +76,7 @@ upgrade $tree to "2.4" as:
$values = [] $values = []
return return
`( \(
if `($tree.2 upgraded) is if \($tree.2 upgraded) is
`("Block" tree from $tree.5.source with (unpack $new_lines)) \("Block" tree from $tree.5.source with (unpack $new_lines))
) )

4
lib/compatibility/2.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu 1 to Nomsu 2 This file defines upgrades from Nomsu 1 to Nomsu 2
@ -16,8 +15,7 @@ upgrade $tree to "2" as:
$false_body = ($tree.5 upgraded) $false_body = ($tree.5 upgraded)
unless ($false_body is "Block" syntax tree): unless ($false_body is "Block" syntax tree):
$false_body = (=lua "Block(\$false_body.source, \$false_body)") $false_body = (=lua "Block(\$false_body.source, \$false_body)")
return \(if \($tree.2 upgraded) \$true_body else \$false_body)
return `(if `($tree.2 upgraded) `$true_body else `$false_body)
$need_blocks = [ $need_blocks = [
"if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1", "repeat 1 times" "if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1", "repeat 1 times"

3
lib/compatibility/4.11.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <4.11 to Nomsu 4.11 This file defines upgrades from Nomsu <4.11 to Nomsu 4.11
(overhaul of function literals, deleting (if all of ...), etc. shorthand) (overhaul of function literals, deleting (if all of ...), etc. shorthand)
@ -20,7 +19,7 @@ upgrade action ->$yield_value to "4.11" as (yield $yield_value)
### Replace set {$x:1, $y:2} with [$x, $y] = [1, 2] ### Replace set {$x:1, $y:2} with [$x, $y] = [1, 2]
upgrade action "set" to "4.11" via upgrade action "set" to "4.11" via
for ($tree $end_version): for ($tree $end_version):
[$lhs, $rhs] = [`[], `[]] [$lhs, $rhs] = [\[], \[]]
$lhs.source = $tree.2.source $lhs.source = $tree.2.source
$rhs.source = $tree.2.source $rhs.source = $tree.2.source
for ($i = $entry) in $tree.2: for ($i = $entry) in $tree.2:

27
lib/compatibility/4.8.10.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <4.8.10 to 4.8.10 (renaming "action" -> "means") This file defines upgrades from Nomsu <4.8.10 to 4.8.10 (renaming "action" -> "means")
use "compatibility/compatibility" use "compatibility/compatibility"
@ -13,12 +12,12 @@ upgrade action "local action" to "4.8.10" via
if $spec.type is: if $spec.type is:
"List": "List":
if (#$spec == 1): if (#$spec == 1):
return `(`$spec.1 means `$body) return \(\$spec.1 means \$body)
..else: ..else:
return `(`$spec all mean `$body) return \(\$spec all mean \$body)
else: else:
return `(`$spec means `$body) return \(\$spec means \$body)
upgrade action "action" to "4.8.10" via upgrade action "action" to "4.8.10" via
for ($tree $end_version): for ($tree $end_version):
@ -28,14 +27,14 @@ upgrade action "action" to "4.8.10" via
if $spec.type is: if $spec.type is:
"List": "List":
if (#$spec == 1): if (#$spec == 1):
return `(externally `$spec.1 means `$body) return \(externally \$spec.1 means \$body)
..else: ..else:
return `(externally `$spec all mean `$body) return \(externally \$spec all mean \$body)
else: else:
return `(externally `$spec means `$body) return \(externally \$spec means \$body)
..else: ..else:
return `((`$spec)'s meaning) return \((\$spec)'s meaning)
upgrade action "compile 1 to" to "4.8.10" via upgrade action "compile 1 to" to "4.8.10" via
for ($tree $end_version): for ($tree $end_version):
@ -44,12 +43,12 @@ upgrade action "compile 1 to" to "4.8.10" via
if $spec.type is: if $spec.type is:
"List": "List":
if (#$spec == 1): if (#$spec == 1):
return `(`$spec.1 compiles to `$body) return \(\$spec.1 compiles to \$body)
..else: ..else:
return `(`$spec all compile to `$body) return \(\$spec all compile to \$body)
else: else:
return `(`$spec compiles to `$body) return \(\$spec compiles to \$body)
upgrade action "parse 1 as" to "4.8.10" via upgrade action "parse 1 as" to "4.8.10" via
for ($tree $end_version): for ($tree $end_version):
@ -58,12 +57,12 @@ upgrade action "parse 1 as" to "4.8.10" via
if $spec.type is: if $spec.type is:
"List": "List":
if (#$spec == 1): if (#$spec == 1):
return `(`$spec.1 parses as `$body) return \(\$spec.1 parses as \$body)
..else: ..else:
return `(`$spec all parse as `$body) return \(\$spec all parse as \$body)
else: else:
return `(`$spec parse as `$body) return \(\$spec parse as \$body)
upgrade action (compile as $) to "4.8.10" as (what $ compiles to) 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))

3
lib/compatibility/4.9.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <4.9 to 4.9 This file defines upgrades from Nomsu <4.9 to 4.9
use "compatibility/compatibility" use "compatibility/compatibility"
@ -10,4 +9,4 @@ upgrade action "if" to "4.9" via
for ($tree $end_version): for ($tree $end_version):
if (#$tree > 2): if (#$tree > 2):
return $tree return $tree
return `(when `$tree.2) return \(when \$tree.2)

8
lib/compatibility/5.13.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <5.13 to 5.13 This file defines upgrades from Nomsu <5.13 to 5.13
use "compatibility/compatibility" use "compatibility/compatibility"
@ -12,11 +11,10 @@ upgrade action "with" to "5.13" via
$assignments = $tree.2 $assignments = $tree.2
$body = $tree.3 $body = $tree.3
if ($assignments.type != "Dict"): return $tree if ($assignments.type != "Dict"): return $tree
$new_assignments = `[] $new_assignments = \[]
for ($i = $a) in $assignments: for ($i = $a) in $assignments:
when: when:
(($a.type == "DictEntry") and (#$a == 1)): $a = $a.1 (($a.type == "DictEntry") and (#$a == 1)): $a = $a.1
(all of [$a.type == "DictEntry", #$a == 2]): (all of [$a.type == "DictEntry", #$a == 2]): $a = \(\$a.1 = \$a.2)
$a = `(`$a.1 = `$a.2)
$new_assignments.$i = $a $new_assignments.$i = $a
return `(with `$new_assignments `$body) return \(with \$new_assignments \$body)

5
lib/compatibility/6.14.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <6.14 to 6.14 This file defines upgrades from Nomsu <6.14 to 6.14
@ -28,7 +27,7 @@ upgrade action (assume $assumption or barf $err) to "6.14" as
unless $assumption: fail $err unless $assumption: fail $err
upgrade action (barf $msg) to "6.14" as (fail $msg) upgrade action (barf $msg) to "6.14" as (fail $msg)
upgrade action (`(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) $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 (log base $b of $n) to "6.14" as (log $n base $b)
upgrade action "use" to "6.14" via upgrade action "use" to "6.14" via
@ -36,4 +35,4 @@ upgrade action "use" to "6.14" via
$path = $tree.2.1 $path = $tree.2.1
$path = ($path, with "%.nom$" -> "") $path = ($path, with "%.nom$" -> "")
$path = ($path, with "^lib/" -> "") $path = ($path, with "^lib/" -> "")
return `(use `("Text" tree from $tree.2.source with $path)) return \(use \("Text" tree from $tree.2.source with $path))

3
lib/compatibility/7.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines upgrades from Nomsu <7 to 7 This file defines upgrades from Nomsu <7 to 7
@ -45,7 +44,7 @@ upgrade $tree to "7" as:
return $t return $t
upgrade action "Nomsu version" to "7" via ->(`$(NOMSU VERSION)) upgrade action "Nomsu version" to "7" via ->(\$(NOMSU VERSION))
upgrade action [ upgrade action [
"Nomsu syntax version", "Nomsu compiler version", "core version", "lib version" "Nomsu syntax version", "Nomsu compiler version", "core version", "lib version"
] to "7" via ] to "7" via

7
lib/compatibility/compatibility.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file contains code for defining ways to upgrade code between different versions This file contains code for defining ways to upgrade code between different versions
of Nomsu. of Nomsu.
@ -22,13 +21,13 @@ external:
(upgrade action $actions to $version as $body) compiles to: (upgrade action $actions to $version as $body) compiles to:
if ($actions is "Action" syntax tree): if ($actions is "Action" syntax tree):
$actions = `[`$actions] $actions = \[\$actions]
$lua = (Lua "") $lua = (Lua "")
for $action in $actions: for $action in $actions:
$replacements = {} $replacements = {}
for $i in (1 to #$action): for $i in (1 to #$action):
if ($action.$i is "Var" syntax tree): if ($action.$i is "Var" syntax tree):
$replacements.($action.$i.1) = "\(`$tree as lua id)[\$i]" $replacements.($action.$i.1) = "\(\$tree as lua id)[\$i]"
define mangler define mangler
(make tree $t) means: (make tree $t) means:
when: when:
@ -60,7 +59,7 @@ external:
$lua, add $lua, add
Lua (" Lua ("
upgrade_action_1_to_2_via(\(quote $action.stub), \($version as lua expr), function(\ upgrade_action_1_to_2_via(\(quote $action.stub), \($version as lua expr), function(\
..\(`$tree as lua id)) ..\(\$tree as lua id))
return \$retval return \$retval
end) end)
") ")

33
lib/core/control_flow.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file contains compile-time actions that define basic control flow structures This file contains compile-time actions that define basic control flow structures
like "if" statements and loops. like "if" statements and loops.
@ -150,7 +149,7 @@ test:
\($body as lua) \($body as lua)
") ")
if ($body, contains `(do next)): if ($body, contains \(do next)):
$lua, add "\n ::continue::" $lua, add "\n ::continue::"
$lua, add "\nend --while-loop" $lua, add "\nend --while-loop"
@ -229,21 +228,21 @@ test:
\; \;
") ")
$lua, add ($body as lua) $lua, add ($body as lua)
if ($body, contains `(do next)): if ($body, contains \(do next)):
$lua, add "\n ::continue::" $lua, add "\n ::continue::"
if ($key and ($body, contains `(do next `$key))): if ($key and ($body, contains \(do next \$key))):
$lua, add "\n " (`(---next `$key ---) as lua) $lua, add "\n " (\(---next \$key ---) as lua)
if ($body, contains `(do next `$value)): if ($body, contains \(do next \$value)):
$lua, add "\n " (`(---next `$value ---) as lua) $lua, add "\n " (\(---next \$value ---) as lua)
$lua, add "\n end" $lua, add "\n end"
if ($key and ($body, contains `(stop `$key))): if ($key and ($body, contains \(stop \$key))):
$lua, add "\n " (`(---stop `$key ---) as lua) $lua, add "\n " (\(---stop \$key ---) as lua)
if ($body, contains `(stop `$value)): if ($body, contains \(stop \$value)):
$lua, add "\n " (`(---stop `$value ---) as lua) $lua, add "\n " (\(---stop \$value ---) as lua)
$lua, add "\nend -- for-loop" $lua, add "\nend -- for-loop"
$lua, remove free vars $lua, remove free vars
@ -445,7 +444,7 @@ test:
assume ((result of: return 99) == 99) assume ((result of: return 99) == 99)
### Inline thunk: ### Inline thunk:
(result of $body) compiles to "\(`(-> `$body) as lua)()" (result of $body) compiles to "\(\(->(\$body)) as lua)()"
test: test:
$t = [1, [2, [[3], 4], 5, [[[6]]]]] $t = [1, [2, [[3], 4], 5, [[[6]]]]]
$flat = [] $flat = []
@ -471,14 +470,14 @@ test:
\($body as lua) \($body as lua)
") ")
if ($body, contains `(do next)): if ($body, contains \(do next)):
$lua, add "\n ::continue::" $lua, add "\n ::continue::"
if ($body, contains `(do next `$var)): if ($body, contains \(do next \$var)):
$lua, add "\n \(`(---next `$var ---) as lua)" $lua, add "\n \(\(---next \$var ---) as lua)"
$lua, add "\n end -- Recursive loop" $lua, add "\n end -- Recursive loop"
if ($body, contains `(stop `$var)): if ($body, contains \(stop \$var)):
$lua, add "\n \(`(---stop `$var ---) as lua)" $lua, add "\n \(\(---stop \$var ---) as lua)"
$lua, add "\nend -- Recursive scope" $lua, add "\nend -- Recursive scope"
return $lua return $lua

37
lib/core/metaprogramming.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This File contains actions for making actions and compile-time actions and some helper This File contains actions for making actions and compile-time actions and some helper
functions to make that easier. functions to make that easier.
@ -57,9 +56,9 @@ lua> ("
COMPILE_RULES["->"] = COMPILE_RULES["1 ->"] COMPILE_RULES["->"] = COMPILE_RULES["1 ->"]
COMPILE_RULES["for"] = COMPILE_RULES["1 ->"] COMPILE_RULES["for"] = COMPILE_RULES["1 ->"]
COMPILE_RULES["`"] = function(\(nomsu environment), _tree, escaped) COMPILE_RULES["\\\\"] = function(\(nomsu environment), _tree, escaped)
local function escape(t) local function escape(t)
if t.type == "Action" and t:get_stub() == "`" and #t == 2 then if t.type == "Action" and t:get_stub() == "\\\\" and #t == 2 then
return \(nomsu environment):compile(t[2]) return \(nomsu environment):compile(t[2])
else else
local bits = {} local bits = {}
@ -128,11 +127,11 @@ lua> ("
if a.type == "EscapedNomsu" then \$args:add(a[1]) end if a.type == "EscapedNomsu" then \$args:add(a[1]) end
end end
return LuaCode("COMPILE_RULES[", \($action as lua), ":get_stub()] = ", return LuaCode("COMPILE_RULES[", \($action as lua), ":get_stub()] = ",
\(`(`$args -> `$body) as lua)) \(\(\$args -> \$body) as lua))
else else
for _,a in ipairs(\$action:get_args()) do \$args:add(a) end for _,a in ipairs(\$action:get_args()) do \$args:add(a) end
return LuaCode("COMPILE_RULES[", \$action:get_stub():as_lua(), return LuaCode("COMPILE_RULES[", \$action:get_stub():as_lua(),
"] = ", \(`(`$args -> `$body) as lua)) "] = ", \(\(\$args -> \$body) as lua))
end end
end end
") ")
@ -144,7 +143,7 @@ lua> ("
if \$actions.type ~= "List" then if \$actions.type ~= "List" then
at_1_fail(\$actions, "Compile error: This should be a list of actions.") at_1_fail(\$actions, "Compile error: This should be a list of actions.")
end end
local lua = \(`(`$actions.1 compiles to `$body) as lua) local lua = \(\(\$actions.1 compiles to \$body) as lua)
local \$args = a_List{"\(nomsu environment)", "\(this tree)", unpack(\$actions[1]:get_args())} local \$args = a_List{"\(nomsu environment)", "\(this tree)", unpack(\$actions[1]:get_args())}
local \$compiled_args = a_List{"\(nomsu environment)", "\(this tree)"}; local \$compiled_args = a_List{"\(nomsu environment)", "\(this tree)"};
for i=3,#\$args do \$compiled_args[i] = \(nomsu environment):compile(\$args[i]) end for i=3,#\$args do \$compiled_args[i] = \(nomsu environment):compile(\$args[i]) end
@ -196,13 +195,13 @@ test:
else else
at_1_fail(\$action, "Compile error: This is not an action or method call.") at_1_fail(\$action, "Compile error: This is not an action or method call.")
end end
lua:add(" = ", \(`(`$action -> `$body) as lua), ";") lua:add(" = ", \(\(\$action -> \$body) as lua), ";")
return lua return lua
") ")
($actions all mean $body) compiles to: ($actions all mean $body) compiles to:
lua> (" lua> ("
local lua = \(`(`$actions.1 means `$body) as lua) local lua = \(\(\$actions.1 means \$body) as lua)
local first_def = (\$actions[1].type == "MethodCall" local first_def = (\$actions[1].type == "MethodCall"
and LuaCode(\(nomsu environment):compile(\$actions[1][1]), ".", \$actions[1][2]:get_\ and LuaCode(\(nomsu environment):compile(\$actions[1][1]), ".", \$actions[1][2]:get_\
..stub():as_lua_id()) ..stub():as_lua_id())
@ -221,7 +220,7 @@ test:
if \$args == \$alias_args then if \$args == \$alias_args then
lua:add(" = ", first_def, ";") lua:add(" = ", first_def, ";")
else else
lua:add(" = ", \(`(`$alias_args -> `$actions.1) as lua), ";") lua:add(" = ", \(\(\$alias_args -> \$actions.1) as lua), ";")
end end
end end
return lua return lua
@ -323,7 +322,7 @@ test:
local \$new_body = LuaCode:from(\$body.source, local \$new_body = LuaCode:from(\$body.source,
"local mangle = mangler()", "local mangle = mangler()",
"\\nreturn ", make_tree(\$body)) "\\nreturn ", make_tree(\$body))
return \(`(`$actions all compile to `$new_body) as lua) return \(\(\$actions all compile to \$new_body) as lua)
") ")
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -339,7 +338,7 @@ test:
") ")
### Need to make sure the proper environment is used for compilation (i.e. the caller's environment) ### Need to make sure the proper environment is used for compilation (i.e. the caller's environment)
($tree as lua expr) compiles to `((nomsu environment), `$tree as lua expr) ($tree as lua expr) compiles to \(nomsu environment, \$tree as lua expr)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -444,7 +443,7 @@ external:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test: test:
assume ("Action" tree with "foo" ("Var" tree with "x")) == `(foo $x) assume ("Action" tree with "foo" ("Var" tree with "x")) == \(foo $x)
external: external:
($type tree with (*extra arguments*)) means ($type tree with (*extra arguments*)) means
@ -475,7 +474,7 @@ test:
") ")
### Convenience helper: ### Convenience helper:
(return Lua (*extra arguments*)) compiles to `(return (Lua `(*extra arguments*))) (return Lua (*extra arguments*)) compiles to \(return (Lua \(*extra arguments*)))
### Literals ### Literals
(yes) compiles to "(true)" (yes) compiles to "(true)"
@ -487,7 +486,7 @@ test:
(at compilation $expr) compiles to: (at compilation $expr) compiles to:
lua> (" lua> ("
local value = \(nomsu environment):run(\(`(return `$expr))) local value = \(nomsu environment):run(\(\(return \$expr)))
if lua_type_of(value) == 'table' or lua_type_of(value) == 'string' and value.as_lua then if lua_type_of(value) == 'table' or lua_type_of(value) == 'string' and value.as_lua then
return LuaCode(value:as_lua()) return LuaCode(value:as_lua())
else else
@ -514,11 +513,7 @@ test:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
### TODO: Remove shim ### TODO: Remove shim
($tree with $t -> $replacement) parses as ($tree with $t -> $replacement) parses as ($tree, with ($t -> $replacement))
$tree, with ($t -> $replacement)
[tree $tree with vars $replacements, $tree with vars $replacements] all parse as [tree $tree with vars $replacements, $tree with vars $replacements] all parse as
($tree, with $replacements) $tree, with $replacements
($tree has subtree $match_tree) parses as ($tree, contains $match_tree)
($tree has subtree $match_tree) parses as
$tree, contains $match_tree

5
lib/shell/init.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This file defines some actions for running shell commands. This file defines some actions for running shell commands.
@ -28,5 +27,5 @@ external:
"Command failure: Command `\($cmd)` was terminated by signal \$return" "Command failure: Command `\($cmd)` was terminated by signal \$return"
### Attach callsite information for better error reporting ### Attach callsite information for better error reporting
(=sh $cmd) compiles to `(at `("Text" tree with "\($cmd.source)") =sh `$cmd) (=sh $cmd) compiles to \(at \("Text" tree with "\($cmd.source)") =sh \$cmd)
(sh> $cmd) compiles to `(at `("Text" tree with "\($cmd.source)") sh> `$cmd) (sh> $cmd) compiles to \(at \("Text" tree with "\($cmd.source)") sh> \$cmd)

3
lib/tools/find.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This is a tool to find syntax trees matching a pattern. "*" is a wildcard This is a tool to find syntax trees matching a pattern. "*" is a wildcard
that will match any subtree, and "**" is a wildcard that will match any that will match any subtree, and "**" is a wildcard that will match any
@ -43,7 +42,7 @@ command line program with $args:
for $ in (1 to #$patt): for $ in (1 to #$patt):
if ($patt.$ is syntax tree): if ($patt.$ is syntax tree):
if ($patt.$ == `$multi_wildcard): return (yes) if ($patt.$ == \$multi_wildcard): return (yes)
unless ($tree.$ matches $patt.$): return (no) unless ($tree.$ matches $patt.$): return (no)
..else: ..else:
unless ($tree.$ == $patt.$): return (no) unless ($tree.$ == $patt.$): return (no)

9
lib/tools/tutorial.nom
View File

@ -1,5 +1,4 @@
#!/usr/bin/env nomsu -V7.0.0 #!/usr/bin/env nomsu -V7.0.0
### ###
This is a Nomsu tutorial. This is a Nomsu tutorial.
@ -15,9 +14,9 @@ use "shell"
") ")
[<your code here>, ???] all compile to [<your code here>, ???] all compile to
`( \(
at `("Text" tree with "\((this tree).source)") fail at \("Text" tree with "\((this tree).source)") fail
`"Incomplete code: This needs to be filled in." \"Incomplete code: This needs to be filled in."
) )
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -398,7 +397,7 @@ command line program with $args:
$tree = $tree =
$tree, with $tree, with
$ ->: $ ->:
if ($ == `(<prev lesson>)): if ($ == \(<prev lesson>)):
return ("Text" tree with (filename of ($i - 1), with "%.nom$" -> "")) return ("Text" tree with (filename of ($i - 1), with "%.nom$" -> ""))
run $tree run $tree