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

All tests passing.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-12 21:24:08 -07:00
parent f908bb49b3
commit af62e3e8bf
11 changed files with 136 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/control_flow.nom
View File

@ -95,7 +95,7 @@ compile [repeat while %condition %body] to
\(%body as lua statements) \(%body as lua statements)
if if
%body has subtree % where: (%.type = "Action") and (%.stub is "do next repeat") %body has subtree % where: (%.type = "Action") and (%.stub is "do next repeat")
..: to %lua write "\n ::continue_repeat::" ..to %lua write "\n ::continue_repeat::"
to %lua write "\nend --while-loop" to %lua write "\nend --while-loop"
if if
%body has subtree % where: (%.type = "Action") and (%.stub is "stop repeating") %body has subtree % where: (%.type = "Action") and (%.stub is "stop repeating")

2
nomsu.lua
View File

@ -197,7 +197,7 @@ run = function()
end end
local tree = nomsu:parse(file, source) local tree = nomsu:parse(file, source)
if tree then if tree then
if tree.type ~= "FileChunks" then if tree.type ~= "File" then
tree = { tree = {
tree tree
} }

2
nomsu.moon
View File

@ -130,7 +130,7 @@ run = ->
return unless file return unless file
tree = nomsu\parse(file, source) tree = nomsu\parse(file, source)
if tree if tree
if tree.type != "FileChunks" if tree.type != "File"
tree = {tree} tree = {tree}
-- Each chunk's compilation is affected by the code in the previous chunks -- Each chunk's compilation is affected by the code in the previous chunks
-- (typically), so each chunk needs to compile and run before the next one -- (typically), so each chunk needs to compile and run before the next one

114
nomsu.peg
View File

