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

Some incremental progress.

Browse Source
This commit is contained in:
Bruce Hill 2018-10-03 16:26:24 -07:00
parent b615cb5c8e
commit 2f68357cb6
9 changed files with 142 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nomnom/ast.nom
View File

@ -65,6 +65,11 @@ object (Syntax Tree):
unless %changes: return %me unless %changes: return %me
return (Syntax Tree %replacement) return (Syntax Tree %replacement)
my action [with %overrides]:
%new = (%k = %v for %k = %v in %me)
for %k = %v in %overrides: %new.%k = %v
return (Syntax Tree %new)
my action [== %other]: my action [== %other]:
unless (..) unless (..)
all of [..] all of [..]

55
nomnom/code_obj.nom
View File

@ -4,10 +4,27 @@
use "lib/object.nom" use "lib/object.nom"
object (Hole):
action [Hole from %lua]:
return (Hole {lua:%lua})
my action [as lua]:
return %me.lua
my action [as nomsu]:
return "(Hole {lua:\(%me.lua)})"
my action [as text]:
barf "Not implemented"
my action [as smext]:
barf "Must fill in holes before smexting"
object (Code): object (Code):
my action [set up]: my action [set up]:
assume %me.source assume %me.source
%old_bits = %me.bits %old_bits = (%me.bits if (%me.bits is a "List") else [%me.bits])
%me.bits = [] %me.bits = []
if (%me.source is text): if (%me.source is text):
%me.source = (Source from text %me.source) %me.source = (Source from text %me.source)
@ -34,10 +51,10 @@ object (Code):
my action [as lua]: my action [as lua]:
barf barf
return "\(%me.class.name::as lua id)_from_1_2(\(%me.source::as lua), \(%me.bits::as lua))" return "\(%me.class.name::as lua id)_from_1_2(\((%me.source::as lua) if %me.source else "nil"), \(%me.bits::as lua))"
my action [as nomsu] (..) my action [as nomsu] (..)
"(\(%me.class.name) \(%me.source::as nomsu) \(%me.bits::as nomsu))" "(\(%me.class.name) \((%me.source::as nomsu) if %me.source else "(nil)") \(%me.bits::as nomsu))"
my action [size] (size of (%me::as smext)) my action [size] (size of (%me::as smext))
@ -171,19 +188,41 @@ object (Lua Code) extends (Code):
%statements::add (%suffix or ";") %statements::add (%suffix or ";")
return %statements return %statements
my action [variables]:
%vars = []
for %code in recursive %me:
if %code.is_variable:
%vars::add (%code::as smext)
for % in %code.bits:
unless (% is text):
recurse %code on %
return %vars
action [Lua Code from %source %bits]: action [Lua Code from %source %bits]:
if (%bits is text): %bits = [%bits] assume %source
unless (%bits is a "List"): %bits = [%bits]
if (%source is a "Syntax Tree"): %source = %source.source if (%source is a "Syntax Tree"): %source = %source.source
return (..) return (..)
Lua Code {source:%source, bits:%bits, is_value:(no), free_vars:[]} Lua Code {source:%source, bits:%bits, is_value: no, free_vars:[]}
action [Lua Code from %source] (Lua Code from %source []) action [Lua Code from %source] (Lua Code from %source [])
action [Lua Value from %source %bits]: action [Lua Value from %source %bits]:
if (%bits is text): %bits = [%bits] assume %source
unless (%bits is a "List"): %bits = [%bits]
if (%source is a "Syntax Tree"): %source = %source.source if (%source is a "Syntax Tree"): %source = %source.source
return (..) return (..)
Lua Code {source:%source, bits:%bits, is_value:(yes), free_vars:[]} Lua Code {source:%source, bits:%bits, is_value: yes, free_vars:[]}
action [Lua Value from %source] (Lua Value from %source []) action [Lua Value from %source] (Lua Value from %source [])
action [Lua Variable from %source] (Lua Variable from %source [])
action [Lua Variable from %source %bits]:
assume %source
unless (%bits is a "List"): %bits = [%bits]
if (%source is a "Syntax Tree"): %source = %source.source
return (..)
Lua Code {source:%source, bits:%bits, is_value: yes, is_variable: yes, free_vars:[]}
# TODO: remove this shim
(Lua Code).add_free_vars = (Lua Code).add_free_vars_1 (Lua Code).add_free_vars = (Lua Code).add_free_vars_1
(Lua Code).remove_free_vars = (Lua Code).remove_free_vars_1 (Lua Code).remove_free_vars = (Lua Code).remove_free_vars_1
(Lua Code).declare_locals = (Lua Code).declare_locals_1 (Lua Code).declare_locals = (Lua Code).declare_locals_1
@ -196,3 +235,5 @@ object (Nomsu Code) extends (Code):
return (..) return (..)
Nomsu Code {source:%source, bits:%bits} Nomsu Code {source:%source, bits:%bits}
action [Nomsu Code from %source] (Nomsu Code from %source []) action [Nomsu Code from %source] (Nomsu Code from %source [])
action [Nomsu Code %bits] (Nomsu Code from (nil) %bits)
action [Nomsu Code] (Nomsu Code from (nil) [])

