From 9a86b0579a5cf6af68fa3b054ca609ece3ecaded Mon Sep 17 00:00:00 2001 From: arne Date: Sat, 4 Oct 2025 23:14:20 +0200 Subject: [PATCH] Use positive indices for argchecks --- main/paper.h | 194 +++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/main/paper.h b/main/paper.h index c283f56..b33d4fe 100644 --- a/main/paper.h +++ b/main/paper.h @@ -52,7 +52,7 @@ static int set_rotation (lua_State *L) { strcmp(rotation, "portrait") == 0 || strcmp(rotation, "inverted_landscape") == 0 || strcmp(rotation, "inverted_portrait") == 0, - -1, + 1, "expected `rotation` to be either 'landscape', 'portrait', 'inverted_landscape' or 'inverted_portrait'" ); epd_set_rotation( @@ -86,12 +86,12 @@ static int draw_pixel (lua_State *L) { int x, y, color; int isnum; - x = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x` to be a number"); - y = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x` to be a number"); + y = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y` to be a number"); + color = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 3, "expected `color` to be a number within [0, 255]"); epd_draw_pixel(x, y, color, fb); return 0; @@ -101,16 +101,16 @@ static int draw_line (lua_State *L) { int x1, y1, x2, y2, color; int isnum; - x1 = lua_tonumberx(L, -5, &isnum); - luaL_argcheck(L, isnum, -5, "expected `x1` to be a number"); - y1 = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `y1` to be a number"); - x2 = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x2` to be a number"); - y2 = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y2` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x1 = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x1` to be a number"); + y1 = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y1` to be a number"); + x2 = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `x2` to be a number"); + y2 = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum, 4, "expected `y2` to be a number"); + color = lua_tonumberx(L, 5, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 5, "expected `color` to be a number within [0, 255]"); epd_draw_line(x1, y1, x2, y2, color, fb); return 0; @@ -120,14 +120,14 @@ static int draw_hline (lua_State *L) { int x, y, length, color; int isnum; - x = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `x` to be a number"); - y = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `y` to be a number"); - length = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `length` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x` to be a number"); + y = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y` to be a number"); + length = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `length` to be a number"); + color = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 4, "expected `color` to be a number within [0, 255]"); epd_draw_hline(x, y, length, color, fb); return 0; @@ -137,14 +137,14 @@ static int draw_vline (lua_State *L) { int x, y, length, color; int isnum; - x = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `x` to be a number"); - y = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `y` to be a number"); - length = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `length` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x` to be a number"); + y = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y` to be a number"); + length = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `length` to be a number"); + color = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 4, "expected `color` to be a number within [0, 255]"); epd_draw_vline(x, y, length, color, fb); return 0; @@ -154,14 +154,14 @@ static int draw_circle (lua_State *L) { int x, y, radius, color; int isnum; - x = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `x` to be a number"); - y = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `y` to be a number"); - radius = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `radius` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x` to be a number"); + y = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y` to be a number"); + radius = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `radius` to be a number"); + color = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 4, "expected `color` to be a number within [0, 255]"); epd_draw_circle(x, y, radius, color, fb); return 0; @@ -171,14 +171,14 @@ static int fill_circle (lua_State *L) { int x, y, radius, color; int isnum; - x = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `x` to be a number"); - y = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `y` to be a number"); - radius = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `radius` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x` to be a number"); + y = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y` to be a number"); + radius = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `radius` to be a number"); + color = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 4, "expected `color` to be a number within [0, 255]"); epd_fill_circle(x, y, radius, color, fb); return 0; @@ -188,16 +188,16 @@ static int draw_rect (lua_State *L) { int x1, y1, x2, y2, color; int isnum; - x1 = lua_tonumberx(L, -5, &isnum); - luaL_argcheck(L, isnum, -5, "expected `x1` to be a number"); - y1 = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `y1` to be a number"); - x2 = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x2` to be a number"); - y2 = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y2` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x1 = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x1` to be a number"); + y1 = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y1` to be a number"); + x2 = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `x2` to be a number"); + y2 = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum, 4, "expected `y2` to be a number"); + color = lua_tonumberx(L, 5, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 5, "expected `color` to be a number within [0, 255]"); EpdRect rect = { .x = x1, @@ -213,16 +213,16 @@ static int fill_rect (lua_State *L) { int x1, y1, x2, y2, color; int isnum; - x1 = lua_tonumberx(L, -5, &isnum); - luaL_argcheck(L, isnum, -5, "expected `x1` to be a number"); - y1 = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `y1` to be a number"); - x2 = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x2` to be a number"); - y2 = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y2` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x1 = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x1` to be a number"); + y1 = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y1` to be a number"); + x2 = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `x2` to be a number"); + y2 = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum, 4, "expected `y2` to be a number"); + color = lua_tonumberx(L, 5, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 5, "expected `color` to be a number within [0, 255]"); EpdRect rect = { .x = x1, @@ -238,20 +238,20 @@ static int draw_triangle (lua_State *L) { int x1, y1, x2, y2, x3, y3, color; int isnum; - x1 = lua_tonumberx(L, -7, &isnum); - luaL_argcheck(L, isnum, -7, "expected `x1` to be a number"); - y1 = lua_tonumberx(L, -6, &isnum); - luaL_argcheck(L, isnum, -6, "expected `y1` to be a number"); - x2 = lua_tonumberx(L, -5, &isnum); - luaL_argcheck(L, isnum, -5, "expected `x2` to be a number"); - y2 = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `y2` to be a number"); - x3 = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x3` to be a number"); - y3 = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y3` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x1 = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x1` to be a number"); + y1 = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y1` to be a number"); + x2 = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `x2` to be a number"); + y2 = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum, 4, "expected `y2` to be a number"); + x3 = lua_tonumberx(L, 5, &isnum); + luaL_argcheck(L, isnum, 5, "expected `x3` to be a number"); + y3 = lua_tonumberx(L, 6, &isnum); + luaL_argcheck(L, isnum, 6, "expected `y3` to be a number"); + color = lua_tonumberx(L, 7, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 7, "expected `color` to be a number within [0, 255]"); epd_draw_triangle(x1, y1, x2, y2, x3, y3, color, fb); return 0; @@ -261,20 +261,20 @@ static int fill_triangle (lua_State *L) { int x1, y1, x2, y2, x3, y3, color; int isnum; - x1 = lua_tonumberx(L, -7, &isnum); - luaL_argcheck(L, isnum, -7, "expected `x1` to be a number"); - y1 = lua_tonumberx(L, -6, &isnum); - luaL_argcheck(L, isnum, -6, "expected `y1` to be a number"); - x2 = lua_tonumberx(L, -5, &isnum); - luaL_argcheck(L, isnum, -5, "expected `x2` to be a number"); - y2 = lua_tonumberx(L, -4, &isnum); - luaL_argcheck(L, isnum, -4, "expected `y2` to be a number"); - x3 = lua_tonumberx(L, -3, &isnum); - luaL_argcheck(L, isnum, -3, "expected `x3` to be a number"); - y3 = lua_tonumberx(L, -2, &isnum); - luaL_argcheck(L, isnum, -2, "expected `y3` to be a number"); - color = lua_tonumberx(L, -1, &isnum); - luaL_argcheck(L, isnum && color >= 0 && color < 256, -1, "expected `color` to be a number within [0, 255]"); + x1 = lua_tonumberx(L, 1, &isnum); + luaL_argcheck(L, isnum, 1, "expected `x1` to be a number"); + y1 = lua_tonumberx(L, 2, &isnum); + luaL_argcheck(L, isnum, 2, "expected `y1` to be a number"); + x2 = lua_tonumberx(L, 3, &isnum); + luaL_argcheck(L, isnum, 3, "expected `x2` to be a number"); + y2 = lua_tonumberx(L, 4, &isnum); + luaL_argcheck(L, isnum, 4, "expected `y2` to be a number"); + x3 = lua_tonumberx(L, 5, &isnum); + luaL_argcheck(L, isnum, 5, "expected `x3` to be a number"); + y3 = lua_tonumberx(L, 6, &isnum); + luaL_argcheck(L, isnum, 6, "expected `y3` to be a number"); + color = lua_tonumberx(L, 7, &isnum); + luaL_argcheck(L, isnum && color >= 0 && color < 256, 7, "expected `color` to be a number within [0, 255]"); epd_fill_triangle(x1, y1, x2, y2, x3, y3, color, fb); return 0;