@ -1,38 +1,37 @@
-- Nomsu version 2 -- Nomsu version 2
file (File): file (File):
{:curr_indent: '' :} %nl*
blank_line* {:curr_indent: ' '* :}
(chunk (nl_nodent chunk_delimeter nl_nodent chunk)*)? (chunk (nl_nodent chunk_delimeter nl_nodent chunk)*)?
blank_line* %nl*
(!. / (!! .* -> "Parse error" !!)) (!! .+ -> "Parse error" !!)?
nodent: =curr_indent !(" ") nodent: =curr_indent !(" ")
indent: =curr_indent " " !(" ") indent: =curr_indent " "
dedent: !(=curr_indent) (" ")* blank_lines: %nl (%ws* %nl)*
eol: %ws* (!. / &%nl) eol: (!. / &%nl)
comment (Comment): comment (Comment):
"#" {~ [^%nl]* (%nl+ ({:curr_indent: indent :} -> '') [^%nl]* (%nl+ (=curr_indent -> '') [^%nl]*)* (!. / nl_dedent))? ~} !inline_comment
"#" {~ [^%nl]* (blank_lines (indent -> '') [^%nl]*)* ~}
inline_comment (Comment): inline_comment (Comment):
"(#" {~ (inline_comment / [^%nl])* ~} "#)" "#(" {~ (inline_comment / [^%nl])* ~} ")#"
blank_line: %nl eol nl_nodent: blank_lines nodent
nl_nodent: blank_line* %nl nodent nl_indent: blank_lines {:curr_indent: indent :}
nl_indent: blank_line* %nl {:curr_indent: indent :}
nl_dedent: blank_line* %nl &dedent
chunk: !chunk_delimeter (block/action/expression) chunk: block / ((comment nl_nodent)* (action / expression)? (nl_nodent comment)*)
chunk_delimeter: ("~")^+3 chunk_delimeter: ("~")^+3
inline_block (Block): inline_block (Block):
(inline_comment / inline_statement) (%ws* ";" %ws* (inline_comment / inline_statement))+ inline_statement (%ws* ";" %ws* inline_statement)+ (%ws* inline_comment)*
block (Block): block (Block):
block_line (nl_nodent block_line)+ block_line (nl_nodent block_line)+ (nl_nodent comment)*
block_line: block_line:
comment / inline_comment / statement / (!! [^%nl]* -> "Unexpected character while parsing block line" !!) statement %ws* (!! [^%nl]+ -> "Unexpected character while parsing block line" !!)?
statement: (action / expression) (eol / (!! [^%nl]* -> "Unexpected character while parsing line" !!)) statement: (comment nl_nodent)* (action / expression) %ws* (!! [^%nl]+ -> "Unexpected character while parsing line" !!)?
inline_statement: inline_action / inline_expression inline_statement: (inline_comment %ws*)* (inline_action / inline_expression)
noindex_inline_expression: noindex_inline_expression:
number / variable / inline_text / inline_list / inline_dict / inline_nomsu number / variable / inline_text / inline_list / inline_dict / inline_nomsu
@ -40,29 +39,32 @@ noindex_inline_expression:
%ws* (inline_block / inline_action / inline_expression) %ws* %ws* (inline_block / inline_action / inline_expression) %ws*
(%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)*
(")" (")"
/ (!! eol -> 'Line ended without finding a closing )-parenthesis' !!) / (!! %ws* eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%nl]+ -> 'Unexpected character while parsing subexpression' !!) / (!! [^%nl]+ -> 'Unexpected character while parsing subexpression' !!)
) )
) )
inline_expression: index_chain / noindex_inline_expression inline_expression: index_chain / noindex_inline_expression
indented_expression: indented_expression:
indented_text / indented_nomsu / indented_list / indented_dict indented_text / indented_nomsu / indented_list / indented_dict / {|
/ (("(..)" / ":")? nl_indent ("(..)" / ":")? nl_indent (comment nl_nodent)*
(block / action / expression) (block / action / expression)
(!. / &nl_dedent / (!! (!nl_dedent .)* -> "Unexpected character while parsing indented expression" !!)) (!! [^%nl]+ -> "Unexpected character while parsing indented expression" !!)?
) {:is_halfblock: ''->'yep' :}
|}
expression: expression:
inline_expression inline_expression
/ (":" %ws* ((inline_block / inline_action / inline_expression) eol / (":" %ws*
/ (!! eol -> "Missing expression after the ':'" !!))) (!! eol -> "Missing expression after the ':'" !!)?
(inline_block / inline_action / inline_expression) %ws* eol)
/ indented_expression / indented_expression
inline_nomsu (EscapedNomsu): "\" inline_expression inline_nomsu (EscapedNomsu): "\" inline_expression
indented_nomsu (EscapedNomsu): indented_nomsu (EscapedNomsu):
"\" ( "\" (
noindex_inline_expression noindex_inline_expression
/ (":" %ws* ((inline_block / inline_action / inline_expression) eol / (":" %ws*
/ (!! eol -> "Missing expression after the ':'" !!))) (!! eol -> "Missing expression after the '\:'" !!)?
(inline_block / inline_action / inline_expression) %ws* eol)
/ indented_expression) / indented_expression)
index_chain (IndexChain): index_chain (IndexChain):
@ -70,26 +72,30 @@ index_chain (IndexChain):
-- Actions need either at least 1 word, or at least 2 tokens -- Actions need either at least 1 word, or at least 2 tokens
inline_action (Action): inline_action (Action):
( (inline_expression (%ws* (inline_expression / word))+) !chunk_delimeter
/ (word (%ws* (inline_expression / word))*)) (inline_comment %ws*)*
(%ws* ":" %ws* (inline_block / inline_action / inline_expression ( (inline_expression ((%ws* inline_comment)* %ws* (inline_expression / word))+)
/ (word ((%ws* inline_comment)* %ws* (inline_expression / word))*))
((%ws* inline_comment)* %ws* ":" %ws* (inline_block / inline_action / inline_expression
/ (!! '' -> "Missing expression after the ':'" !!)))? / (!! '' -> "Missing expression after the ':'" !!)))?
action (Action): action (Action):
(expression ((nl_nodent "..")? %ws* (expression / word))+) !chunk_delimeter
/ (word ((nl_nodent "..")? %ws* (expression / word))*) (inline_comment %ws*)*
( (expression (((nl_nodent comment)* nl_nodent "..")? %ws* (inline_comment %ws*)* (expression / word))+)
/ (word (((nl_nodent comment)* nl_nodent "..")? %ws* (inline_comment %ws*)* (expression / word))*))
word: !number ( %operator_char+ / %ident_char+ ) word: !number { %operator_char+ / %ident_char+ }
text_word (Text): word text_word (Text): word
inline_text (Text): inline_text (Text):
!('".."' eol) !('".."' %ws* eol)
'"' '"'
({~ (('\"' -> '"') / ('\\' -> '\') / %escaped_char / [^%nl\"])+ ~} ({~ (('\"' -> '"') / ('\\' -> '\') / %escaped_char / [^%nl\"])+ ~}
/ inline_text_interpolation)* / inline_text_interpolation)*
('"' ('"'
/ (!! eol -> 'Line ended before finding a closing double quotation mark' !!) / (!! eol -> 'Line ended before finding a closing double quotation mark' !!)
/ (!! [^%nl]* -> 'Unexpected character while parsing Text' !!)) / (!! [^%nl]+ -> 'Unexpected character while parsing Text' !!))
inline_text_interpolation: inline_text_interpolation:
"\" ( "\" (
variable / inline_list / inline_dict / inline_text variable / inline_list / inline_dict / inline_text
@ -97,21 +103,19 @@ inline_text_interpolation:
%ws* (inline_block / inline_action / inline_expression) %ws* %ws* (inline_block / inline_action / inline_expression) %ws*
(%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_block / inline_action / inline_expression) %ws*)*
(")" (")"
/ (!! &%nl -> 'Line ended without finding a closing )-parenthesis' !!) / (!! %ws* eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%nl]* -> 'Unexpected character while parsing Text interpolation' !!))) / (!! [^%nl]+ -> 'Unexpected character while parsing Text interpolation' !!)))
) )
-- Have to use "%indent" instead of "indent" etc. to avoid messing up text lines that start with "#"
indented_text (Text): indented_text (Text):
'".."' eol %nl '".."' %ws* %nl {:curr_indent: indent :}
{~ (%nl*) ({:curr_indent: indent :} -> "") ~} (indented_plain_text / text_interpolation / {~ blank_lines (=curr_indent -> "") ~})*
(indented_plain_text / text_interpolation / {~ %nl+ (nodent -> "") ~})* (!! [^%nl]+ -> "Unexpected character while parsing Text" !!)?
(!. / &nl_dedent / (!! (!nl_dedent .)* -> "Unexpected character while parsing Text" !!))
indented_plain_text (Text): indented_plain_text (Text):
{~ (("\\" -> "\") / (("\" nl_nodent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+ {~ (("\\" -> "\") / (("\" (blank_lines =curr_indent comment)* blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+
(%nl+ (nodent -> ""))* ~} (blank_lines (=curr_indent -> ""))* ~}
text_interpolation: text_interpolation:
inline_text_interpolation / ("\" indented_expression nl_nodent "..") inline_text_interpolation / ("\" indented_expression blank_lines =curr_indent "..")
number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber) number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber)
@ -124,15 +128,15 @@ inline_list (List):
"[" %ws* "[" %ws*
(inline_list_item (%ws* ',' %ws* inline_list_item)* (%ws* ',')?)? %ws* (inline_list_item (%ws* ',' %ws* inline_list_item)* (%ws* ',')?)? %ws*
("]" / (","? ( ("]" / (","? (
(!! eol -> "Line ended before finding a closing ]-bracket" !!) (!! %ws* eol -> "Line ended before finding a closing ]-bracket" !!)
/(!! [^%nl]* -> "Unexpected character while parsing List" !!) /(!! [^%nl]+ -> "Unexpected character while parsing List" !!)?
))) )))
indented_list (List): indented_list (List):
"[..]" nl_indent "[..]" nl_indent (comment nl_nodent)*
list_line (nl_nodent list_line)* list_line (nl_nodent list_line)*
(&nl_dedent / (","? (!! (!nl_dedent .)* -> "Unexpected character while parsing List" !!))) (","? (!! [^%nl]+ -> "Unexpected character while parsing List" !!))?
list_line: list_line:
(inline_list_item %ws* "," %ws*)+ eol (inline_list_item %ws* "," %ws*)+ %ws* eol
/ (inline_list_item %ws* "," %ws*)* (action / expression) / (inline_list_item %ws* "," %ws*)* (action / expression)
inline_list_item: inline_block / inline_action / inline_expression inline_list_item: inline_block / inline_action / inline_expression
@ -145,11 +149,11 @@ inline_dict (Dict):
/ (!! [^%nl]* -> "Unexpected character while parsing Dictionary" !!) / (!! [^%nl]* -> "Unexpected character while parsing Dictionary" !!)
))) )))
indented_dict (Dict): indented_dict (Dict):
"{..}" nl_indent "{..}" nl_indent (comment nl_nodent)*
dict_line (nl_nodent dict_line)* dict_line ((nl_nodent comment)* nl_nodent dict_line)* (nl_nodent comment)*
(&nl_dedent / (","? (!! (!nl_dedent .)* -> "Unexpected character while parsing Dictionary" !!))) (","? (!! [^%nl]+ -> "Unexpected character while parsing Dictionary" !!))?
dict_line: dict_line:
(inline_dict_entry %ws* "," %ws*)+ eol (inline_dict_entry %ws* "," %ws*)+ %ws* eol
/ (inline_dict_entry %ws* "," %ws*)* dict_entry / (inline_dict_entry %ws* "," %ws*)* dict_entry
dict_entry(DictEntry): dict_entry(DictEntry):
dict_key (%ws* ":" %ws* (action / expression))? dict_key (%ws* ":" %ws* (action / expression))?