78
nomnom/compile.nom
View File

@ -4,14 +4,31 @@ use "nomnom/code_obj.nom"
use "nomnom/parser.nom" use "nomnom/parser.nom"
use "nomnom/pretty_errors.nom" use "nomnom/pretty_errors.nom"
# TODO: use pretty_errors
local action [report compile error at %tree %err]: local action [report compile error at %tree %err]:
barf (pretty "Compile Error" error at %tree %err) barf (pretty "Compile Error" error at %tree %err)
local action [report compile error at %pos %err hint %hint]: local action [report compile error at %pos %err hint %hint]:
barf (pretty "Compile Error" error at %tree %err hint %hint) barf (pretty "Compile Error" error at %tree %err hint %hint)
action [compile %tree using %compile_actions]: action [barf any errors in %t]:
assume (%t is a "Syntax Tree")
%errs = []
for % in recursive %t:
if (%.type == "Error"):
%errs::add %
for %k = %v in %:
if (%v is a "Syntax Tree"):
recurse % on %v
sort %errs by % -> %.source
%errs = ((% as a pretty error) for % in %errs)
if ((size of %errs) > 0):
if ((size of %errs) > 3):
%n = ((size of %errs) - 3)
for %i in 4 to (size of %errs): %errs.%i = (nil)
%errs::add "\027[31;1m +\%n additional errors...\027[0m\n"
barf (%errs::joined with "\n\n")
action [%tree compiled with %compile_actions]:
assume (%tree is a "Syntax Tree") assume (%tree is a "Syntax Tree")
if all of [..] if all of [..]
%tree.version, action (Nomsu version) %tree.version, action (Nomsu version)
@ -40,12 +57,12 @@ action [compile %tree using %compile_actions]:
..The compile-time action here (\(%tree.stub)) is producing an endless loop." ..The compile-time action here (\(%tree.stub)) is producing an endless loop."
..hint "\ ..hint "\
..Look at the implementation of (\(%tree.stub)) and make sure it's not just returning the original tree." ..Look at the implementation of (\(%tree.stub)) and make sure it's not just returning the original tree."
return (compile %result using %compile_actions) return (%result compiled with %compile_actions)
return %result return %result
%lua = (Lua Value from %tree) %lua = (Lua Value from %tree)
if %tree.target: # Method call if %tree.target: # Method call
%target_lua = (compile %tree.target using %compile_actions) %target_lua = (%tree.target compiled with %compile_actions)
if (((%target_lua::as smext)::matches "^%(.*%)$") or ((%target_lua::as smext)::matches "^[_a-zA-Z][_a-zA-Z0-9]*$")): if (((%target_lua::as smext)::matches "^%(.*%)$") or ((%target_lua::as smext)::matches "^[_a-zA-Z][_a-zA-Z0-9]*$")):
%lua::add [%target_lua, ":"] %lua::add [%target_lua, ":"]
..else: ..else:
@ -60,7 +77,7 @@ action [compile %tree using %compile_actions]:
%values = [] %values = []
for %line in %tok: for %line in %tok:
#unless (%line.type == "Comment"): #unless (%line.type == "Comment"):
%values::add (compile %line using %compile_actions) %values::add (%line compiled with %compile_actions)
if all of (%.is_value for % in %values): if all of (%.is_value for % in %values):
if ((size of %values) == 1): if ((size of %values) == 1):
%arg_lua = %values.1 %arg_lua = %values.1
@ -76,7 +93,7 @@ action [compile %tree using %compile_actions]:
%arg_lua::add ["\n ", %v] %arg_lua::add ["\n ", %v]
%arg_lua::add "\nend)())" %arg_lua::add "\nend)())"
..else: ..else:
%arg_lua = (compile %tok using %compile_actions) %arg_lua = (%tok compiled with %compile_actions)
unless %arg_lua.is_value: unless %arg_lua.is_value:
if (%tok.type == "Action"): if (%tok.type == "Action"):
report compile error at %tok "\ report compile error at %tok "\
@ -96,12 +113,39 @@ action [compile %tree using %compile_actions]:
return %lua return %lua
"EscapedNomsu": "EscapedNomsu":
return (Lua Value from %tree ((%tree.1)::as nomsu)) #return (Lua Value from %tree ((%tree.1)::as lua))
%lua = (Lua Value from %tree ["Syntax_Tree_1{type=", quote %tree.1.type])
set {%needs_comma:no, %i:1}
local action [% as shmua]:
if (% is a "Lua number"):
return "\%"
if (% is a "Syntax Tree"):
return (% compiled with %compile_actions)
if (% is text):
return (quote %)
return (%::as lua)
for %k = %v in (((%tree.1.type == "EscapedNomsu") and %tree) or %tree.1):
%lua::add ", "
if:
(%k == %i):
%i += 1
((%k is text) and (%k::is a lua identifier)):
%lua::add [%k, "= "]
else:
%lua::add ["[", % as shmua, "]= "]
if (%k == "source"):
%lua::add (quote "\%v")
..else:
%lua::add (%v as shmua)
%lua::add "}"
return %lua
"Block": "Block":
%lua = (Lua Code from %tree) %lua = (Lua Code from %tree)
%lua::add (..) %lua::add (..)
((compile %line using %compile_actions)::as statements) ((%line compiled with %compile_actions)::as statements)
..for %line in %tree ..for %line in %tree
..joined with "\n" ..joined with "\n"
return %lua return %lua
@ -117,7 +161,7 @@ action [compile %tree using %compile_actions]:
if (%string_buffer != ""): if (%string_buffer != ""):
%lua_bits::add (%string_buffer::as lua) %lua_bits::add (%string_buffer::as lua)
%string_buffer = "" %string_buffer = ""
%bit_lua = (compile % using %compile_actions) %bit_lua = (% compiled with %compile_actions)
unless %bit_lua.is_value: unless %bit_lua.is_value:
report compile error at % "\ report compile error at % "\
..Can't use this as a string interpolation value, since it doesn't have a value." ..Can't use this as a string interpolation value, since it doesn't have a value."
@ -135,24 +179,24 @@ action [compile %tree using %compile_actions]:
"List": "List":
%lua = (Lua Value from %tree ["List{"]) %lua = (Lua Value from %tree ["List{"])
%lua::add ((compile % using %compile_actions) for % in %tree) joined with ", " or ",\n " %lua::add ((% compiled with %compile_actions) for % in %tree) joined with ", " or ",\n "
%lua::add "}" %lua::add "}"
return %lua return %lua
"Dict": "Dict":
%lua = (Lua Value from %tree ["Dict{"]) %lua = (Lua Value from %tree ["Dict{"])
%lua::add ((compile % using %compile_actions) for % in %tree) joined with ", " or ",\n " %lua::add ((% compiled with %compile_actions) for % in %tree) joined with ", " or ",\n "
%lua::add "}" %lua::add "}"
return %lua return %lua
"DictEntry": "DictEntry":
set {%key:%tree.1, %value:%tree.2} set {%key:%tree.1, %value:%tree.2}
%key_lua = (compile %key using %compile_actions) %key_lua = (%key compiled with %compile_actions)
unless %key_lua.is_value: unless %key_lua.is_value:
report compile error at %tree.1 "\ report compile error at %tree.1 "\
..Can't use this as a dict key, since it's not an expression." ..Can't use this as a dict key, since it's not an expression."
%value_lua = (..) %value_lua = (..)
(compile %value using %compile_actions) if %value (%value compiled with %compile_actions) if %value
..else (Lua Value from %key ["true"]) ..else (Lua Value from %key ["true"])
unless %value_lua.is_value: unless %value_lua.is_value:
report compile error at %tree.2 "\ report compile error at %tree.2 "\
@ -170,7 +214,7 @@ action [compile %tree using %compile_actions]:
return (Lua Code from %tree ["[", %key_lua, "]=", %value_lua]) return (Lua Code from %tree ["[", %key_lua, "]=", %value_lua])
"IndexChain": "IndexChain":
%lua = (compile %tree.1 using %compile_actions) %lua = (%tree.1 compiled with %compile_actions)
unless %lua.is_value: unless %lua.is_value:
report compile error at %tree.1 "\ report compile error at %tree.1 "\
..Can't index into this, since it's not an expression." ..Can't index into this, since it's not an expression."
@ -180,7 +224,7 @@ action [compile %tree using %compile_actions]:
for %i in 2 to (size of %tree): for %i in 2 to (size of %tree):
%key = %tree.%i %key = %tree.%i
%key_lua = (compile %key using %compile_actions) %key_lua = (%key compiled with %compile_actions)
unless %key_lua.is_value: unless %key_lua.is_value:
report compile error at %key "\ report compile error at %key "\
..Can't use this as an index, since it's not an expression." ..Can't use this as an index, since it's not an expression."
@ -202,7 +246,7 @@ action [compile %tree using %compile_actions]:
return (Lua Value from %tree ["\(%tree.1)"]) return (Lua Value from %tree ["\(%tree.1)"])
"Var": "Var":
return (Lua Value from %tree [%tree.1::as lua id]) return (Lua Variable from %tree [%tree.1::as lua id])
"FileChunks": "FileChunks":
barf "\ barf "\
@ -214,7 +258,7 @@ action [compile %tree using %compile_actions]:
return (Lua Code from %tree "-- \(%tree.1::with "\n" -> "\n-- ")") return (Lua Code from %tree "-- \(%tree.1::with "\n" -> "\n-- ")")
"Error": "Error":
barf "Can't compile errors" barf (%tree as a pretty error)
else: else:
barf "Unknown type: \(%tree.type)" barf "Unknown type: \(%tree.type)"

