nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Make lua selection negate return a new selection

Browse Source 
... instead of modifying the one given as a parameter.

Also add tests for it.
This commit is contained in:
Pasi Kallinen
2020-02-22 10:58:17 +02:00
parent 29321c6f80
commit e8ee044468
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nhlsel.c
View File

@@ -113,6 +113,7 @@ lua_State *L;
return 1;
}
/* Replace the topmost selection in the stack with a clone of it. */
/* local sel = selection.clone(sel); */
static int
l_selection_clone(L)
@@ -120,7 +121,6 @@ lua_State *L;
{
struct selectionvar *sel = l_selection_check(L, 1);
struct selectionvar *tmp;
/* int x,y; */ /* REVIEW: unreferenced */
lua_pop(L, 1);
(void) l_selection_new(L);
tmp = l_selection_check(L, 1);
@@ -207,17 +207,24 @@ lua_State *L;
/* local s = selection.negate(sel); */
/* local s = selection.negate(); */
/* local s = sel:negate(); */
static int
l_selection_not(L)
lua_State *L;
{
int argc = lua_gettop(L);
struct selectionvar *sel;
struct selectionvar *sel, *sel2;
if (argc == 0)
if (argc == 0) {
(void) l_selection_new(L);
sel = l_selection_check(L, 1);
selection_not(sel);
sel = l_selection_check(L, 1);
selection_not(sel);
} else {
sel = l_selection_check(L, 1);
(void) l_selection_clone(L);
sel2 = l_selection_check(L, 1);
selection_not(sel2);
}
lua_settop(L, 1);
return 1;
}