8
nomsu_compiler.lua
View File

@ -367,7 +367,7 @@ do
if tree == nil then if tree == nil then
return nil return nil
end end
if tree.type == "FileChunks" then if tree.type == "File" then
local ret = nil local ret = nil
local all_lua = { } local all_lua = { }
for _index_0 = 1, #tree do for _index_0 = 1, #tree do
@ -708,8 +708,8 @@ do
return LuaCode.Value(tree.source, tostring(tree[1])) return LuaCode.Value(tree.source, tostring(tree[1]))
elseif "Var" == _exp_0 then elseif "Var" == _exp_0 then
return LuaCode.Value(tree.source, string.as_lua_id(tree[1])) return LuaCode.Value(tree.source, string.as_lua_id(tree[1]))
elseif "FileChunks" == _exp_0 then elseif "File" == _exp_0 then
return error("Cannot convert FileChunks to a single block of lua, since each chunk's " .. "compilation depends on the earlier chunks") return error("Cannot convert File to a single block of lua, since each chunk's " .. "compilation depends on the earlier chunks")
else else
return error("Unknown type: " .. tostring(tree.type)) return error("Unknown type: " .. tostring(tree.type))
end end
@ -757,7 +757,7 @@ do
end end
local inline, can_use_colon = options.inline, options.can_use_colon local inline, can_use_colon = options.inline, options.can_use_colon
local _exp_0 = tree.type local _exp_0 = tree.type
if "FileChunks" == _exp_0 then if "File" == _exp_0 then
if inline then if inline then
return nil return nil
end end

