Lua 5.2.0-alpha-rc3

Lua Team committed 15 years ago

Commit e22e2031 parent df8e5b67 files · +132 −134Browse files

Showing the changes to src (4 of 7 files). Show all

Unified · Split

4 files

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lbitlib.c,v 1.11 2010/11/08 16:31:22 roberto Exp $	2	** $Id: lbitlib.c,v 1.13 2010/11/22 18:06:33 roberto Exp $
3	** Standard library for bitwise operations	3	** Standard library for bitwise operations
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -130,27 +130,27 @@ static int b_rot (lua_State *L, int i) { · 124 unmodified lines
130	}	130	}
131		131
132		132
133	static int b_rol (lua_State *L) {	133	static int b_lrot (lua_State *L) {
134	return b_rot(L, luaL_checkint(L, 2));	134	return b_rot(L, luaL_checkint(L, 2));
135	}	135	}
136		136
137		137
138	static int b_ror (lua_State *L) {	138	static int b_rrot (lua_State *L) {
139	return b_rot(L, -luaL_checkint(L, 2));	139	return b_rot(L, -luaL_checkint(L, 2));
140	}	140	}
141		141
142		142
143	static const luaL_Reg bitlib[] = {	143	static const luaL_Reg bitlib[] = {
144	{"AND", b_and},	144	{"arshift", b_arshift},
145	{"TEST", b_test},	145	{"band", b_and},
146	{"OR", b_or},	146	{"bnot", b_not},
147	{"XOR", b_xor},	147	{"bor", b_or},
148	{"NOT", b_not},	148	{"bxor", b_xor},
149	{"SHL", b_lshift},	149	{"lrotate", b_lrot},
150	{"SAR", b_arshift},	150	{"lshift", b_lshift},
151	{"SHR", b_rshift},	151	{"rrotate", b_rrot},
152	{"ROL", b_rol},	152	{"rshift", b_rshift},
153	{"ROR", b_ror},	153	{"btest", b_test},
154	{NULL, NULL}	154	{NULL, NULL}
155	};	155	};
156		156

 /*
-** $Id: llex.c,v 2.40 2010/10/25 12:24:36 roberto Exp $
+** $Id: llex.c,v 2.41 2010/11/18 18:38:44 roberto Exp $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
           } while (lislalnum(ls->current));
           ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
                                   luaZ_bufflen(ls->buff));
+          seminfo->ts = ts;
           if (ts->tsv.reserved > 0)  /* reserved word? */
             return ts->tsv.reserved - 1 + FIRST_RESERVED;
           else {
-            seminfo->ts = ts;
             return TK_NAME;
           }
         }

 /*
-** $Id: lmathlib.c,v 1.78 2010/11/12 15:47:34 roberto Exp $
+** $Id: lmathlib.c,v 1.79 2010/11/18 18:38:27 roberto Exp $
 ** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
 static int math_log10 (lua_State *L) {
 #if !defined(LUA_COMPAT_LOG10)
-  luaL_error(L, "function " LUA_QL("log10")
+  return luaL_error(L, "function " LUA_QL("log10")
-                " is deprecated; use log(x, 10) instead");
+                       " is deprecated; use log(x, 10) instead");
-#endif
+#else
   lua_pushnumber(L, l_tg(log10)(luaL_checknumber(L, 1)));
   return 1;
+#endif
 }
 static int math_exp (lua_State *L) {

 /*
-** $Id: lstrlib.c,v 1.158 2010/11/16 20:39:41 roberto Exp $
+** $Id: lstrlib.c,v 1.159 2010/11/19 16:25:51 roberto Exp $
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
 }
-static int gfind_nodef (lua_State *L) {
-  return luaL_error(L, LUA_QL("string.gfind") " was renamed to "
-                       LUA_QL("string.gmatch"));
-}
 static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
                                                    const char *e) {
   size_t l, i;
   {"dump", str_dump},
   {"find", str_find},
   {"format", str_format},
-  {"gfind", gfind_nodef},
   {"gmatch", gmatch},
   {"gsub", str_gsub},
   {"len", str_len},

Keyboard shortcuts