From 40b4b41d27573904203bdbba311e78aa44ae421d Mon Sep 17 00:00:00 2001 From: Li Jin Date: Thu, 23 Mar 2023 18:26:56 +0800 Subject: fix yue.loadfile for issue #129. --- src/yuescript/yue_compiler.cpp | 2 +- src/yuescript/yuescript.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp index 8a63098..8c99303 100644 --- a/src/yuescript/yue_compiler.cpp +++ b/src/yuescript/yue_compiler.cpp @@ -72,7 +72,7 @@ static std::unordered_set Metamethods = { "close"s // Lua 5.4 }; -const std::string_view version = "0.15.29"sv; +const std::string_view version = "0.15.30"sv; const std::string_view extension = "yue"sv; class CompileError : public std::logic_error { diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h index b007797..271a982 100644 --- a/src/yuescript/yuescript.h +++ b/src/yuescript/yuescript.h @@ -125,8 +125,11 @@ yue_loadstring = function(...) })) end local function yue_loadfile(fname, ...) - local text = yue.read_file(fname) - return yue_loadstring(text, fname, ...) + local res, err = yue.read_file(fname) + if not res then + return nil, err + end + return yue_loadstring(res, fname, ...) end local function yue_dofile(...) local f = assert(yue_loadfile(...)) -- cgit v1.2.3-55-g6feb