8
nomsu_compiler.moon
View File

@ -235,7 +235,7 @@ with NomsuCompiler
tree = if AST.is_syntax_tree(to_run) then to_run else @parse(to_run, source) tree = if AST.is_syntax_tree(to_run) then to_run else @parse(to_run, source)
if tree == nil -- Happens if pattern matches, but there are no captures, e.g. an empty string if tree == nil -- Happens if pattern matches, but there are no captures, e.g. an empty string
return nil return nil
if tree.type == "FileChunks" if tree.type == "File"
-- Each chunk's compilation is affected by the code in the previous chunks -- Each chunk's compilation is affected by the code in the previous chunks
-- (typically), so each chunk needs to compile and run before the next one -- (typically), so each chunk needs to compile and run before the next one
-- compiles. -- compiles.
@ -473,8 +473,8 @@ with NomsuCompiler
when "Var" when "Var"
return LuaCode.Value(tree.source, string.as_lua_id(tree[1])) return LuaCode.Value(tree.source, string.as_lua_id(tree[1]))
when "FileChunks" when "File"
error("Cannot convert FileChunks to a single block of lua, since each chunk's ".. error("Cannot convert File to a single block of lua, since each chunk's "..
"compilation depends on the earlier chunks") "compilation depends on the earlier chunks")
else else
@ -501,7 +501,7 @@ with NomsuCompiler
inline, can_use_colon = options.inline, options.can_use_colon inline, can_use_colon = options.inline, options.can_use_colon
switch tree.type switch tree.type
when "FileChunks" when "File"
return nil if inline return nil if inline
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
for i, chunk in ipairs tree for i, chunk in ipairs tree

