From 1747856cf5f775507ad2e7b39b635437c7169a19 Mon Sep 17 00:00:00 2001 From: V1K1NGbg Date: Tue, 23 Jul 2024 16:46:06 +0300 Subject: fix attempt 5 --- src/luarocks/core/util.tl | 2 +- src/luarocks/type/rockspec.lua | 56 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl index ffdb6bc4..e934c52a 100644 --- a/src/luarocks/core/util.tl +++ b/src/luarocks/core/util.tl @@ -192,7 +192,7 @@ function util.split_string(str: string, delim: string, maxNb?: number): {string} for part, pos in string.gmatch(str, pat) do nb = nb + 1 result[nb] = part - lastPos = tonumber(pos) as integer + lastPos = tonumber(pos) as integer --? cast because math.tointeger returns an integer? if nb == maxNb then break end end -- Handle the last field diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua index 63ceabf6..0b3cf31f 100644 --- a/src/luarocks/type/rockspec.lua +++ b/src/luarocks/type/rockspec.lua @@ -135,35 +135,35 @@ local rockspec_formats, versions = type_check.declare_schemas({ } }) -type_rockspec.order = {"rockspec_format", "package", "version", - { "source", { "url", "tag", "branch", "md5" } }, - { "description", {"summary", "detailed", "homepage", "license" } }, - "supported_platforms", "dependencies", "build_dependencies", "external_dependencies", - { "build", {"type", "modules", "copy_directories", "platforms"} }, - "test_dependencies", { "test", {"type"} }, - "hooks"} +-- type_rockspec.order = {"rockspec_format", "package", "version", +-- { "source", { "url", "tag", "branch", "md5" } }, +-- { "description", {"summary", "detailed", "homepage", "license" } }, +-- "supported_platforms", "dependencies", "build_dependencies", "external_dependencies", +-- { "build", {"type", "modules", "copy_directories", "platforms"} }, +-- "test_dependencies", { "test", {"type"} }, +-- "hooks"} --- type_rockspec.order = { --- "rockspec_format", --- "package", --- "version", --- "source", --- "description", --- "supported_platforms", --- "dependencies", --- "build_dependencies", --- "external_dependencies", --- "build", --- "test_dependencies", --- "test", --- "hooks", --- sub_orders = { --- ["source"] = { "url", "tag", "branch", "md5" }, --- ["description"] = {"summary", "detailed", "homepage", "license" }, --- ["build"] = { "type", "modules", "copy_directories", "platforms" }, --- ["test"] = { "type" } --- } --- } +type_rockspec.order = { + "rockspec_format", + "package", + "version", + "source", + "description", + "supported_platforms", + "dependencies", + "build_dependencies", + "external_dependencies", + "build", + "test_dependencies", + "test", + "hooks", + sub_orders = { + ["source"] = { "url", "tag", "branch", "md5" }, + ["description"] = {"summary", "detailed", "homepage", "license" }, + ["build"] = { "type", "modules", "copy_directories", "platforms" }, + ["test"] = { "type" } + } +} local function check_rockspec_using_version(rockspec, globals, version) local schema = rockspec_formats[version] -- cgit v1.2.3-55-g6feb