From 348adec643820a7b8380dcb66ce6cfc5420469f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Thu, 8 Dec 2016 10:34:37 +0100
Subject: vis-lua: move mode constants from vis.MODE_* to vis.modes.*

---
 vis-lua.c | 66 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'vis-lua.c')

diff --git a/vis-lua.c b/vis-lua.c
index fec7270..7318ec3 100644
--- a/vis-lua.c
+++ b/vis-lua.c
@@ -507,28 +507,12 @@ static const char *keymapping(Vis *vis, const char *keys, const Arg *arg) {
  * @tfield Ui ui the user interface being used
  */
 /***
- * Normal mode.
- * @tfield int MODE_NORMAL
+ * Mode constants.
+ * @tfield modes modes
  */
 /***
- * Oerator pending mode.
- * @tfield int MODE_OPERATOR_PENDING
- */
-/***
- * Insert mode.
- * @tfield int MODE_INSERT
- */
-/***
- * Replace mode.
- * @tfield int MODE_REPLACE
- */
-/***
- * Characterwise visual mode.
- * @tfield int MODE_VISUAL
- */
-/***
- * Linewise visual mode.
- * @tfield int MODE_VISUAL_LINE
+ * Events.
+ * @tfield events events
  */
 
 /***
@@ -927,13 +911,7 @@ static int feedkeys(lua_State *L) {
  */
 /***
  * Currently active mode.
- * @tfield int mode
- * @see MODE_NORMAL
- * @see MODE_OPERATOR_PENDING
- * @see MODE_INSERT
- * @see MODE_REPLACE
- * @see MODE_VISUAL
- * @see MODE_VISUAL_LINE
+ * @tfield modes mode
  */
 /***
  * Whether a macro is being recorded.
@@ -1736,6 +1714,24 @@ static const struct luaL_Reg file_lines_funcs[] = {
  * @tfield int finish
  */
 
+/***
+ * Modes.
+ * @section Modes
+ */
+
+/***
+ * Mode constants.
+ * @table modes
+ * @tfield int NORMAL
+ * @tfield int OPERATOR_PENDING
+ * @tfield int INSERT
+ * @tfield int REPLACE
+ * @tfield int VISUAL
+ * @tfield int VISUAL_LINE
+ * @see Vis:map
+ * @see Window:map
+ */
+
 /***
  * Core Events.
  *
@@ -1966,16 +1962,18 @@ void vis_lua_init(Vis *vis) {
 	lua_pushstring(L, VERSION);
 	lua_setfield(L, -2, "VERSION");
 
+	lua_newtable(L);
+
 	static const struct {
 		enum VisMode id;
 		const char *name;
 	} modes[] = {
-		{ VIS_MODE_NORMAL,           "MODE_NORMAL"           },
-		{ VIS_MODE_OPERATOR_PENDING, "MODE_OPERATOR_PENDING" },
-		{ VIS_MODE_VISUAL,           "MODE_VISUAL"           },
-		{ VIS_MODE_VISUAL_LINE,      "MODE_VISUAL_LINE"      },
-		{ VIS_MODE_INSERT,           "MODE_INSERT"           },
-		{ VIS_MODE_REPLACE,          "MODE_REPLACE"          },
+		{ VIS_MODE_NORMAL,           "NORMAL"           },
+		{ VIS_MODE_OPERATOR_PENDING, "OPERATOR_PENDING" },
+		{ VIS_MODE_VISUAL,           "VISUAL"           },
+		{ VIS_MODE_VISUAL_LINE,      "VISUAL_LINE"      },
+		{ VIS_MODE_INSERT,           "INSERT"           },
+		{ VIS_MODE_REPLACE,          "REPLACE"          },
 	};
 
 	for (size_t i = 0; i < LENGTH(modes); i++) {
@@ -1983,6 +1981,8 @@ void vis_lua_init(Vis *vis) {
 		lua_setfield(L, -2, modes[i].name);
 	}
 
+	lua_setfield(L, -2, "modes");
+
 	obj_ref_new(L, vis, "vis");
 	lua_setglobal(L, "vis");
 
-- 
cgit v1.2.3