From 56e3a0c48ca2b641f77f7e73cce94dc3b133e142 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 20 Mar 2019 16:41:44 -0700 Subject: [PATCH] Restoring `(foo) syntax to \(foo) --- lib/compatibility/2.4.nom | 15 ++++++----- lib/compatibility/2.nom | 6 ++--- lib/compatibility/4.11.nom | 5 ++-- lib/compatibility/4.8.10.nom | 29 +++++++++++---------- lib/compatibility/4.9.nom | 3 +-- lib/compatibility/5.13.nom | 8 +++--- lib/compatibility/6.14.nom | 5 ++-- lib/compatibility/7.nom | 3 +-- lib/compatibility/compatibility.nom | 9 +++---- lib/core/control_flow.nom | 35 +++++++++++++------------- lib/core/metaprogramming.nom | 39 +++++++++++++---------------- lib/shell/init.nom | 5 ++-- lib/tools/find.nom | 5 ++-- lib/tools/tutorial.nom | 11 ++++---- 14 files changed, 79 insertions(+), 99 deletions(-) diff --git a/lib/compatibility/2.4.nom b/lib/compatibility/2.4.nom index b28893a..480257a 100644 --- a/lib/compatibility/2.4.nom +++ b/lib/compatibility/2.4.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### 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 ($line.stub == "* else"): - $new_lines, add (else `$line.3) + $new_lines, add (else \$line.3) else: $conditions, add $line.2 @@ -44,7 +43,7 @@ upgrade $tree to "2.4" as: ") $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 = ?": $values = [] @@ -64,7 +63,7 @@ upgrade $tree to "2.4" as: $new_lines, add $line ($line.stub == "* else"): - $new_lines, add (else `$line.3) + $new_lines, add (else \$line.3) else: $values, add $line.2 @@ -77,7 +76,7 @@ upgrade $tree to "2.4" as: $values = [] return - `( - 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)) + ) \ No newline at end of file diff --git a/lib/compatibility/2.nom b/lib/compatibility/2.nom index 4dc867d..69f2d41 100644 --- a/lib/compatibility/2.nom +++ b/lib/compatibility/2.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu 1 to Nomsu 2 @@ -16,8 +15,7 @@ upgrade $tree to "2" as: $false_body = ($tree.5 upgraded) unless ($false_body is "Block" syntax tree): $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 = [ "if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1", "repeat 1 times" @@ -32,4 +30,4 @@ upgrade $tree to "2" as: unless (($bits, last) is "Block" syntax tree): $body = ($bits, last) $bits.(#$bits) = (=lua "SyntaxTree{type='Block', source=\$body.source, \$body}") - return (=lua "SyntaxTree{type='Action', source=\$tree.source, unpack(\$bits)}") + return (=lua "SyntaxTree{type='Action', source=\$tree.source, unpack(\$bits)}") \ No newline at end of file diff --git a/lib/compatibility/4.11.nom b/lib/compatibility/4.11.nom index e91f034..d5a158b 100644 --- a/lib/compatibility/4.11.nom +++ b/lib/compatibility/4.11.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu <4.11 to Nomsu 4.11 (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] upgrade action "set" to "4.11" via for ($tree $end_version): - [$lhs, $rhs] = [`[], `[]] + [$lhs, $rhs] = [\[], \[]] $lhs.source = $tree.2.source $rhs.source = $tree.2.source for ($i = $entry) in $tree.2: @@ -96,4 +95,4 @@ upgrade action [ upgrade action [ unless none of $items $body else $else unless none of $items then $body else $else -] to "4.11" as (if (any of $items) $body else $else) +] to "4.11" as (if (any of $items) $body else $else) \ No newline at end of file diff --git a/lib/compatibility/4.8.10.nom b/lib/compatibility/4.8.10.nom index ee60a61..5723b0d 100644 --- a/lib/compatibility/4.8.10.nom +++ b/lib/compatibility/4.8.10.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu <4.8.10 to 4.8.10 (renaming "action" -> "means") use "compatibility/compatibility" @@ -13,12 +12,12 @@ upgrade action "local action" to "4.8.10" via if $spec.type is: "List": if (#$spec == 1): - return `(`$spec.1 means `$body) + return \(\$spec.1 means \$body) ..else: - return `(`$spec all mean `$body) + return \(\$spec all mean \$body) else: - return `(`$spec means `$body) + return \(\$spec means \$body) upgrade action "action" to "4.8.10" via for ($tree $end_version): @@ -28,14 +27,14 @@ upgrade action "action" to "4.8.10" via if $spec.type is: "List": if (#$spec == 1): - return `(externally `$spec.1 means `$body) + return \(externally \$spec.1 means \$body) ..else: - return `(externally `$spec all mean `$body) + return \(externally \$spec all mean \$body) else: - return `(externally `$spec means `$body) + return \(externally \$spec means \$body) ..else: - return `((`$spec)'s meaning) + return \((\$spec)'s meaning) upgrade action "compile 1 to" to "4.8.10" via for ($tree $end_version): @@ -44,12 +43,12 @@ upgrade action "compile 1 to" to "4.8.10" via if $spec.type is: "List": if (#$spec == 1): - return `(`$spec.1 compiles to `$body) + return \(\$spec.1 compiles to \$body) ..else: - return `(`$spec all compile to `$body) + return \(\$spec all compile to \$body) else: - return `(`$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 +57,12 @@ upgrade action "parse 1 as" to "4.8.10" via if $spec.type is: "List": if (#$spec == 1): - return `(`$spec.1 parses as `$body) + return \(\$spec.1 parses as \$body) ..else: - return `(`$spec all parse as `$body) + return \(\$spec all parse as \$body) 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 (remove action $) to "4.8.10" as (($'s meaning) = (nil)) +upgrade action (remove action $) to "4.8.10" as (($'s meaning) = (nil)) \ No newline at end of file diff --git a/lib/compatibility/4.9.nom b/lib/compatibility/4.9.nom index ddb6b9f..0ec8bc8 100644 --- a/lib/compatibility/4.9.nom +++ b/lib/compatibility/4.9.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu <4.9 to 4.9 use "compatibility/compatibility" @@ -10,4 +9,4 @@ upgrade action "if" to "4.9" via for ($tree $end_version): if (#$tree > 2): return $tree - return `(when `$tree.2) + return \(when \$tree.2) \ No newline at end of file diff --git a/lib/compatibility/5.13.nom b/lib/compatibility/5.13.nom index 3073fdf..b3d9846 100644 --- a/lib/compatibility/5.13.nom +++ b/lib/compatibility/5.13.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu <5.13 to 5.13 use "compatibility/compatibility" @@ -12,11 +11,10 @@ upgrade action "with" to "5.13" via $assignments = $tree.2 $body = $tree.3 if ($assignments.type != "Dict"): return $tree - $new_assignments = `[] + $new_assignments = \[] for ($i = $a) in $assignments: when: (($a.type == "DictEntry") and (#$a == 1)): $a = $a.1 - (all of [$a.type == "DictEntry", #$a == 2]): - $a = `(`$a.1 = `$a.2) + (all of [$a.type == "DictEntry", #$a == 2]): $a = \(\$a.1 = \$a.2) $new_assignments.$i = $a - return `(with `$new_assignments `$body) + return \(with \$new_assignments \$body) \ No newline at end of file diff --git a/lib/compatibility/6.14.nom b/lib/compatibility/6.14.nom index 0d6b8de..75bbc3f 100644 --- a/lib/compatibility/6.14.nom +++ b/lib/compatibility/6.14.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### 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 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) upgrade action (log base $b of $n) to "6.14" as (log $n base $b) upgrade action "use" to "6.14" via @@ -36,4 +35,4 @@ upgrade action "use" to "6.14" via $path = $tree.2.1 $path = ($path, with "%.nom$" -> "") $path = ($path, with "^lib/" -> "") - return `(use `("Text" tree from $tree.2.source with $path)) + return \(use \("Text" tree from $tree.2.source with $path)) \ No newline at end of file diff --git a/lib/compatibility/7.nom b/lib/compatibility/7.nom index c84be0c..7300dc3 100644 --- a/lib/compatibility/7.nom +++ b/lib/compatibility/7.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines upgrades from Nomsu <7 to 7 @@ -45,7 +44,7 @@ upgrade $tree to "7" as: return $t -upgrade action "Nomsu version" to "7" via ->(`$(NOMSU VERSION)) +upgrade action "Nomsu version" to "7" via ->(\$(NOMSU VERSION)) upgrade action [ "Nomsu syntax version", "Nomsu compiler version", "core version", "lib version" ] to "7" via diff --git a/lib/compatibility/compatibility.nom b/lib/compatibility/compatibility.nom index 83eb3cd..4715282 100644 --- a/lib/compatibility/compatibility.nom +++ b/lib/compatibility/compatibility.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file contains code for defining ways to upgrade code between different versions of Nomsu. @@ -22,13 +21,13 @@ external: (upgrade action $actions to $version as $body) compiles to: if ($actions is "Action" syntax tree): - $actions = `[`$actions] + $actions = \[\$actions] $lua = (Lua "") for $action in $actions: $replacements = {} for $i in (1 to #$action): 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 (make tree $t) means: when: @@ -60,7 +59,7 @@ external: $lua, add Lua (" upgrade_action_1_to_2_via(\(quote $action.stub), \($version as lua expr), function(\ - ..\(`$tree as lua id)) + ..\(\$tree as lua id)) return \$retval end) ") @@ -139,4 +138,4 @@ external: $tree upgraded from ($tree.version or $(NOMSU VERSION)) to $end_version ($tree upgraded) means - $tree upgraded from ($tree.version or $(NOMSU VERSION)) to $(NOMSU VERSION) + $tree upgraded from ($tree.version or $(NOMSU VERSION)) to $(NOMSU VERSION) \ No newline at end of file diff --git a/lib/core/control_flow.nom b/lib/core/control_flow.nom index 1329cc8..4dfe5f8 100644 --- a/lib/core/control_flow.nom +++ b/lib/core/control_flow.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file contains compile-time actions that define basic control flow structures like "if" statements and loops. @@ -150,7 +149,7 @@ test: \($body as lua) ") - if ($body, contains `(do next)): + if ($body, contains \(do next)): $lua, add "\n ::continue::" $lua, add "\nend --while-loop" @@ -229,21 +228,21 @@ test: \; ") $lua, add ($body as lua) - if ($body, contains `(do next)): + if ($body, contains \(do next)): $lua, add "\n ::continue::" - if ($key and ($body, contains `(do next `$key))): - $lua, add "\n " (`(---next `$key ---) as lua) + if ($key and ($body, contains \(do next \$key))): + $lua, add "\n " (\(---next \$key ---) as lua) - if ($body, contains `(do next `$value)): - $lua, add "\n " (`(---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 `(stop `$key))): - $lua, add "\n " (`(---stop `$key ---) as lua) + if ($key and ($body, contains \(stop \$key))): + $lua, add "\n " (\(---stop \$key ---) as lua) - if ($body, contains `(stop `$value)): - $lua, add "\n " (`(---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 +444,7 @@ test: assume ((result of: return 99) == 99) ### Inline thunk: -(result of $body) compiles to "\(`(-> `$body) as lua)()" +(result of $body) compiles to "\(\(->(\$body)) as lua)()" test: $t = [1, [2, [[3], 4], 5, [[[6]]]]] $flat = [] @@ -471,14 +470,14 @@ test: \($body as lua) ") - if ($body, contains `(do next)): + if ($body, contains \(do next)): $lua, add "\n ::continue::" - if ($body, contains `(do next `$var)): - $lua, add "\n \(`(---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 `(stop `$var)): - $lua, add "\n \(`(---stop `$var ---) as lua)" + if ($body, contains \(stop \$var)): + $lua, add "\n \(\(---stop \$var ---) as lua)" $lua, add "\nend -- Recursive scope" - return $lua + return $lua \ No newline at end of file diff --git a/lib/core/metaprogramming.nom b/lib/core/metaprogramming.nom index 7bf04f2..bd0b6d7 100644 --- a/lib/core/metaprogramming.nom +++ b/lib/core/metaprogramming.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This File contains actions for making actions and compile-time actions and some helper functions to make that easier. @@ -56,10 +55,10 @@ lua> (" end COMPILE_RULES["->"] = 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) - 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]) else local bits = {} @@ -128,11 +127,11 @@ lua> (" if a.type == "EscapedNomsu" then \$args:add(a[1]) end end return LuaCode("COMPILE_RULES[", \($action as lua), ":get_stub()] = ", - \(`(`$args -> `$body) as lua)) + \(\(\$args -> \$body) as lua)) else for _,a in ipairs(\$action:get_args()) do \$args:add(a) end return LuaCode("COMPILE_RULES[", \$action:get_stub():as_lua(), - "] = ", \(`(`$args -> `$body) as lua)) + "] = ", \(\(\$args -> \$body) as lua)) end end ") @@ -144,7 +143,7 @@ lua> (" if \$actions.type ~= "List" then at_1_fail(\$actions, "Compile error: This should be a list of actions.") 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 \$compiled_args = a_List{"\(nomsu environment)", "\(this tree)"}; for i=3,#\$args do \$compiled_args[i] = \(nomsu environment):compile(\$args[i]) end @@ -196,13 +195,13 @@ test: else at_1_fail(\$action, "Compile error: This is not an action or method call.") end - lua:add(" = ", \(`(`$action -> `$body) as lua), ";") + lua:add(" = ", \(\(\$action -> \$body) as lua), ";") return lua ") ($actions all mean $body) compiles to: lua> (" - local lua = \(`(`$actions.1 means `$body) as lua) + local lua = \(\(\$actions.1 means \$body) as lua) local first_def = (\$actions[1].type == "MethodCall" and LuaCode(\(nomsu environment):compile(\$actions[1][1]), ".", \$actions[1][2]:get_\ ..stub():as_lua_id()) @@ -221,7 +220,7 @@ test: if \$args == \$alias_args then lua:add(" = ", first_def, ";") else - lua:add(" = ", \(`(`$alias_args -> `$actions.1) as lua), ";") + lua:add(" = ", \(\(\$alias_args -> \$actions.1) as lua), ";") end end return lua @@ -323,7 +322,7 @@ test: local \$new_body = LuaCode:from(\$body.source, "local mangle = mangler()", "\\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) -($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: - assume ("Action" tree with "foo" ("Var" tree with "x")) == `(foo $x) + assume ("Action" tree with "foo" ("Var" tree with "x")) == \(foo $x) external: ($type tree with (*extra arguments*)) means @@ -475,7 +474,7 @@ test: ") ### Convenience helper: -(return Lua (*extra arguments*)) compiles to `(return (Lua `(*extra arguments*))) +(return Lua (*extra arguments*)) compiles to \(return (Lua \(*extra arguments*))) ### Literals (yes) compiles to "(true)" @@ -487,7 +486,7 @@ test: (at compilation $expr) compiles to: 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 return LuaCode(value:as_lua()) else @@ -514,11 +513,7 @@ test: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ### TODO: Remove shim -($tree with $t -> $replacement) parses as - $tree, with ($t -> $replacement) - +($tree with $t -> $replacement) parses as ($tree, with ($t -> $replacement)) [tree $tree with vars $replacements, $tree with vars $replacements] all parse as - ($tree, with $replacements) - -($tree has subtree $match_tree) parses as - $tree, contains $match_tree + $tree, with $replacements +($tree has subtree $match_tree) parses as ($tree, contains $match_tree) diff --git a/lib/shell/init.nom b/lib/shell/init.nom index be72c9f..c120807 100644 --- a/lib/shell/init.nom +++ b/lib/shell/init.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This file defines some actions for running shell commands. @@ -28,5 +27,5 @@ external: "Command failure: Command `\($cmd)` was terminated by signal \$return" ### 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) \ No newline at end of file diff --git a/lib/tools/find.nom b/lib/tools/find.nom index e3ef185..3e26ef4 100755 --- a/lib/tools/find.nom +++ b/lib/tools/find.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### 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 @@ -43,7 +42,7 @@ command line program with $args: for $ in (1 to #$patt): if ($patt.$ is syntax tree): - if ($patt.$ == `$multi_wildcard): return (yes) + if ($patt.$ == \$multi_wildcard): return (yes) unless ($tree.$ matches $patt.$): return (no) ..else: unless ($tree.$ == $patt.$): return (no) @@ -99,4 +98,4 @@ command line program with $args: ..else: sort $results by $ -> $.line for $ in $results: - say $.text + say $.text \ No newline at end of file diff --git a/lib/tools/tutorial.nom b/lib/tools/tutorial.nom index 035443e..ac0c675 100755 --- a/lib/tools/tutorial.nom +++ b/lib/tools/tutorial.nom @@ -1,5 +1,4 @@ #!/usr/bin/env nomsu -V7.0.0 - ### This is a Nomsu tutorial. @@ -15,9 +14,9 @@ use "shell" ") [, ???] all compile to - `( - at `("Text" tree with "\((this tree).source)") fail - `"Incomplete code: This needs to be filled in." + \( + at \("Text" tree with "\((this tree).source)") fail + \"Incomplete code: This needs to be filled in." ) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -398,7 +397,7 @@ command line program with $args: $tree = $tree, with $ ->: - if ($ == `()): + if ($ == \()): return ("Text" tree with (filename of ($i - 1), with "%.nom$" -> "")) run $tree @@ -541,4 +540,4 @@ command line program with $args: \\(^\("ᴗ" if $(COLOR ENABLED) else "_")^)/ - ") + ") \ No newline at end of file