49
nomnom/decompile.nom
View File

@ -3,13 +3,13 @@ use "nomnom/code_obj.nom"
use "nomnom/parser.nom" use "nomnom/parser.nom"
# TODO: maybe re-implement the fancy coroutine checker that aborts early if nomsu gets too long # TODO: maybe re-implement the fancy coroutine checker that aborts early if nomsu gets too long
action [decompile %tree inline]: action [%tree decompiled inline]:
assume (%tree is a "Syntax Tree") assume (%tree is a "Syntax Tree")
if %tree.type is: if %tree.type is:
"Action": "Action":
%nomsu = (Nomsu Code from %tree) %nomsu = (Nomsu Code from %tree)
if %tree.target: if %tree.target:
%target_nomsu = (decompile %tree.target inline) %target_nomsu = (%tree.target decompiled inline)
if %tree.target.type is: if %tree.target.type is:
("Action", "Block"): ("Action", "Block"):
%target_nomsu::parenthesize %target_nomsu::parenthesize
@ -25,7 +25,7 @@ action [decompile %tree inline]:
..: %nomsu::add " " ..: %nomsu::add " "
%nomsu::add %bit %nomsu::add %bit
..else: ..else:
%arg_nomsu = (decompile %bit inline) %arg_nomsu = (%bit decompiled inline)
unless ((%i == (size of %tree)) and (%bit.type == "Block")): unless ((%i == (size of %tree)) and (%bit.type == "Block")):
%nomsu::add " " %nomsu::add " "
if ((%bit.type == "Action") or (%bit.type == "Block")): if ((%bit.type == "Action") or (%bit.type == "Block")):
@ -34,7 +34,7 @@ action [decompile %tree inline]:
return %nomsu return %nomsu
"EscapedNomsu": "EscapedNomsu":
%inner_nomsu = (decompile %tree.1 inline) %inner_nomsu = (%tree.1 decompiled inline)
unless (..) unless (..)
any of [..] any of [..]
%tree.1.type == "List", %tree.1.type == "Dict", %tree.1.type == "List", %tree.1.type == "Dict",
@ -48,7 +48,7 @@ action [decompile %tree inline]:
for %line in %tree at %i: for %line in %tree at %i:
%nomsu::add [..] %nomsu::add [..]
" " if (%i == 1) else "; " " " if (%i == 1) else "; "
decompile %line inline %line decompiled inline
return %nomsu return %nomsu
"Text": "Text":
@ -62,7 +62,7 @@ action [decompile %tree inline]:
"Text": "Text":
recurse %text on %bit recurse %text on %bit
"Var": "Var":
%interp_nomsu = (decompile %bit inline) %interp_nomsu = (%bit decompiled inline)
# Make sure "...\(%x)y..." isn't confused with "...\(%xy)..." # Make sure "...\(%x)y..." isn't confused with "...\(%xy)..."
# TODO: make this more robust against "...\%x\("y").." # TODO: make this more robust against "...\%x\("y").."
if (..) if (..)
@ -71,16 +71,16 @@ action [decompile %tree inline]:
..: %interp_nomsu::parenthesize ..: %interp_nomsu::parenthesize
%nomsu::add ["\\", %interp_nomsu] %nomsu::add ["\\", %interp_nomsu]
("List", "Dict"): ("List", "Dict"):
%nomsu::add ["\\", decompile %bit inline] %nomsu::add ["\\", %bit decompiled inline]
else: else:
%nomsu::add ["\\(", decompile %bit inline, ")"] %nomsu::add ["\\(", %bit decompiled inline, ")"]
return (Nomsu Code from %tree ["\"", %nomsu, "\""]) return (Nomsu Code from %tree ["\"", %nomsu, "\""])
("List", "Dict"): ("List", "Dict"):
%nomsu = (Nomsu Code from %tree ["[" if (%tree.type == "List") else "{"]) %nomsu = (Nomsu Code from %tree ["[" if (%tree.type == "List") else "{"])
for %item in %tree at %i: for %item in %tree at %i:
if (%i > 1): %nomsu::add ", " if (%i > 1): %nomsu::add ", "
%nomsu::add (decompile %item inline) %nomsu::add (%item decompiled inline)
%nomsu::add ("]" if (%tree.type == "List") else "}") %nomsu::add ("]" if (%tree.type == "List") else "}")
return %nomsu return %nomsu
@ -89,13 +89,13 @@ action [decompile %tree inline]:
if (all of [%key.type == "Text", (size of %key) == 1, %key.1 is a nomsu identifier]): if (all of [%key.type == "Text", (size of %key) == 1, %key.1 is a nomsu identifier]):
%nomsu = (Nomsu Code from %key [key.1]) %nomsu = (Nomsu Code from %key [key.1])
..else: ..else:
%nomsu = (decompile %key inline) %nomsu = (%key decompiled inline)
if (%key.type == "Action"): if (%key.type == "Action"):
%nomsu::parenthesize %nomsu::parenthesize
%nomsu::add ":" %nomsu::add ":"
if %value: if %value:
%nomsu::add (decompile %value inline) %nomsu::add (%value decompiled inline)
return %nomsu return %nomsu
"IndexChain": "IndexChain":
@ -108,7 +108,7 @@ action [decompile %tree inline]:
%bit.1 is a nomsu identifier %bit.1 is a nomsu identifier
..:%nomsu::add %bit.1 ..:%nomsu::add %bit.1
..else: ..else:
%bit_nomsu = (decompile %bit inline) %bit_nomsu = (%bit decompiled inline)
if (..) if (..)
any of [..] any of [..]
%bit.type == "Action" %bit.type == "Action"
@ -138,7 +138,7 @@ action [decompile %tree inline]:
barf "Unknown type: \(%tree.type)" barf "Unknown type: \(%tree.type)"
%MAX_LINE = 90 %MAX_LINE = 90
action [decompile %tree]: action [%tree decompiled]:
%nomsu = (Nomsu Code from %tree) %nomsu = (Nomsu Code from %tree)
# For concision: # For concision:
local action [recurse on %t]: local action [recurse on %t]:
@ -149,18 +149,18 @@ action [decompile %tree]:
"Block": "Block":
if ((size of %subtree) > 1): if ((size of %subtree) > 1):
go to (Use Indented) go to (Use Indented)
if ((size of "\(decompile %subtree inline)") > 20): if ((size of "\(%subtree decompiled inline)") > 20):
go to (Use Indented) go to (Use Indented)
for %k = %v in %subtree: for %k = %v in %subtree:
if (%v is a "Syntax Tree"): if (%v is a "Syntax Tree"):
recurse %subtree on %v recurse %subtree on %v
%inline_nomsu = (decompile %t inline) %inline_nomsu = (%t decompiled inline)
if (%inline_nomsu and ((size of "\%inline_nomsu") <= %space)): if (%inline_nomsu and ((size of "\%inline_nomsu") <= %space)):
return %inline_nomsu return %inline_nomsu
=== (Use Indented) === === (Use Indented) ===
%indented = (decompile %t) %indented = (%t decompiled)
if (%t.type == "Action"): if (%t.type == "Action"):
%indented = (Nomsu Code from %t ["(..)\n ", %indented]) %indented = (Nomsu Code from %t ["(..)\n ", %indented])
return %indented return %indented
@ -176,19 +176,16 @@ action [decompile %tree]:
for %chunk in %tree at %chunk_no: for %chunk in %tree at %chunk_no:
if (%chunk_no > 1): if (%chunk_no > 1):
%nomsu::add "\n\n\("~"::* 80)\n\n" %nomsu::add "\n\n\("~"::* 80)\n\n"
%nomsu::add (pop comments at %chunk.source.start)
if (%chunk.type == "Block"): if (%chunk.type == "Block"):
for %line in %chunk at %line_no: for %line in %chunk at %line_no:
if (%line_no > 1): if (%line_no > 1):
if (%chunk.(%line_no - 1) and %line should clump): if (%chunk.(%line_no - 1) and %line should clump):
%nomsu::add ["\n", pop comments at %line.source.start "\n"] %nomsu::add "\n"
..else: ..else:
%nomsu::add ["\n\n", pop comments at %line.source.start] %nomsu::add "\n\n"
%nomsu::add (decompile %line %pop_comments) %nomsu::add (%line decompiled)
%nomsu::add (pop comments at %chunk.source.stop "\n")
..else: ..else:
%nomsu::add (decompile %chunk %pop_comments) %nomsu::add (%chunk decompiled)
%nomsu::add (pop comments at %tree.source.stop "\n")
unless ("\%nomsu"::matches "\n$"): unless ("\%nomsu"::matches "\n$"):
%nomsu::add "\n" %nomsu::add "\n"
return %nomsu return %nomsu
@ -300,7 +297,7 @@ action [decompile %tree]:
%nomsu::add ("[]" if (%tree.type == "List") else "{}") %nomsu::add ("[]" if (%tree.type == "List") else "{}")
return %nomsu return %nomsu
for %item in %tree at %i: for %item in %tree at %i:
%item_nomsu = (decompile %item inline) %item_nomsu = (%item decompiled inline)
if ((not %item_nomsu) or ((size of "\%item_nomsu") > %MAX_LINE)): if ((not %item_nomsu) or ((size of "\%item_nomsu") > %MAX_LINE)):
%item_nomsu = (recurse on %item_nomsu) %item_nomsu = (recurse on %item_nomsu)
%nomsu::add %item_nomsu %nomsu::add %item_nomsu
@ -320,7 +317,7 @@ action [decompile %tree]:
if (all of [%key.type == "Text", (size of %key) == 1, %key.1 is a nomsu identifier]): if (all of [%key.type == "Text", (size of %key) == 1, %key.1 is a nomsu identifier]):
%nomsu::add %key.1 %nomsu::add %key.1
..else: ..else:
%nomsu::add (decompile %key inline) %nomsu::add (%key decompiled inline)
if ((%key.type == "Action") or (%key.type == "Block")): if ((%key.type == "Action") or (%key.type == "Block")):
%nomsu::parenthesize %nomsu::parenthesize
%nomsu::add [": ", recurse on %value] %nomsu::add [": ", recurse on %value]
@ -331,7 +328,7 @@ action [decompile %tree]:
return %nomsu return %nomsu
("IndexChain", "Number", "Var"): ("IndexChain", "Number", "Var"):
return (decompile %tree inline) return (%tree decompiled inline)
"Error": "Error":
barf "Cannot decompile an error" barf "Cannot decompile an error"