3
nomsu_tree.lua
View File

@ -26,7 +26,8 @@ local types = {
"DictEntry", "DictEntry",
"IndexChain", "IndexChain",
"Action", "Action",
"FileChunks" "File",
"Comment"
} }
for _index_0 = 1, #types do for _index_0 = 1, #types do
local name = types[_index_0] local name = types[_index_0]

2
nomsu_tree.moon
View File

@ -10,7 +10,7 @@ AST.is_syntax_tree = (n, t=nil)->
type(n) == 'table' and getmetatable(n) and AST[n.type] == getmetatable(n) and (t == nil or n.type == t) type(n) == 'table' and getmetatable(n) and AST[n.type] == getmetatable(n) and (t == nil or n.type == t)
types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry", types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry",
"IndexChain", "Action", "FileChunks"} "IndexChain", "Action", "File", "Comment"}
for name in *types for name in *types
cls = {} cls = {}
with cls with cls

45
parser.lua
View File

@ -91,19 +91,54 @@ setmetatable(NOMSU_DEFS, {
value.source = Source(_with_0.filename, _with_0.start + start - 1, _with_0.start + stop - 1) value.source = Source(_with_0.filename, _with_0.start + start - 1, _with_0.start + stop - 1)
end end
end end
if key == "Comment" then while true do
value = value[1] local found = false
else for i = #value, 1, -1 do
local _continue_0 = false
repeat
if not (type(value[i]) == 'table') then
_continue_0 = true
break
end
if value[i].is_halfblock then
found = true
local hb = remove(value, i)
for _index_0 = 1, #hb do
local v = hb[_index_0]
insert(value, i, v)
i = i + 1
end
end
_continue_0 = true
until true
if not _continue_0 then
break
end
end
if not (found) then
break
end
end
local comments = { } local comments = { }
for i = #value, 1, -1 do for i = #value, 1, -1 do
if type(value[i]) == 'table' and value[i].type == "Comment" then local _continue_0 = false
repeat
if not (type(value[i]) == 'table') then
_continue_0 = true
break
end
if value[i].type == "Comment" then
insert(comments, remove(value, i)) insert(comments, remove(value, i))
end end
_continue_0 = true
until true
if not _continue_0 then
break
end
end end
if #comments > 0 then if #comments > 0 then
value.comments = comments value.comments = comments
end end
end
setmetatable(value, AST[key]) setmetatable(value, AST[key])
if value.__init then if value.__init then
value:__init() value:__init()

17
parser.moon
View File

@ -58,12 +58,21 @@ setmetatable(NOMSU_DEFS, {__index:(key)=>
if userdata.source if userdata.source
with userdata.source with userdata.source
value.source = Source(.filename, .start + start-1, .start + stop-1) value.source = Source(.filename, .start + start-1, .start + stop-1)
if key == "Comment" while true
value = value[1] found = false
else for i=#value,1,-1
continue unless type(value[i]) == 'table'
if value[i].is_halfblock
found = true
hb = remove(value, i)
for v in *hb
insert value, i, v
i += 1
break unless found
comments = {} comments = {}
for i=#value,1,-1 for i=#value,1,-1
if type(value[i]) == 'table' and value[i].type == "Comment" continue unless type(value[i]) == 'table'
if value[i].type == "Comment"
insert comments, remove(value, i) insert comments, remove(value, i)
if #comments > 0 if #comments > 0
value.comments = comments value.comments = comments

4
tests/text.nom
View File

@ -45,9 +45,9 @@ assume
assume assume
".." ".."
no\ # Comment no\
#comment #comment
#.. #
block comment block comment
..gap ..gap
..= "nogap" ..= "nogap"