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

Disabled comment transpilation for now.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-17 14:47:28 -07:00
parent 26d0de8299
commit b589c23741
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/metaprogramming.nom
View File

@ -155,10 +155,7 @@ action [help %action]:
# Compiler tools # Compiler tools
immediately: immediately:
compile [run %code] to: compile [run %code] to:
Lua value ".." Lua value "nomsu:run(\(%code as lua expr), \(=lua "tree.source"))"
nomsu:run(\(%code as lua expr), '\
=lua "nomsu:get_line_number(nomsu.compilestack[#nomsu.compilestack])"
..')
parse [enable debugging] as: lua> "nomsu.debug = true;" parse [enable debugging] as: lua> "nomsu.debug = true;"
parse [disable debugging] as: lua> "nomsu.debug = false;" parse [disable debugging] as: lua> "nomsu.debug = false;"

1
nomsu.lua
View File

@ -1149,7 +1149,6 @@ do
end end
}) })
self.use_stack = { } self.use_stack = { }
self.compilestack = { }
self.file_metadata = setmetatable({ }, { self.file_metadata = setmetatable({ }, {
__mode = "k" __mode = "k"
}) })

6
nomsu.moon
View File

@ -38,6 +38,7 @@ debug_getinfo = debug.getinfo
-- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution -- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution
-- Allow plain text backslash like: "\n" in longstrings without requiring "\\n" -- Allow plain text backslash like: "\n" in longstrings without requiring "\\n"
-- Maybe support some kind of regex action definitions like "foo %first (and %next)*"? -- Maybe support some kind of regex action definitions like "foo %first (and %next)*"?
-- Re-implement nomsu-to-lua comment translation
export FILE_CACHE export FILE_CACHE
FILE_CACHE = setmetatable {}, { FILE_CACHE = setmetatable {}, {
@ -181,7 +182,7 @@ NOMSU_PATTERN = do
re.compile(nomsu_peg, NOMSU_DEFS) re.compile(nomsu_peg, NOMSU_DEFS)
class NomsuCompiler class NomsuCompiler
new:()=> new: =>
-- Weak-key mapping from objects to randomly generated unique IDs -- Weak-key mapping from objects to randomly generated unique IDs
NaN_surrogate = {} NaN_surrogate = {}
nil_surrogate = {} nil_surrogate = {}
@ -195,7 +196,6 @@ class NomsuCompiler
return id return id
}) })
@use_stack = {} @use_stack = {}
@compilestack = {}
@file_metadata = setmetatable({}, {__mode:"k"}) @file_metadata = setmetatable({}, {__mode:"k"})
@action_metadata = setmetatable({}, {__mode:"k"}) @action_metadata = setmetatable({}, {__mode:"k"})
@ -881,7 +881,7 @@ if arg and debug_getinfo(2).func != require
print "Usage: lua nomsu.lua [-c] [-i] [-p] [-O] [--help] [input [-o output]]" print "Usage: lua nomsu.lua [-c] [-i] [-p] [-O] [--help] [input [-o output]]"
os.exit! os.exit!
nomsu = NomsuCompiler() nomsu = NomsuCompiler!
ok, to_lua = pcall -> require('moonscript.base').to_lua ok, to_lua = pcall -> require('moonscript.base').to_lua
if not ok then to_lua = nil if not ok then to_lua = nil

4
nomsu.peg
View File

@ -107,8 +107,8 @@ inline_dict_item:
dict_key: dict_key:
(({} ({|{%operator / (!number plain_word)}|} -> Tuple) {}) -> Text) / inline_expression (({} ({|{%operator / (!number plain_word)}|} -> Tuple) {}) -> Text) / inline_expression
block_comment(Comment): "#.." { [^%nl]* (%nl+ %indent [^%nl]* (%nl+ %nodent [^%nl]*)* %dedent)? } block_comment: "#.." [^%nl]* (%nl+ %indent [^%nl]* (%nl+ %nodent [^%nl]*)* %dedent)?
line_comment(Comment): "#" { [^%nl]* } line_comment: "#" [^%nl]*
eol: %ws* line_comment? (!. / &%nl) eol: %ws* line_comment? (!. / &%nl)
ignored_line: (%nodent (block_comment / line_comment)) / (%ws* (!. / &%nl)) ignored_line: (%nodent (block_comment / line_comment)) / (%ws* (!. / &%nl))