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

Fixed one compiler bug with comments immediately after indenting

Browse Source
This commit is contained in:
Bruce Hill 2017-10-02 20:17:52 -07:00
parent e3200dece1
commit 9251b462da
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/operators.nom
View File

@ -13,10 +13,9 @@ compile [nop, pass] to code: ""
# Ternary operator # Ternary operator
compile [%if_expr if %condition else %else_expr] to: ".." compile [%if_expr if %condition else %else_expr] to: ".."
|(function(nomsu, vars)
# TODO: fix compiler bug that breaks this code if comments immediately follow ".."
#.. Note: this uses a function instead of (condition and if_expr or else_expr) #.. Note: this uses a function instead of (condition and if_expr or else_expr)
because that breaks if %if_expr is falsey. because that breaks if %if_expr is falsey.
|(function(nomsu, vars)
| if \(%condition) then; | if \(%condition) then;
| return \(%if_expr); | return \(%if_expr);
| else; | else;

4
nomsu.lua
View File

@ -128,12 +128,12 @@ local nomsu = [=[ file <- ({ {| shebang?
list_line <- (inline_list_item comma)* ((inline_list_item %ws? ",") / (functioncall / expression)) list_line <- (inline_list_item comma)* ((inline_list_item %ws? ",") / (functioncall / expression))
inline_list_item <- inline_functioncall / inline_expression inline_list_item <- inline_functioncall / inline_expression
block_comment <- "#.." [^%nl]* indent [^%nl]* (%nl ((%ws? (!. / &%nl)) / (!%dedented [^%nl]*)))* block_comment <- "#.." [^%nl]* (%nl (%ws? &%nl))* %nl %indented [^%nl]+ (%nl ((%ws? (!. / &%nl)) / (!%dedented [^%nl]+)))*
line_comment <- "#" [^%nl]* line_comment <- "#" [^%nl]*
eol <- %ws? line_comment? (!. / &%nl) eol <- %ws? line_comment? (!. / &%nl)
ignored_line <- (%nodented (block_comment / line_comment)) / (%ws? (!. / &%nl)) ignored_line <- (%nodented (block_comment / line_comment)) / (%ws? (!. / &%nl))
indent <- eol (%nl ignored_line)* %nl %indented indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)?
nodent <- eol (%nl ignored_line)* %nl %nodented nodent <- eol (%nl ignored_line)* %nl %nodented
dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented))) dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented)))
tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%']) tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%'])

6
nomsu.moon
View File

@ -27,8 +27,10 @@ colored = setmetatable({}, {__index:(_,color)-> ((msg)-> colors[color]..msg..col
-- provide way to run precompiled nomsu -> lua code from nomsu -- provide way to run precompiled nomsu -> lua code from nomsu
-- better scoping? -- better scoping?
-- better error reporting -- better error reporting
-- fix propagation of filename for error reporting
-- add line numbers of function calls -- add line numbers of function calls
-- type checking? -- type checking?
-- Fix compiler bug that breaks when file ends with a block comment
lpeg.setmaxstack 10000 -- whoa lpeg.setmaxstack 10000 -- whoa
{:P,:V,:S,:Cg,:C,:Cp,:B,:Cmt} = lpeg {:P,:V,:S,:Cg,:C,:Cp,:B,:Cmt} = lpeg
@ -130,12 +132,12 @@ nomsu = [=[
list_line <- (inline_list_item comma)* ((inline_list_item %ws? ",") / (functioncall / expression)) list_line <- (inline_list_item comma)* ((inline_list_item %ws? ",") / (functioncall / expression))
inline_list_item <- inline_functioncall / inline_expression inline_list_item <- inline_functioncall / inline_expression
block_comment <- "#.." [^%nl]* indent [^%nl]* (%nl ((%ws? (!. / &%nl)) / (!%dedented [^%nl]*)))* block_comment <- "#.." [^%nl]* (%nl (%ws? &%nl))* %nl %indented [^%nl]+ (%nl ((%ws? (!. / &%nl)) / (!%dedented [^%nl]+)))*
line_comment <- "#" [^%nl]* line_comment <- "#" [^%nl]*
eol <- %ws? line_comment? (!. / &%nl) eol <- %ws? line_comment? (!. / &%nl)
ignored_line <- (%nodented (block_comment / line_comment)) / (%ws? (!. / &%nl)) ignored_line <- (%nodented (block_comment / line_comment)) / (%ws? (!. / &%nl))
indent <- eol (%nl ignored_line)* %nl %indented indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)?
nodent <- eol (%nl ignored_line)* %nl %nodented nodent <- eol (%nl ignored_line)* %nl %nodented
dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented))) dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented)))
tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%']) tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%'])