'lua.h' back to redundancy in version definitionsv5.4.7

Several tools inspect 'lua.h' to extract version information, and
they assume the file will have some specific format.

2 files changed, 12 insertions, 22 deletions

diff --git a/lua.h b/lua.h
index 41a4bf8c..f050dac0 100644
--- a/lua.h
+++ b/lua.h
@@ -1,7 +1,7 @@
 /*
 ** $Id: lua.h $
 ** Lua - A Scripting Language
-** Lua.org, PUC-Rio, Brazil (www.lua.org)
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
 */
 
@@ -13,19 +13,20 @@
 #include <stddef.h>
 
 
-#define LUA_COPYRIGHT   LUA_RELEASE "  Copyright (C) 1994-2024 Lua.org, PUC-Rio"
-#define LUA_AUTHORS     "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
-
+#include "luaconf.h"
 
-#define LUA_VERSION_MAJOR_N     5
-#define LUA_VERSION_MINOR_N     4
-#define LUA_VERSION_RELEASE_N   7
 
-#define LUA_VERSION_NUM  (LUA_VERSION_MAJOR_N * 100 + LUA_VERSION_MINOR_N)
-#define LUA_VERSION_RELEASE_NUM  (LUA_VERSION_NUM * 100 + LUA_VERSION_RELEASE_N)
+#define LUA_VERSION_MAJOR       "5"
+#define LUA_VERSION_MINOR       "4"
+#define LUA_VERSION_RELEASE     "7"
 
+#define LUA_VERSION_NUM                 504
+#define LUA_VERSION_RELEASE_NUM         (LUA_VERSION_NUM * 100 + 7)
 
-#include "luaconf.h"
+#define LUA_VERSION     "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE     LUA_VERSION "." LUA_VERSION_RELEASE
+#define LUA_COPYRIGHT   LUA_RELEASE "  Copyright (C) 1994-2024 Lua.org, PUC-Rio"
+#define LUA_AUTHORS     "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
 
 
 /* mark for precompiled code ('<esc>Lua') */
@@ -495,17 +496,6 @@ struct lua_Debug {
 /* }====================================================================== */
 
 
-#define LUAI_TOSTRAUX(x)        #x
-#define LUAI_TOSTR(x)           LUAI_TOSTRAUX(x)
-
-#define LUA_VERSION_MAJOR       LUAI_TOSTR(LUA_VERSION_MAJOR_N)
-#define LUA_VERSION_MINOR       LUAI_TOSTR(LUA_VERSION_MINOR_N)
-#define LUA_VERSION_RELEASE     LUAI_TOSTR(LUA_VERSION_RELEASE_N)
-
-#define LUA_VERSION     "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
-#define LUA_RELEASE     LUA_VERSION "." LUA_VERSION_RELEASE
-
-
 /******************************************************************************
 * Copyright (C) 1994-2024 Lua.org, PUC-Rio.
 *
diff --git a/lundump.h b/lundump.h
index bc71ced8..a97676ca 100644
--- a/lundump.h
+++ b/lundump.h
@@ -21,7 +21,7 @@
 /*
 ** Encode major-minor version in one byte, one nibble for each
 */
-#define LUAC_VERSION    (LUA_VERSION_MAJOR_N*16+LUA_VERSION_MINOR_N)
+#define LUAC_VERSION  (((LUA_VERSION_NUM / 100) * 16) + LUA_VERSION_NUM % 100)
 
 #define LUAC_FORMAT     0       /* this is the official format */