LuaFAR: add a few stack operations to Macro-API engine.

Author: shmuz

far/changelog

@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+shmuel 2025-10-24 20:22:16+03:00 - build 6576
+
+1. Add a few stack operations to Macro-API engine.
+
 --------------------------------------------------------------------------------
 drkns 2025-10-20 23:56:08+01:00 - build 6575
 

far/macroapi.cpp

@@ -130,6 +130,31 @@ class FarMacroApi
 		return PushValue(static_cast<long long>(Value));
 	}
 
+	int StackGetTop() const
+	{
+		FarMacroValue val(FMVT_STACKGETTOP);
+		SendValue(val);
+		return val.Integer;
+	}
+	void StackSetTop(int top) const
+	{
+		FarMacroValue val(FMVT_STACKSETTOP);
+		val.Integer = top;
+		SendValue(val);
+	}
+	void StackPop(int count) const
+	{
+		FarMacroValue val(FMVT_STACKPOP);
+		val.Integer = count;
+		SendValue(val);
+	}
+	void StackPushValue(int pos) const
+	{
+		FarMacroValue val(FMVT_STACKPUSHVALUE);
+		val.Integer = pos;
+		SendValue(val);
+	}
+
 	void absFunc() const;
 	void ascFunc() const;
 	void atoiFunc() const;

far/plugin.hpp

@@ -1484,6 +1484,12 @@ enum FARMACROVARTYPE
 	FMVT_NEWTABLE               = 12,
 	FMVT_SETTABLE               = 13,
 	FMVT_DIALOG                 = 14,
+	FMVT_TABLE                  = 15,
+	FMVT_GETTABLE               = 16,
+	FMVT_STACKPOP               = 17,
+	FMVT_STACKGETTOP            = 18,
+	FMVT_STACKSETTOP            = 19,
+	FMVT_STACKPUSHVALUE         = 20,
 };
 
 struct FarMacroValue

far/vbuild.m4

@@ -1 +1 @@
-6575
+6576

plugins/luamacro/_globalinfo.lua

