'lpeg.version' changed to a string

4 files changed, 11 insertions, 14 deletions

diff --git a/lpeg.html b/lpeg.html
index 1295c4f..87348cf 100644
--- a/lpeg.html
+++ b/lpeg.html
@@ -22,7 +22,7 @@
   </div>
   <div id="product_name"><big><strong>LPeg</strong></big></div>
   <div id="product_description">
-     Parsing Expression Grammars For Lua, version 1.0
+     Parsing Expression Grammars For Lua, version 1.1
   </div>
 </div> <!-- id="product" -->
 
@@ -145,7 +145,7 @@ so, it succeeds only at the end of the subject.
 LPeg also offers the <a href="re.html"><code>re</code> module</a>,
 which implements patterns following a regular-expression style
 (e.g., <code>[09]+</code>).
-(This module is 260 lines of Lua code,
+(This module is 270 lines of Lua code,
 and of course it uses LPeg to parse regular expressions and
 translate them to regular LPeg patterns.)
 </p>
@@ -167,7 +167,7 @@ or the <a href="#captures">captured values</a>
 <p>
 An optional numeric argument <code>init</code> makes the match
 start at that position in the subject string.
-As usual in Lua libraries,
+As in the Lua standard libraries,
 a negative value counts from the end.
 </p>
 
@@ -191,9 +191,9 @@ returns the string <code>"pattern"</code>.
 Otherwise returns nil.
 </p>
 
-<h3><a name="f-version"></a><code>lpeg.version ()</code></h3>
+<h3><a name="f-version"></a><code>lpeg.version</code></h3>
 <p>
-Returns a string with the running version of LPeg.
+A string (not a function) with the running version of LPeg.
 </p>
 
 <h3><a name="f-setstack"></a><code>lpeg.setmaxstack (max)</code></h3>
diff --git a/lptree.c b/lptree.c
index 62acc5c..30cef67 100644
--- a/lptree.c
+++ b/lptree.c
@@ -1247,12 +1247,6 @@ static int lp_setmax (lua_State *L) {
 }
 
 
-static int lp_version (lua_State *L) {
-  lua_pushstring(L, VERSION);
-  return 1;
-}
-
-
 static int lp_type (lua_State *L) {
   if (testpattern(L, 1))
     lua_pushliteral(L, "pattern");
@@ -1323,7 +1317,7 @@ static struct luaL_Reg pattreg[] = {
   {"R", lp_range},
   {"utfR", lp_utfr},
   {"locale", lp_locale},
-  {"version", lp_version},
+  {"version", NULL},
   {"setmaxstack", lp_setmax},
   {"type", lp_type},
   {NULL, NULL}
@@ -1352,6 +1346,8 @@ int luaopen_lpeg (lua_State *L) {
   luaL_newlib(L, pattreg);
   lua_pushvalue(L, -1);
   lua_setfield(L, -3, "__index");
+  lua_pushliteral(L, "LPeg " VERSION);
+  lua_setfield(L, -2, "version");
   return 1;
 }
 
diff --git a/lptypes.h b/lptypes.h
index eea3d0c..ccb4c18 100644
--- a/lptypes.h
+++ b/lptypes.h
@@ -15,7 +15,7 @@
 #include "lua.h"
 
 
-#define VERSION         "1.0.2"
+#define VERSION         "1.1.0"
 
 
 #define PATTERN_T       "lpeg-pattern"
diff --git a/test.lua b/test.lua
index e86c21a..403aa09 100755
--- a/test.lua
+++ b/test.lua
@@ -48,7 +48,8 @@ end
 
 print"General tests for LPeg library"
 
-print("version " .. m.version())
+assert(type(m.version) == "string")
+print(m.version)
 assert(m.type("alo") ~= "pattern")
 assert(m.type(io.input) ~= "pattern")
 assert(m.type(m.P"alo") == "pattern")