Start refactoring LuaStack

This commit is contained in:
2023-04-07 12:58:05 -04:00
parent 7f000bc0fd
commit 44c5a56172
6 changed files with 52 additions and 53 deletions

View File

@@ -683,7 +683,7 @@ void HttpClientRequest::set_params(LuaCoreStack &LS0, LuaSlot tab) {
return;
}
LuaVar key, val;
LuaOldStack LS(LS0.state(), key, val);
LuaDefStack LS(LS0.state(), key, val);
LS.set(key, LuaNil);
while (LS.next(tab, key, val)) {
set_param(LS, key, val);
@@ -736,7 +736,7 @@ void HttpClientRequest::set_defaults() {
void HttpClientRequest::configure(LuaKeywordParser &kp) {
LuaVar val;
LuaOldStack LS(kp.state(), val);
LuaExtStack LS(kp.state(), val);
if (kp.parse(val, "method")) {
set_method(LS, val);
}
@@ -1032,7 +1032,7 @@ void HttpServerResponse::set_jsonvalue(LuaCoreStack &LS, LuaSlot val) {
void HttpServerResponse::configure(LuaKeywordParser &kp) {
LuaVar val;
LuaOldStack LS(kp.state(), val);
LuaExtStack LS(kp.state(), val);
if (kp.parse(val, "status")) {
set_status(LS, val);
}
@@ -1470,7 +1470,7 @@ bool HttpParser::parse_content(std::string_view &view, bool closed) {
void HttpParser::store(LuaCoreStack &LS0, LuaSlot tab) const {
LuaVar ptab, djson;
LuaOldStack LS(LS0.state(), ptab, djson);
LuaExtStack LS(LS0.state(), ptab, djson);
LS.newtable(tab);
if (!is_request_) {
@@ -1659,7 +1659,7 @@ void HttpClientRequestMap::deserialize(StreamBuffer *sb) {
LuaDefine(http_fixurl, "url", "validate URL and repair minor flaws in the URL syntax") {
LuaArg url;
LuaRet fixed;
LuaOldStack LS(L, url, fixed);
LuaDefStack LS(L, url, fixed);
ParsedURL parsed(LS.ckstring(url));
if (!parsed.valid) {
luaL_error(L, "invalid URL, not fixable");
@@ -1715,7 +1715,7 @@ LuaDefine(http_clientrequest, "request",
"|that would be sent.") {
LuaArg tab;
LuaRet str;
LuaOldStack LS(L, tab, str);
LuaDefStack LS(L, tab, str);
LuaKeywordParser kp(LS, tab);
HttpClientRequest req;
req.configure(kp);
@@ -1774,7 +1774,7 @@ LuaDefine(http_clientresponse, "response",
"|an actual HTTP response string. This is for debugging only.") {
LuaArg text;
LuaRet tab;
LuaOldStack LS(L, text, tab);
LuaDefStack LS(L, text, tab);
HttpParser parser;
parser.parse_response(LS.ckstring(text), true, "GET");
parser.store(LS, tab);
@@ -1829,7 +1829,7 @@ LuaDefine(http_serverrequest, "request",
"|an actual HTTP request string. This is for debugging only.") {
LuaArg text;
LuaRet tab;
LuaOldStack LS(L, text, tab);
LuaDefStack LS(L, text, tab);
HttpParser parser;
parser.parse_request(LS.ckstring(text), true);
parser.store(LS, tab);
@@ -1887,7 +1887,7 @@ LuaDefine(http_serverresponse, "response",
"|that would be sent.") {
LuaArg tab;
LuaRet str;
LuaOldStack LS(L, tab, str);
LuaDefStack LS(L, tab, str);
LuaKeywordParser kp(LS, tab);
HttpServerResponse resp;
resp.configure(kp);
@@ -1901,7 +1901,7 @@ LuaDefine(http_serverresponse, "response",
LuaDefine(http_validmime, "(mt)", "") {
LuaArg str;
LuaRet ok;
LuaOldStack LS(L, str, ok);
LuaDefStack LS(L, str, ok);
LS.set(ok, valid_mime_type(LS.ckstring(str)));
return LS.result();
}
@@ -1909,7 +1909,7 @@ LuaDefine(http_validmime, "(mt)", "") {
LuaDefine(http_statusstring, "(statuscode)", "Convert a 3-digit status code to a string") {
LuaArg code;
LuaRet str;
LuaOldStack LS(L, code, str);
LuaDefStack LS(L, code, str);
int icode = LS.ckint(code);
LS.set(str, status_code_to_string(icode));
return LS.result();
@@ -1918,7 +1918,7 @@ LuaDefine(http_statusstring, "(statuscode)", "Convert a 3-digit status code to a
LuaDefine(http_statuscode, "(statusstring)", "Convert a string to a 3-digit status code") {
LuaArg str;
LuaRet code;
LuaOldStack LS(L, code, str);
LuaDefStack LS(L, code, str);
eng::string sstr = LS.ckstring(str);
LS.set(code, status_code_from_string(sstr));
int iresult = LS.result();