talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve some error messages

Browse Source
This commit is contained in:
jyelon
2021-12-27 17:10:46 -05:00
parent 0c021dc93a
commit 154ee737c6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
luprex/core/cpp/luastack.cpp
View File

@@ -198,19 +198,19 @@ std::string LuaStack::getclass(LuaSlot classtab, LuaSlot classname) const {
if (LS.isstring(classname)) { if (LS.isstring(classname)) {
if (!validclassname(LS.ckstring(classname))) { if (!validclassname(LS.ckstring(classname))) {
std::string err = "Not allowed as a class name: " + LS.ckstring(classname); std::string err = "invalid class name: " + LS.ckstring(classname);
LS.result(); LS.result();
return err; return err;
} }
LS.rawget(classtab, globtab, classname); LS.rawget(classtab, globtab, classname);
if (!LS.istable(classtab)) { if (!LS.istable(classtab)) {
std::string err = "Not a class: " + LS.ckstring(classname); std::string err = "not a class: " + LS.ckstring(classname);
LS.result(); LS.result();
return err; return err;
} }
LS.rawget(cname, classtab, "__class"); LS.rawget(cname, classtab, "__class");
if (!LS.rawequal(cname, classname)) { if (!LS.rawequal(cname, classname)) {
std::string err = "Not a valid class: " + LS.ckstring(classname); std::string err = "not a valid class: " + LS.ckstring(classname);
LS.result(); LS.result();
return err; return err;
} }
@@ -219,18 +219,18 @@ std::string LuaStack::getclass(LuaSlot classtab, LuaSlot classname) const {
} else if (LS.istable(classname)) { } else if (LS.istable(classname)) {
LS.rawget(cname, classname, "__class"); LS.rawget(cname, classname, "__class");
if (!LS.isstring(cname)) { if (!LS.isstring(cname)) {
std::string err = "Table is not a class."; std::string err = "table is not a class.";
LS.result(); LS.result();
return err; return err;
} }
if (!validclassname(LS.ckstring(cname))) { if (!validclassname(LS.ckstring(cname))) {
std::string err = "Not allowed as a class name: " + LS.ckstring(cname); std::string err = "invalid class name: " + LS.ckstring(cname);
LS.result(); LS.result();
return err; return err;
} }
LS.rawget(classtab, globtab, cname); LS.rawget(classtab, globtab, cname);
if (!LS.rawequal(classtab, classname)) { if (!LS.rawequal(classtab, classname)) {
std::string err = "Not a valid class: " + LS.ckstring(cname); std::string err = "not a valid class: " + LS.ckstring(cname);
LS.result(); LS.result();
return err; return err;
} }