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

Fixing the upgrade pipeline, plus some misc. fixes.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-09 17:02:39 -08:00
parent 69aaea030e
commit fa3f598fc3
12 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compatibility/2.4.nom
View File

@ -9,23 +9,22 @@ use "compatibility/compatibility.nom"
upgrade %tree to "2.4" as:
unless (%tree is "Action" syntax tree): return
if %tree.stub is:
"when %":
"when":
%conditions = []
%new_lines = []
%body = (..)
(%tree.2 upgraded) if (%tree.2 is "Block" syntax tree) else [%tree.2 upgraded]
for %line in %body:
if:
(not (%line is syntax tree)):
compile error at %tree.source "WUT: %s"
when:
(not (%line is "Action" syntax tree)):
%new_lines::add %line
(%line.stub is "* %"):
%conditions::add %line.2
(%line.stub == "* else %"):
(%line.stub is "*"):
if ((size of %line) == 2):
%conditions::add %line.2
..else:
%new_lines::add %line
(%line.stub == "* else"):
%new_lines::add (\(else %block) with vars {block:%line.3})
(%line.stub != "* % %"):
%new_lines::add %line
else:
%conditions::add %line.2
%action = %line.3
@ -36,23 +35,24 @@ upgrade %tree to "2.4" as:
%conditions = []
return (..)
\(if %body) with vars {body:=lua "Block(\%tree[2].source, unpack(\%new_lines))"}
\(when %body) with vars {body:=lua "Block(\%tree[2].source, unpack(\%new_lines))"}
"when % is ? %" "when % = ? %":
"when 1 is ?" "when 1 = ?":
%values = []
%new_lines = []
%body = (..)
(%tree.5 upgraded) if (%tree.5 is "Block" syntax tree) else [%tree.5 upgraded]
for %line in %body:
if:
when:
(not (%line is "Action" syntax tree)):
%new_lines::add %line
(%line.stub is "* %"):
%values::add %line.2
(%line.stub == "* else %"):
(%line.stub is "*"):
if ((size of %line) == 2):
%values::add %line.2
..else:
%new_lines::add %line
(%line.stub == "* else"):
%new_lines::add (\(else %block) with vars {block:%line.3})
(%line.stub != "* % %"):
%new_lines::add %line
else:
%values::add %line.2
%action = %line.3

10
compatibility/2.nom
View File

@ -8,7 +8,7 @@ use "compatibility/compatibility.nom"
upgrade %tree to "2" as:
unless (%tree is "Action" syntax tree): return
if (%tree.stub is "if % % else %"):
if (%tree.stub is "if 1 2 else"):
%true_body = (%tree.3 upgraded)
unless (%true_body is "Block" syntax tree):
%true_body = \(: %true_body)
@ -20,10 +20,10 @@ upgrade %tree to "2" as:
cond:%tree.2 upgraded, true_body:%true_body, false_body:%false_body
%need_blocks = [..]
"if % %", "unless % %", "for % in % %", "for % = % in % %", "repeat while % %"
"repeat % times %", "repeat %", "repeat until % %", "for % in % to % by % %"
"for % in % to % via % %", "for % in % to % %", "for % % in % %"
"do %", "for % in recursive % %", "test %", "with % %", "result of %"
"if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1"
"repeat 1 times", "repeat", "repeat until 1", "for 1 in 2 to 3 by"
"for 1 in 2 to 3 via", "for 1 in 2 to", "for 1 2 in"
"do", "for 1 in recursive", "test", "with", "result of"
for %n in %need_blocks:
if (%tree.stub is %n):

4
compatibility/3.nom
View File

@ -9,7 +9,7 @@ use "compatibility/compatibility.nom"
upgrade action (method %spec %body) to "3" as (my action %spec %body)
upgrade action (me) to "3" as %me
upgrade action (@) to "3" as %me
upgrade action "as 1 2" to "3" via (..)
upgrade action "as" to "3" via (..)
[] -> (..)
barf "\
..Object API has changed. Use (%obj::action 1 2) instead of (as %obj: action 1 2)"
..Object API has changed. Use (%obj::action ...) instead of (as %obj: action ...)"