4
nomnom/parser.nom
View File

@ -72,7 +72,7 @@ action [make parser from %peg] (make parser from %peg using (nil))
action [make parser from %peg using %make_tree]: action [make parser from %peg using %make_tree]:
%peg = (lpeg pattern %peg_tidier's match of %peg) %peg = (lpeg pattern %peg_tidier's match of %peg)
%peg = (lpeg re pattern %peg using %defs) %peg = (lpeg re pattern %peg using %defs)
local action [parse %input from %filename]: local action [%input from %filename parsed]:
%input = "\%input" %input = "\%input"
%tree_mt = {__index: {source:%input, filename:%filename}} %tree_mt = {__index: {source:%input, filename:%filename}}
%userdata = {..} %userdata = {..}
@ -81,4 +81,4 @@ action [make parser from %peg using %make_tree]:
%tree = (lpeg pattern %peg's match of %input with %userdata) %tree = (lpeg pattern %peg's match of %input with %userdata)
assume %tree or barf "File \%filename failed to parse:\n\%input" assume %tree or barf "File \%filename failed to parse:\n\%input"
return %tree return %tree
return (action (parse 1 from 2)) return (action (1 from 2 parsed))

1
string2.lua
View File

@ -189,5 +189,4 @@ for _index_0 = 1, #_list_0 do
local roundtrip = string2.from_lua_id(lua_id) local roundtrip = string2.from_lua_id(lua_id)
assert(roundtrip == test, "Failed lua_id roundtrip: '" .. tostring(test) .. "' -> " .. tostring(lua_id) .. " -> " .. tostring(roundtrip)) assert(roundtrip == test, "Failed lua_id roundtrip: '" .. tostring(test) .. "' -> " .. tostring(lua_id) .. " -> " .. tostring(roundtrip))
end end
assert(string2.as_lua_id('') == '_')
return string2 return string2

