Skip to content

Commit

Permalink
Fix warnings for require paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Ketho committed Nov 13, 2022
1 parent 6648e3f commit b790634
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Lua/Emmy/Emmy.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")

local Emmy = {}

Expand Down
2 changes: 1 addition & 1 deletion Lua/Emmy/EmmyLiterals.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")

local EmmyLiterals = {}

Expand Down
4 changes: 2 additions & 2 deletions Lua/Tests/Emmy.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local Util = require("Lua/Util/Util")
local Emmy = require("Lua/Emmy/Emmy")
local Util = require("Lua.Util.Util")
local Emmy = require("Lua.Emmy.Emmy")

local Tests = {}

Expand Down
4 changes: 2 additions & 2 deletions Lua/ToTypeScript/CVar.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")
-- cache should already be created at this point
local data = require("Lua/Data/cache/CVars")
local data = require("Lua.Data.cache.CVars")

local pre = [[
interface CVarInterface {
Expand Down
4 changes: 2 additions & 2 deletions Lua/ToTypeScript/GlobalString.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local lfs = require "lfs"

local Util = require("Lua/Util/Util")
local parser = require("Lua/Util/wowtoolsparser")
local Util = require("Lua.Util.Util")
local parser = require("Lua.Util.wowtoolsparser")

Util:MakeDir("src/data/globalstring")

Expand Down
2 changes: 1 addition & 1 deletion Lua/ToTypeScript/LuaEnum.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")

local PATH = "Lua/Data/cache/LuaEnum.lua"
local URL = "https://raw.githubusercontent.com/Ketho/BlizzardInterfaceResources/mainline/Resources/LuaEnum.lua"
Expand Down
2 changes: 1 addition & 1 deletion Lua/Util/wowtoolsparser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local lfs = require "lfs"
local https = require "ssl.https"
local cjson = require "cjson"
local cjsonutil = require "cjson.util"
local csv = require("Lua/Util/csv/csv")
local csv = require("Lua.Util.csv.csv")

local parser = {}

Expand Down
12 changes: 6 additions & 6 deletions Lua/WikiParser/WikiParser.lua
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
local Util = require("Lua/Util/Util")
local Emmy = require("Lua/Emmy/Emmy")
local Util = require("Lua.Util.Util")
local Emmy = require("Lua.Emmy.Emmy")

-- this place is a mess
local wowpedia_arguments = require("Lua/WikiParser/WikiText/FunctionArgument")
local nonBlizzDocumented = require("Lua/WikiParser/WikiText/NonBlizzardDocumented")[1]
local wowpedia_arguments = require("Lua.WikiParser.WikiText.FunctionArgument")
local nonBlizzDocumented = require("Lua.WikiParser.WikiText.NonBlizzardDocumented")[1]

local parserData = require("Lua/WikiParser/XmlParser")
local parserData = require("Lua.WikiParser.XmlParser")
local validated, nonvalidated, emmyLua
if type(parserData) == "table" then
validated, nonvalidated, emmyLua, emmyLuaMulti = unpack(parserData)
else
return
end
local converter = require("Lua/WikiParser/WikiText/WowpediaConverter")
local converter = require("Lua.WikiParser.WikiText.WowpediaConverter")
local convertedApi = converter:ConvertApi(validated)

local fileIndex = 0
Expand Down
4 changes: 2 additions & 2 deletions Lua/WikiParser/WikiText/FunctionArgument.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local nonBlizzDocumented = require("Lua/WikiParser/WikiText/NonBlizzardDocumented")[1]
local WikiText = require("Lua/WikiParser/WikiText/WikiText")
local nonBlizzDocumented = require("Lua.WikiParser.WikiText.NonBlizzardDocumented")[1]
local WikiText = require("Lua.WikiParser.WikiText.WikiText")

-- this has to be done manually because symbols get turned into HTML char codes when downloaded
-- local file = io.open("Lua/DataInput/World_of_Warcraft_API.txt", "r")
Expand Down
2 changes: 1 addition & 1 deletion Lua/WikiParser/WikiText/NonBlizzardDocumented.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")

local globalApi = Util:DownloadAndRun(
string.format("Lua/Data/cache/GlobalAPI_%s.lua", BRANCH),
Expand Down
2 changes: 1 addition & 1 deletion Lua/WikiParser/WikiText/WikiText.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local xml2lua = require "xml2lua"
local handler = require "xmlhandler.tree"
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")
--Util:MakeDir("cache_lua")

local INPUT = "Lua/Data/cache/World_of_Warcraft_API.xml"
Expand Down
6 changes: 3 additions & 3 deletions Lua/WikiParser/XmlParser.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
local xml2lua = require "xml2lua"
local handler = require "xmlhandler.tree"
local Util = require("Lua/Util/Util")
local Util = require("Lua.Util.Util")

local PATH = "Lua/Data/cache/Wowpedia_API.xml"

local function GetUndocumentedApi()
local nonBlizzDocumented = unpack(require("Lua/WikiParser/WikiText/NonBlizzardDocumented"))
local nonBlizzDocumented = unpack(require("Lua.WikiParser.WikiText.NonBlizzardDocumented"))
local t = {}
for k in pairs(nonBlizzDocumented) do
table.insert(t, "API "..k)
Expand All @@ -26,7 +26,7 @@ SaveWowpediaExport(PATH, undoc)
-- todo: refactor; still need to write these files for later
local function WriteApiFiles()
local output = "Lua/Data/output/NonBlizzardDocumented.txt"
local nonBlizzDocumented, blizzDocumented = unpack(require("Lua/WikiParser/WikiText/NonBlizzardDocumented"))
local nonBlizzDocumented, blizzDocumented = unpack(require("Lua.WikiParser.WikiText.NonBlizzardDocumented"))
local file1 = io.open(output, "w")
for _, name in pairs(Util:SortTable(nonBlizzDocumented)) do
file1:write("API "..name.."\n")
Expand Down

0 comments on commit b790634

Please sign in to comment.