@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 896 },
+    Version       = { 3, 0, 0, 897 },
     MinFarVersion = { 3, 0, 0, 6564 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

plugins/luamacro/changelog

@@ -1,3 +1,7 @@
+shmuel 2025-10-24 20:23:49+03:00 - build 897
+
+1. LuaFAR: add a few stack operations to Macro-API engine.
+
 zg 2025-09-28 23:12:02+03:00 - build 896
 
 1. Menu.GetItemExtendedData now has 1st optional parameter: dialog handle.

plugins/luamacro/luafar/lf_exported.c

@@ -802,14 +802,6 @@ void PushFarMacroValue(lua_State* L, const struct FarMacroValue* val)
 			lua_setfield(L, -2, "type");
 			break;
 
-		case FMVT_NEWTABLE:
-			lua_newtable(L);
-			break;
-
-		case FMVT_SETTABLE:
-			lua_settable(L, -3);
-			break;
-
 		default:
 			lua_pushnil(L);
 			break;

plugins/luamacro/luafar/lf_luamacro.c

@@ -166,19 +166,71 @@ HANDLE Open_Luamacro(lua_State* L, const struct OpenInfo *Info)
 typedef struct
 {
 	lua_State *L;
-	int ret_avail;
+	int start_stack;
+	int max_stack;
 	int error;
 } mcfc_data;
 
 static void WINAPI MacroCallFarCallback(void *Data, struct FarMacroValue *Val, size_t Count)
 {
 	mcfc_data *cbdata = (mcfc_data*)Data;
+	if (cbdata->error)
+		return;
+
 	(void) Count;
-	if (!cbdata->error && cbdata->ret_avail > 0)
+	lua_State *L = cbdata->L;
+	int top = lua_gettop(L);
+	int stack_avail = cbdata->max_stack - top;
+
+	switch(Val->Type)
 	{
-		cbdata->error = (Val->Type == FMVT_ERROR);
-		cbdata->ret_avail += (Val->Type == FMVT_SETTABLE) ? 2 : -1;
-		PushFarMacroValue(cbdata->L, Val);
+		case FMVT_NEWTABLE:
+			if (stack_avail > 0)
+				lua_newtable(L);
+			break;
+
+		case FMVT_SETTABLE:
+			if (lua_istable(L, -3))
+				lua_settable(L, -3);
+			break;
+
+		case FMVT_GETTABLE:
+			if (stack_avail > 0)
+			{
+				lua_gettable(L, -3);
+				ConvertLuaValue(L, -1, Val);
+			}
+			break;
+
+		case FMVT_STACKPOP:
+			int param = (int)Val->Value.Integer;
+			if (param > 0 && (top - param) >= cbdata->start_stack)
+				lua_pop(L, param);
+			break;
+
+		case FMVT_STACKGETTOP:
+			Val->Type = FMVT_INTEGER;
+			Val->Value.Integer = lua_gettop(L);
+			break;
+
+		case FMVT_STACKSETTOP:
+			int val = (int)Val->Value.Integer;
+			if (val >= cbdata->start_stack && val <= cbdata->max_stack)
+				lua_settop(L, val);
+			break;
+
+		case FMVT_STACKPUSHVALUE:
+			if (stack_avail > 0)
+				lua_pushvalue(L, (int)Val->Value.Integer);
+			break;
+
+		default:
+			if (stack_avail > 0)
+			{
+				cbdata->error = (Val->Type == FMVT_ERROR);
+				PushFarMacroValue(L, Val);
+			}
+			break;
 	}
 }
 
@@ -187,17 +239,18 @@ int far_MacroCallFar(lua_State *L)
 	enum { MAXARG=32, MAXRET=32 };
 	struct FarMacroValue args[MAXARG];
 	struct FarMacroCall fmc;
-	int idx, ret, pushed;
-	mcfc_data cbdata = { L, MAXRET, 0 };
+	int top = lua_gettop(L);
+	mcfc_data cbdata = { L, top, top + MAXRET, 0 };
 	TPluginData *pd = GetPluginData(L);
 	struct MacroPrivateInfo *privateInfo = (struct MacroPrivateInfo*)pd->Info->Private;
+
 	int opcode = (int)luaL_checkinteger(L, 1);
-	fmc.Count = lua_gettop(L) - 1;
+	fmc.Count = top - 1;
 	fmc.Values = fmc.Count<=MAXARG ? args:(struct FarMacroValue*)malloc(fmc.Count*sizeof(struct FarMacroValue));
 	fmc.Callback = MacroCallFarCallback;
 	fmc.CallbackData = &cbdata;
 
-	for(idx=0; idx<(int)fmc.Count; idx++)
+	for(int idx=0; idx<(int)fmc.Count; idx++)
 	{
 		ConvertLuaValue(L, idx+2, fmc.Values+idx);
 		if (fmc.Values[idx].Type == FMVT_UNKNOWN)
@@ -213,9 +266,9 @@ int far_MacroCallFar(lua_State *L)
 	}
 
 	lua_checkstack(L, MAXRET);
-	ret = (int) privateInfo->CallFar(opcode, &fmc);
+	int ret = (int) privateInfo->CallFar(opcode, &fmc);
 	FP_PROTECT(); // protect from plugins activating FPU exceptions
-	pushed = MAXRET - cbdata.ret_avail;
+	int pushed = lua_gettop(L) - top;
 	if (fmc.Values != args)
 		free(fmc.Values);
 	if (cbdata.error)

plugins/luamacro/luafar/lf_service.c

@@ -463,6 +463,20 @@ void ConvertLuaValue (lua_State *L, int pos, struct FarMacroValue *target)
 			target->Value.Binary.Data = (void*)lua_tolstring(L, -1, &target->Value.Binary.Size);
 		}
 		lua_pop(L,1);
+//		lua_rawgeti(L,pos,0);
+//		if (lua_type(L,-1) == LUA_TSTRING && !strcmp("binary", lua_tostring(L,-1)))
+//		{
+//			lua_rawgeti(L,pos,1);
+//			target->Type = FMVT_BINARY;
+//			target->Value.Binary.Size = 0;
+//			target->Value.Binary.Data = (void*)lua_tolstring(L, -1, &target->Value.Binary.Size);
+//			lua_pop(L,1);
+//		}
+//		else
+//		{
+//			target->Type = FMVT_TABLE;
+//		}
+//		lua_pop(L,1);
 	}
 	else if (type == LUA_TBOOLEAN)
 	{

plugins/luamacro/luafar/lf_version.h

@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 896
+#define PLUGIN_BUILD 897