2
string2.moon
View File

@ -96,6 +96,6 @@ for test in *{"", "_", " ", "return", "asdf", "one two", "one_two", "Hex2Dec", "
lua_id = string2.as_lua_id(test) lua_id = string2.as_lua_id(test)
assert is_lua_id(lua_id), "failed to convert '#{test}' to a valid Lua identifier (got '#{lua_id}')" assert is_lua_id(lua_id), "failed to convert '#{test}' to a valid Lua identifier (got '#{lua_id}')"
roundtrip = string2.from_lua_id(lua_id) roundtrip = string2.from_lua_id(lua_id)
assert roundtrip == test, "Failed lua_id roundtrip: '#{test}' -> #{lua_id} -> #{roundtrip}" assert roundtrip == test, "Failed lua_id roundtrip: '#{test}' -> '#{lua_id}' -> '#{roundtrip}'"
return string2 return string2

2
syntax_tree.lua
View File

@ -196,8 +196,6 @@ for _index_0 = 1, #types do
__call = function(self, t) __call = function(self, t)
if type(t.source) == 'string' then if type(t.source) == 'string' then
t.source = Source:from_string(t.source) t.source = Source:from_string(t.source)
else
assert(Source:is_instance(t.source))
end end
setmetatable(t, self) setmetatable(t, self)
do do

4
syntax_tree.moon
View File

@ -82,8 +82,8 @@ for name in *types
__call: (t)=> __call: (t)=>
if type(t.source) == 'string' if type(t.source) == 'string'
t.source = Source\from_string(t.source) t.source = Source\from_string(t.source)
else --else
assert(Source\is_instance(t.source)) -- assert(Source\is_instance(t.source))
setmetatable(t, @) setmetatable(t, @)
if init = t.__init then init(t) if init = t.__init then init(t)
return t return t