Skip to content

Commit 1597823

Browse files
committed
remove redirection lua files
1 parent 08e1a02 commit 1597823

19 files changed

Lines changed: 35 additions & 33 deletions

File tree

examples/build_node_types.lua

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,17 @@ end
9595

9696
local compiler = assert(
9797
nl.File(
98-
"nattlua/parser.lua",
98+
"nattlua/parser/parser.lua",
9999
{
100-
emitter = {preserve_whitespace = false,},
100+
emitter = {
101+
preserve_whitespace = false,
102+
},
101103
parser = {
102104
inline_require = true,
103105
on_parsed_node = function(self, node)
104106
if node.type == "statement" then crawl_statement(node) end
105-
end
106-
}
107+
end,
108+
},
107109
}
108110
):Parse()
109111
)
@@ -147,5 +149,9 @@ for _, v in sorted_pairs(found) do
147149
code = code .. "}\n"
148150
end
149151

150-
local res = nl.Compiler(code, "", {emitter = {preserve_whitespace = false, comment_type_annotations = false}}):Emit()
152+
local res = nl.Compiler(
153+
code,
154+
"",
155+
{emitter = {preserve_whitespace = false, comment_type_annotations = false}}
156+
):Emit()
151157
print(res, #res)

examples/transform.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
local nl = require("nattlua")
2-
local LuaEmitter = require("nattlua.emitter").New
2+
local LuaEmitter = require("nattlua.emitter.emitter").New
33
local code = io.open("nattlua/parser.lua"):read("*all")
44
local ast = assert(nl.Compiler(code):Parse()).SyntaxTree
55
local em = LuaEmitter({preserve_whitespace = false})

nattlua/analyzer.lua

Lines changed: 0 additions & 1 deletion
This file was deleted.

nattlua/analyzer/expressions/function.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local Function = require("nattlua.types.function").Function
66
local Any = require("nattlua.types.any").Any
77
local VarArg = require("nattlua.types.tuple").VarArg
88
local ipairs = _G.ipairs
9-
local Emitter = require("nattlua.emitter").New
9+
local Emitter = require("nattlua.emitter.emitter").New
1010

1111
local function analyze_arguments(self, node)
1212
local args = {}

nattlua/base_environment.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local Table = require("nattlua.types.table").Table
22
local Nil = require("nattlua.types.symbol").Nil
33
local LStringNoMeta = require("nattlua.types.string").LStringNoMeta
4-
local Analyzer = require("nattlua.analyzer").New
4+
local Analyzer = require("nattlua.analyzer.analyzer").New
55

66
if not _G.IMPORTS then
77
_G.IMPORTS = setmetatable(

nattlua/compiler.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ local BuildBaseEnvironment = require("nattlua.base_environment").BuildBaseEnviro
1111
local setmetatable = _G.setmetatable
1212
local Code = require("nattlua.code").New
1313
local class = require("nattlua.other.class")
14-
local Lexer = require("nattlua.lexer").New
15-
local Parser = require("nattlua.parser").New
16-
local Analyzer = require("nattlua.analyzer").New
17-
local Emitter = require("nattlua.emitter").New
14+
local Lexer = require("nattlua.lexer.lexer").New
15+
local Parser = require("nattlua.parser.parser").New
16+
local Analyzer = require("nattlua.analyzer.analyzer").New
17+
local Emitter = require("nattlua.emitter.emitter").New
1818
local loadstring = require("nattlua.other.loadstring")
1919
local stringx = require("nattlua.other.string")
2020
local META = class.CreateTemplate("compiler")

nattlua/emitter.lua

Lines changed: 0 additions & 1 deletion
This file was deleted.

nattlua/lexer.lua

Lines changed: 0 additions & 1 deletion
This file was deleted.

nattlua/parser.lua

Lines changed: 0 additions & 1 deletion
This file was deleted.

nattlua/parser/node.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,11 +796,11 @@ function META:Render(config)
796796
--[[#attest.expect_diagnostic<|"warning", "always true"|>]]
797797

798798
if _G.IMPORTS--[[# as false]] then
799-
emitter = IMPORTS["nattlua.emitter"]()
799+
emitter = IMPORTS["nattlua.emitter.emitter"]()
800800
else
801801
--[[#£ parser.dont_hoist_next_import = true]]
802802

803-
emitter = require("nattlua.emitter"--[[# as string]])
803+
emitter = require("nattlua.emitter.emitter"--[[# as string]])
804804
end
805805
end
806806

0 commit comments

Comments
 (0)