From 9bba7dd2cd5860c8b527f10044f7e1c4d1a4a0e2 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Fri, 14 Sep 2018 14:46:20 -0700 Subject: Using more concise peg file finding. --- nomsu_compiler.lua | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'nomsu_compiler.lua') diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua index ea71671..bfeca01 100644 --- a/nomsu_compiler.lua +++ b/nomsu_compiler.lua @@ -130,22 +130,15 @@ end local Parsers = { } local max_parser_version = 0 for version = 1, 999 do - local peg_file = io.open("nomsu." .. tostring(version) .. ".peg") - if not peg_file and package.nomsupath then - for path in package.nomsupath:gmatch("[^;]+") do - peg_file = io.open(path .. "/nomsu." .. tostring(version) .. ".peg") - if peg_file then - break - end + do + local peg_contents = Files.read("nomsu." .. tostring(version) .. ".peg") + if peg_contents then + max_parser_version = version + Parsers[version] = make_parser(peg_contents, make_tree) + else + break end end - if not (peg_file) then - break - end - max_parser_version = version - local peg_contents = peg_file:read("*a") - Parsers[version] = make_parser(peg_contents, make_tree) - peg_file:close() end local MAX_LINE = 80 local NomsuCompiler = setmetatable({ -- cgit v1.2.3