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

Upgraded nomsu.1.peg to tidier version.

Browse Source
This commit is contained in:
Bruce Hill 2018-09-14 14:25:55 -07:00
parent 21d0d7901c
commit 54e1f99e90
3 changed files with 106 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
nomsu.1.peg
View File

@ -1,65 +1,87 @@
-- Nomsu version 2 -- Nomsu version 1
file (FileChunks): file (FileChunks):
{:curr_indent: ' '* :} {:curr_indent: ' '* :}
("#!" (!"nomsu" [^%nl])* "nomsu" %ws+ "-V" %ws* {:version: [0-9.]+ :} [^%nl]*)? ("#!" (!"nomsu" [^%nl])* "nomsu" ws+ "-V" ws* {:version: [0-9.]+ :} [^%nl]*)?
comment? blank_lines? comment? blank_lines?
(chunk (nl_nodent chunk_delimeter nl_nodent chunk)*)? (chunk (nl_nodent chunk_delimeter nl_nodent chunk)*)?
blank_lines? blank_lines?
%ws* (!! .+ -> "Parse error" !!)? {:curr_indent: %nil :}
!.
nodent: =curr_indent !(" ") nodent: (unexpected_indent [^%nl]* / =curr_indent)
indent: =curr_indent " " indent: =curr_indent " "
blank_lines: %nl ((nodent comment / %ws*) %nl)* blank_lines: %nl ((nodent comment / ws*) %nl)*
eol: %ws* eol_comment? (!. / &%nl) eol: ws* eol_comment? (!. / &%nl)
nl_nodent: blank_lines nodent nl_nodent: blank_lines nodent
nl_indent: blank_lines {:curr_indent: indent :} (comment nl_nodent)? nl_indent: blank_lines {:curr_indent: indent :} (comment nl_nodent)*
comment: comment (Comment):
"#" (({} {~ [^%nl]* (%nl+ (indent -> '') [^%nl]*)* ~} %userdata) => add_comment) "#" {~ [^%nl]* (%nl+ (indent -> '') [^%nl]*)* ~}
eol_comment: eol_comment (Comment):
"#" (({} {[^%nl]*} %userdata) => add_comment) "#" {[^%nl]*}
unexpected_code: ws* _unexpected_code
_unexpected_code (Error):
{:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :}
unexpected_indent (Error):
{:error: {~ (=curr_indent ws+) -> "Messed up indentation" ~} :}
{:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :}
missing_paren_err (Error):
{:error: {~ eol -> 'Line ended without finding a closing )-parenthesis' ~} :}
{:hint: {~ '' -> 'Put a ")" here' ~} :}
missing_quote_err (Error):
{:error: {~ eol -> 'Line ended before finding a closing double quotation mark' ~} :}
{:hint: {~ "" -> "Put a quotation mark here" ~} :}
missing_bracket_error (Error):
{:error: {~ eol -> "Line ended before finding a closing ]-bracket" ~} :}
{:hint: {~ '' -> 'Put a "]" here' ~} :}
missing_brace_error (Error):
{:error: {~ eol -> "Line ended before finding a closing }-brace" ~} :}
{:hint: {~ '' -> 'Put a "}" here' ~} :}
missing_block_expr_error (Error):
{:error: '' -> "Missing expression after the ':'" :}
chunk: block / action / expression chunk: block / action / expression
chunk_delimeter: ("~")^+3 eol chunk_delimeter: ("~")^+3 eol
inline_block (Block): inline_block (Block):
inline_statement (%ws* ";" %ws* inline_statement)+ inline_statement (ws* ";" ws* inline_statement)+
block (Block): block (Block):
statement (nl_nodent statement)+ statement (nl_nodent statement)+
(%nl (ws* %nl)* nodent (comment / eol / unexpected_code))*
{:curr_indent: %nil :}
statement: (action / expression) (eol / (!! [^%nl]+ -> "Unexpected character while parsing line" !!)) statement: (action / expression) (eol / unexpected_code)
inline_statement: (inline_action / inline_expression) inline_statement: (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
/ ( "(" / ( "("
%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*)*
(")" (")" / missing_paren_err / unexpected_code)
/ (!! eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%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
(block / action / expression) (nl_nodent comment)* (block / action / expression) (eol / unexpected_code)
(eol / (!! [^%nl]+ -> "Unexpected character while parsing indented expression" !!)) (%nl (ws* %nl)* nodent (comment / eol / unexpected_code))*
{:curr_indent: %nil :}
|} -> unpack) |} -> unpack)
expression: expression:
inline_expression inline_expression
/ (":" %ws* / (":" ws*
(inline_block / inline_action / inline_expression / (!! '' -> "Missing expression after the ':'" !!))) (inline_block / inline_action / inline_expression / missing_block_expr_error))
/ 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* / (":" ws*
(inline_block / inline_action / inline_expression) (!! '' -> "Missing expression after the '\:'" !!)) (inline_block / inline_action / inline_expression / missing_block_expr_error))
/ indented_expression) / indented_expression)
index_chain (IndexChain): index_chain (IndexChain):
@ -68,42 +90,39 @@ 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):
!chunk_delimeter !chunk_delimeter
( (inline_expression (%ws* (inline_expression / word))+) ( (inline_expression (ws* (inline_expression / word))+)
/ (word (%ws* (inline_expression / word))*)) / (word (ws* (inline_expression / word))*))
(%ws* ":" %ws* (inline_block / inline_action / inline_expression (ws* ":" ws* (inline_block / inline_action / inline_expression
/ (!! '' -> "Missing expression after the ':'" !!)))? / missing_block_expr_error))?
action (Action): action (Action):
!chunk_delimeter !chunk_delimeter
( (expression ((nl_nodent "..")? %ws* (expression / word))+) ( (expression ((nl_nodent "..")? ws* (expression / word))+)
/ (word ((nl_nodent "..")? %ws* (expression / word))*)) / (word ((nl_nodent "..")? 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) !(indented_text)
'"' '"'
({~ (('\"' -> '"') / ('\\' -> '\') / %escaped_char / [^%nl\"])+ ~} ({~ (('\"' -> '"') / ('\\' -> '\') / escaped_char / [^%nl\"])+ ~}
/ inline_text_interpolation)* / inline_text_interpolation)*
('"' ('"' / missing_quote_err / unexpected_code)
/ (!! eol -> 'Line ended before finding a closing double quotation mark' !!)
/ (!! [^%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
/ ("(" / ("("
%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*)*
(")" (")" / missing_paren_err / unexpected_code))
/ (!! eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%nl]+ -> 'Unexpected character while parsing Text interpolation' !!)))
) )
indented_text (Text): indented_text (Text):
'".."' eol %nl {%nl*} {:curr_indent: indent :} '".."' eol %nl {%nl+}? {:curr_indent: indent :}
(indented_plain_text / text_interpolation / {~ %nl+ (=curr_indent -> "") ~})* (indented_plain_text / text_interpolation / {~ %nl+ (=curr_indent -> "") ~})*
(!! [^%nl]+ -> "Unexpected character while parsing Text" !!)? unexpected_code?
{:curr_indent: %nil :}
indented_plain_text (Text): indented_plain_text (Text):
{~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+ {~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+
(%nl+ (=curr_indent -> ""))* ~} (%nl+ (=curr_indent -> ""))* ~}
@ -114,43 +133,51 @@ number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonum
-- Variables can be nameless (i.e. just %) and can't contain operators like apostrophe -- Variables can be nameless (i.e. just %) and can't contain operators like apostrophe
-- which is a hack to allow %'s to parse as "%" and "' s" separately -- which is a hack to allow %'s to parse as "%" and "' s" separately
variable (Var): "%" {(%ident_char+ ((!"'" %operator_char+) / %ident_char+)*)?} variable (Var): "%" {(ident_char+ ((!"'" operator_char+) / ident_char+)*)?}
inline_list (List): 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*
("]" / (","? ( ("]" / (","? (missing_bracket_error / unexpected_code)))
(!! eol -> "Line ended before finding a closing ]-bracket" !!)
/(!! [^%nl]+ -> "Unexpected character while parsing List" !!)
)))
indented_list (List): indented_list (List):
"[..]" eol nl_indent "[..]" eol nl_indent
list_line (nl_nodent list_line)* (nl_nodent comment)* list_line (nl_nodent list_line)*
(","? (!! [^%nl]+ -> "Unexpected character while parsing List" !!))? (%nl (ws* %nl)* nodent (comment / eol / unexpected_code))*
(","? unexpected_code)?
list_line: list_line:
(inline_list_item %ws* "," %ws*)+ eol (inline_list_item ws* "," ws*)+ eol
/ (inline_list_item %ws* "," %ws*)* (action / expression) eol / (inline_list_item ws* "," ws*)* (action / expression) eol
inline_list_item: inline_block / inline_action / inline_expression inline_list_item: inline_block / inline_action / inline_expression
inline_dict (Dict): inline_dict (Dict):
!('{..}') !('{..}')
"{" %ws* "{" ws*
(inline_dict_entry (%ws* ',' %ws* inline_dict_entry)*)? %ws* (inline_dict_entry (ws* ',' ws* inline_dict_entry)*)? ws*
("}" / (","? ( ("}" / (","? (missing_brace_error / unexpected_code)))
(!! eol -> "Line ended before finding a closing }-brace" !!)
/ (!! [^%nl]* -> "Unexpected character while parsing Dictionary" !!)
)))
indented_dict (Dict): indented_dict (Dict):
"{..}" eol nl_indent "{..}" eol nl_indent
dict_line (nl_nodent dict_line)* (nl_nodent comment)* dict_line (nl_nodent dict_line)*
(","? (!! [^%nl]+ -> "Unexpected character while parsing Dictionary" !!))? (%nl (ws* %nl)* nodent (comment / eol / unexpected_code))*
(","? unexpected_code)?
dict_line: dict_line:
(inline_dict_entry %ws* "," %ws*)+ eol (inline_dict_entry ws* "," ws*)+ eol
/ (inline_dict_entry %ws* "," %ws*)* dict_entry eol / (inline_dict_entry ws* "," ws*)* dict_entry eol
dict_entry(DictEntry): dict_entry(DictEntry):
dict_key (%ws* ":" %ws* (action / expression))? dict_key (ws* ":" ws* (action / expression))?
inline_dict_entry(DictEntry): inline_dict_entry(DictEntry):
dict_key (%ws* ":" %ws* (inline_block / inline_action / inline_expression)?)? dict_key (ws* ":" ws* (inline_block / inline_action / inline_expression)?)?
dict_key: dict_key:
text_word / inline_expression text_word / inline_expression
operator_char: ['`~!@$^&*+=|<>?/-]
ident_char: [a-zA-Z0-9_] / %utf8_char
ws: [ %tab]
escaped_char:
("\"->'') (
(([xX]->'') ((({[0-9a-fA-F]^2} %number_16) -> tonumber) -> tochar))
/ ((([0-9] [0-9]^-2) -> tonumber) -> tochar)
/ ("a"->ascii_7) / ("b"->ascii_8) / ("t"->ascii_9) / ("n"->ascii_10)
/ ("v"->ascii_11) / ("f"->ascii_12) / ("r"->ascii_13)
)

11
nomsu_compiler.lua
View File

@ -98,12 +98,6 @@ end
local Parsers = { } local Parsers = { }
local max_parser_version = 0 local max_parser_version = 0
for version = 1, 999 do for version = 1, 999 do
local _continue_0 = false
repeat
if not (version == 4 or version == 3 or version == 2) then
_continue_0 = true
break
end
local peg_file = io.open("nomsu." .. tostring(version) .. ".peg") local peg_file = io.open("nomsu." .. tostring(version) .. ".peg")
if not peg_file and package.nomsupath then if not peg_file and package.nomsupath then
for path in package.nomsupath:gmatch("[^;]+") do for path in package.nomsupath:gmatch("[^;]+") do
@ -120,11 +114,6 @@ for version = 1, 999 do
local peg_contents = peg_file:read("*a") local peg_contents = peg_file:read("*a")
Parsers[version] = make_parser(peg_contents, make_tree) Parsers[version] = make_parser(peg_contents, make_tree)
peg_file:close() peg_file:close()
_continue_0 = true
until true
if not _continue_0 then
break
end
end end
local MAX_LINE = 80 local MAX_LINE = 80
local NomsuCompiler = setmetatable({ local NomsuCompiler = setmetatable({

1
nomsu_compiler.moon
View File

@ -56,7 +56,6 @@ make_tree = (tree, userdata)->
Parsers = {} Parsers = {}
max_parser_version = 0 max_parser_version = 0
for version=1,999 for version=1,999
continue unless version == 4 or version == 3 or version == 2 -- TODO: remove
peg_file = io.open("nomsu.#{version}.peg") peg_file = io.open("nomsu.#{version}.peg")
if not peg_file and package.nomsupath if not peg_file and package.nomsupath
for path in package.nomsupath\gmatch("[^;]+") for path in package.nomsupath\gmatch("[^;]+")