28
compatibility/4.8.10.nom
View File

@ -5,7 +5,7 @@ use "compatibility/compatibility.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
upgrade action "local action 1 2" to "4.8.10" via (..)
upgrade action "local action" to "4.8.10" via (..)
[%tree, %end_version] ->:
%spec = %tree.3
%body = %tree.4
@ -18,20 +18,23 @@ upgrade action "local action 1 2" to "4.8.10" via (..)
else:
return \(%spec means %body)
upgrade action "action 1 2" to "4.8.10" via (..)
upgrade action "action" to "4.8.10" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.3
if %spec.type is:
"List":
if ((size of %spec) == 1):
return \(externally %spec.1 means %body)
..else:
return \(externally %spec all mean %body)
else:
return \(externally %spec means %body)
if %body:
if %spec.type is:
"List":
if ((size of %spec) == 1):
return \(externally %spec.1 means %body)
..else:
return \(externally %spec all mean %body)
else:
return \(externally %spec means %body)
..else:
return \(%spec's meaning)
upgrade action "compile 1 to 2" to "4.8.10" via (..)
upgrade action "compile 1 to" to "4.8.10" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.4
@ -44,7 +47,7 @@ upgrade action "compile 1 to 2" to "4.8.10" via (..)
else:
return \(%spec compiles to %body)
upgrade action "parse 1 as 2" to "4.8.10" via (..)
upgrade action "parse 1 as" to "4.8.10" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.4
@ -58,5 +61,4 @@ upgrade action "parse 1 as 2" to "4.8.10" via (..)
return \(%spec parse as %body)
upgrade action (compile as %) to "4.8.10" as (what % compiles to)
upgrade action (action %) to "4.8.10" as (%'s meaning)
upgrade action (remove action %) to "4.8.10" as ((%'s meaning) = (nil))

28
compatibility/4.9.nom
View File

@ -3,7 +3,7 @@
This file defines upgrades from Nomsu <4.9 to 4.9
use "compatibility/compatibility.nom"
upgrade action "local action 1 2" to "4.9" via (..)
upgrade action "local action" to "4.9" via (..)
[%tree, %end_version] ->:
%spec = %tree.3
%body = %tree.4
@ -16,20 +16,23 @@ upgrade action "local action 1 2" to "4.9" via (..)
else:
return \(%spec means %body)
upgrade action "action 1 2" to "4.9" via (..)
upgrade action "action" to "4.9" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.3
if %spec.type is:
"List":
if ((size of %spec) == 1):
return \(externally %spec.1 means %body)
..else:
return \(externally %spec all mean %body)
else:
return \(externally %spec means %body)
if %body:
if %spec.type is:
"List":
if ((size of %spec) == 1):
return \(externally %spec.1 means %body)
..else:
return \(externally %spec all mean %body)
else:
return \(externally %spec means %body)
..else:
return \(%spec's meaning)
upgrade action "compile 1 to 2" to "4.9" via (..)
upgrade action "compile 1 to" to "4.9" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.4
@ -42,7 +45,7 @@ upgrade action "compile 1 to 2" to "4.9" via (..)
else:
return \(%spec compiles to %body)
upgrade action "parse 1 as 2" to "4.9" via (..)
upgrade action "parse 1 as" to "4.9" via (..)
[%tree, %end_version] ->:
%spec = %tree.2
%body = %tree.4
@ -56,6 +59,5 @@ upgrade action "parse 1 as 2" to "4.9" via (..)
return \(%spec parse as %body)
upgrade action (compile as %) to "4.9" as (what % compiles to)
upgrade action (action %) to "4.9" as (%'s meaning)
upgrade action (remove action %) to "4.9" as ((%'s meaning) = (nil))
upgrade action (if %) to "4.9" as (when %)

4
compatibility/compatibility.nom
View File

@ -36,7 +36,7 @@ externally (upgrade action %stub to %version via %upgrade_fn) means:
return %replacements.(%t.1)
..else:
external %needs_mangle = (yes)
return "\(%t.type){source=\(quote "\(%t.source)"), \(quote (mangle %t.1))}"
return "SyntaxTree{type=\(quote %t.type), source=\(quote "\(%t.source)"), \(quote (mangle %t.1))}"
(%t is syntax tree):
%args = []
@ -46,7 +46,7 @@ externally (upgrade action %stub to %version via %upgrade_fn) means:
..else:
%args::add "\(%k)=\(make tree %v)"
return "\(%t.type){\(%args::joined with ", ")}"
return "SyntaxTree{\(%args::joined with ", ")}"
else: return (quote %t)

6
core/metaprogramming.nom
View File

@ -365,8 +365,10 @@ test:
# Return statement is wrapped in a do..end block because Lua is unhappy if you
put code after a return statement, unless you wrap it in a block.
(return) compiles to "do return; end"
(return %return_value) compiles to "do return \(%return_value as lua expr) end"
(return %return_value) compiles to "\
..do return \(..)
=lua "\%return_value and \(%return_value as lua expr) or ''"
.. end"
# Literals
(yes) compiles to "true"

2
core/text.nom
View File

@ -36,7 +36,7 @@ test:
return (..)
Lua "\
..(function()
local \(mangle "comprehension") = _List{}
local \(mangle "comprehension") = List{}
for \(%match as lua expr) in (\(%text as lua expr)):gmatch(\(..)
%patt as lua expr
..) do

2
lib/object.nom
View File

@ -99,7 +99,7 @@ test:
class.__index = class
class.class = class
class.__tostring = function(inst)
return inst.name..getmetatable(_Dict{}).__tostring(inst)
return inst.name..getmetatable(Dict{}).__tostring(inst)
end
\(%class_body as lua)
for stub,metamethod in pairs(globals.METAMETHOD_MAP) do

4
nomsu_decompiler.lua
View File

@ -179,7 +179,7 @@ tree_to_inline_nomsu = function(tree)
elseif "FileChunks" == _exp_0 then
return error("Can't inline a FileChunks")
elseif "Comment" == _exp_0 then
return nil
return NomsuCode:from(tree.source)
elseif "Error" == _exp_0 then
return error("Can't compile errors")
else
@ -397,7 +397,7 @@ tree_to_nomsu = function(tree)
nomsu:append(": ", value_nomsu)
return nomsu
elseif "Comment" == _exp_0 then
nomsu:append("#", tree[1]:gsub("\n", "\n "))
nomsu:append("#", (tree[1]:gsub("\n", "\n ")))
return nomsu
elseif "IndexChain" == _exp_0 or "Number" == _exp_0 or "Var" == _exp_0 or "Comment" == _exp_0 or "Error" == _exp_0 then
return tree_to_inline_nomsu(tree)

4
nomsu_decompiler.moon
View File

@ -137,7 +137,7 @@ tree_to_inline_nomsu = (tree)->
when "Comment"
-- TODO: implement?
return nil
return NomsuCode\from(tree.source)
when "Error"
error("Can't compile errors")
@ -307,7 +307,7 @@ tree_to_nomsu = (tree)->
return nomsu
when "Comment"
nomsu\append "#", tree[1]\gsub("\n", "\n ")
nomsu\append "#", (tree[1]\gsub("\n", "\n "))
return nomsu
when "IndexChain", "Number", "Var", "Comment", "Error"

6
tools/upgrade.nom
View File

@ -40,14 +40,16 @@ repeat:
for %path in %args:
for file %filename in %path:
unless (%filename::matches "%.nom$"): do next %filename
%tree = (parse (read file %filename) from %filename)
%file = (read file %filename)
%code = (%NomsuCode::from (%Source %filename 1 (size of %file)) %file)
%tree = (%code parsed)
%uptree = (..)
%tree upgraded from (%start_version or (%tree.version or (Nomsu version))) to %version
%text = "\
..#!/usr/bin/env nomsu -V\%version
\(%uptree as nomsu)"
if:
when:
%inplace:
say "Upgraded \%filename"
write %text to file %filename