History

Lua 5.2.0-beta

Lua Team committed 15 years ago

Commit 8203bab1 parent c2bb1fc4 files · +64 −52Browse files

Unified · Split

4 files
  1. doc/manual.html +11 −13
  2. src/llex.c +39 −32
  3. src/lua.hpp +9 −0
  4. src/luaconf.h +5 −7
doc/manual.html+11−13
@@ -38,7 +38,7 @@ Freely available under the terms of the · 37 unmodified lines
3838 <!-- ====================================================================== -->
3939 <p>
4040
41−<!-- $Id: manual.of,v 1.85 2011/07/05 19:15:00 roberto Exp $ -->
41+<!-- $Id: manual.of,v 1.86 2011/07/08 20:00:45 roberto Exp $ -->
4242
4343
4444
@@ -2962,8 +2962,8 @@ This is considered good programming practice. · 2917 unmodified lines
29622962
29632963 <hr><h3><a name="lua_callk"><code>lua_callk</code></a></h3><p>
29642964 <span class="apii">[-(nargs + 1), +nresults, <em>e</em>]</span>
2965−<pre>void lua_callk (lua_State *L, int nargs, int nresults,
2966− int ctx, lua_CFunction k);</pre>
2965+<pre>void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
2966+ lua_CFunction k);</pre>
29672967
29682968 <p>
29692969 This function behaves exactly like <a href="#lua_call"><code>lua_call</code></a>,
@@ -3857,7 +3857,7 @@ It is generated by the garbage collector.) · 887 unmodified lines
38573857 <hr><h3><a name="lua_pcallk"><code>lua_pcallk</code></a></h3><p>
38583858 <span class="apii">[-(nargs + 1), +(nresults|1), <em>-</em>]</span>
38593859 <pre>int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
3860− int ctx, lua_CFunction k);</pre>
3860+ int ctx, lua_CFunction k);</pre>
38613861
38623862 <p>
38633863 This function behaves exactly like <a href="#lua_pcall"><code>lua_pcall</code></a>,
@@ -4839,8 +4839,7 @@ the function calling <code>lua_yield</code>. · 975 unmodified lines
48394839
48404840 <hr><h3><a name="lua_yieldk"><code>lua_yieldk</code></a></h3><p>
48414841 <span class="apii">[-?, +?, <em>-</em>]</span>
4842−<pre>int lua_yieldk (lua_State *L, int nresults, int ctx,
4843− lua_CFunction k);</pre>
4842+<pre>int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k);</pre>
48444843
48454844 <p>
48464845 Yields a coroutine.
@@ -5362,7 +5361,7 @@ will return identical ids for those upvalue indices. · 515 unmodified lines
53625361
53635362 <hr><h3><a name="lua_upvaluejoin"><code>lua_upvaluejoin</code></a></h3>
53645363 <pre>void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
5365− int fidx2, int n2);</pre>
5364+ int fidx2, int n2);</pre>
53665365
53675366 <p>
53685367 Make the <code>n1</code>-th upvalue of the Lua closure at index <code>fidx1</code>
@@ -5926,8 +5925,7 @@ process-related functions in the standard library · 557 unmodified lines
59265925
59275926 <hr><h3><a name="luaL_fileresult"><code>luaL_fileresult</code></a></h3><p>
59285927 <span class="apii">[-0, +(1|3), <em>m</em>]</span>
5929−<pre>int luaL_fileresult (lua_State *L, int stat,
5930− const char *fname);</pre>
5928+<pre>int luaL_fileresult (lua_State *L, int stat, const char *fname);</pre>
59315929
59325930 <p>
59335931 This function produces the return values for
@@ -6394,7 +6392,7 @@ in which both <code>name</code> and <code>func</code> are <code>NULL</code>. · 460 unmodified lines
63946392 <hr><h3><a name="luaL_requiref"><code>luaL_requiref</code></a></h3><p>
63956393 <span class="apii">[-0, +1, <em>e</em>]</span>
63966394 <pre>void luaL_requiref (lua_State *L, const char *modname,
6397− lua_CFunction openf, int glb);</pre>
6395+ lua_CFunction openf, int glb);</pre>
63986396
63996397 <p>
64006398 Calls function <code>openf</code> with string <code>modname</code> as an argument
@@ -6486,8 +6484,8 @@ and uses the result of the call as its result. · 85 unmodified lines
64866484
64876485 <hr><h3><a name="luaL_traceback"><code>luaL_traceback</code></a></h3><p>
64886486 <span class="apii">[-0, +1, <em>m</em>]</span>
6489−<pre>void luaL_traceback (lua_State *L, lua_State *L1,
6490− const char *msg, int level);</pre>
6487+<pre>void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
6488+ int level);</pre>
64916489
64926490 <p>
64936491 Creates and pushes a traceback of the stack <code>L1</code>.
@@ -10204,7 +10202,7 @@ Here is the complete syntax of Lua in extended BNF. · 3710 unmodified lines
1020410202 <HR>
1020510203 <SMALL CLASS="footer">
1020610204 Last update:
10207−Tue Jul 5 19:16:15 BRT 2011
10205+Fri Jul 8 17:11:02 BRT 2011
1020810206 </SMALL>
1020910207 <!--
1021010208 Last change: revised for Lua 5.2.0 (beta)
src/llex.c+39−32
@@ -1,5 +1,5 @@
11 /*
2−** $Id: llex.c,v 2.50 2011/07/05 19:13:45 roberto Exp $
2+** $Id: llex.c,v 2.53 2011/07/08 20:01:38 roberto Exp $
33 ** Lexical Analyzer
44 ** See Copyright Notice in lua.h
55 */
@@ -286,45 +286,51 @@ static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) { · 280 unmodified lines
286286 }
287287
288288
289+static void escerror (LexState *ls, int *c, int n, const char *msg) {
290+ int i;
291+ luaZ_resetbuffer(ls->buff); /* prepare error message */
292+ save(ls, '\\');
293+ for (i = 0; i < n && c[i] != EOZ; i++)
294+ save(ls, c[i]);
295+ lexerror(ls, msg, TK_STRING);
296+}
297+
298+
289299 static int readhexaesc (LexState *ls) {
290− int c1 = next(ls);
291− int c2 = EOZ;
292− if (lisxdigit(c1)) {
293− c2 = next(ls);
294− if (lisxdigit(c2))
295− return (luaO_hexavalue(c1) << 4) + luaO_hexavalue(c2);
300+ int c[3]; /* keep input for error message */
301+ int i = 2; /* at least 'x?' will go to error message */
302+ c[0] = 'x';
303+ c[1] = next(ls); /* first hexa digit */
304+ if (lisxdigit(c[1])) {
305+ c[i++] = next(ls); /* second hexa digit */
306+ if (lisxdigit(c[2]))
307+ return (luaO_hexavalue(c[1]) << 4) + luaO_hexavalue(c[2]);
296308 /* else go through to error */
297309 }
298− luaZ_resetbuffer(ls->buff); /* prepare error message */
299− save(ls, '\\'); save(ls, 'x');
300− if (c1 != EOZ) save(ls, c1);
301− if (c2 != EOZ) save(ls, c2);
302− lexerror(ls, "hexadecimal digit expected", TK_STRING);
310+ escerror(ls, c, i, "hexadecimal digit expected");
303311 return 0; /* to avoid warnings */
304312 }
305313
306314
307315 static int readdecesc (LexState *ls) {
308− int c1 = ls->current; /* first char must be a digit */
309− int c2 = next(ls); /* read second char */
310− int c = c1 - '0'; /* partial result */
311− if (lisdigit(c2)) {
312− int c3 = next(ls); /* read third char */
313− c = 10*c + c2 - '0'; /* update result */
314− if (lisdigit(c3)) {
315− c = 10*c + c3 - '0'; /* update result */
316− if (c > UCHAR_MAX) {
317− luaZ_resetbuffer(ls->buff); /* prepare error message */
318− save(ls, '\\');
319− save(ls, c1); save(ls, c2); save(ls, c3);
320− lexerror(ls, "decimal escape too large", TK_STRING);
321− }
322− return c;
316+ int c[3], r;
317+ int i = 2; /* at least two chars will be read */
318+ c[0] = ls->current; /* first char must be a digit */
319+ c[1] = next(ls); /* read second char */
320+ r = c[0] - '0'; /* partial result */
321+ if (lisdigit(c[1])) {
322+ c[i++] = next(ls); /* read third char */
323+ r = 10*r + c[1] - '0'; /* update result */
324+ if (lisdigit(c[2])) {
325+ r = 10*r + c[2] - '0'; /* update result */
326+ if (r > UCHAR_MAX)
327+ escerror(ls, c, i, "decimal escape too large");
328+ return r;
323329 }
324330 }
325331 /* else, has read one character that was not a digit */
326332 zungetc(ls->z); /* return it to input stream */
327− return c;
333+ return r;
328334 }
329335
330336
@@ -353,9 +359,10 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) { · 22 unmodified lines
353359 case 'x': c = readhexaesc(ls); break;
354360 case '\n':
355361 case '\r': save(ls, '\n'); inclinenumber(ls); continue;
362+ case '\\': case '\"': case '\'': c = ls->current; break;
356363 case EOZ: continue; /* will raise an error next loop */
357364 case 'z': { /* zap following span of spaces */
358− next(ls); /* skip the '*' */
365+ next(ls); /* skip the 'z' */
359366 while (lisspace(ls->current)) {
360367 if (currIsNewline(ls)) inclinenumber(ls);
361368 else next(ls);
@@ -364,9 +371,9 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) { · 2 unmodified lines
364371 }
365372 default: {
366373 if (!lisdigit(ls->current))
367− c = ls->current; /* handles \\, \", and \' */
368− else /* digital escape \ddd */
369− c = readdecesc(ls);
374+ escerror(ls, &ls->current, 1, "invalid escape sequence");
375+ /* digital escape \ddd */
376+ c = readdecesc(ls);
370377 break;
371378 }
372379 }
src/lua.hpp+9−0
@@ -0,0 +1,9 @@
1+// lua.hpp
2+// Lua header files for C++
3+// <<extern "C">> not supplied automatically because Lua also compiles as C++
4+
5+extern "C" {
6+#include "lua.h"
7+#include "lualib.h"
8+#include "lauxlib.h"
9+}
src/luaconf.h+5−7
@@ -1,5 +1,5 @@
11 /*
2−** $Id: luaconf.h,v 1.160 2011/06/28 17:14:12 roberto Exp $
2+** $Id: luaconf.h,v 1.161 2011/07/08 20:07:11 roberto Exp $
33 ** Configuration file for Lua
44 ** See Copyright Notice in lua.h
55 */
@@ -499,12 +499,12 @@ · 493 unmodified lines
499499 ** doubles with conventional endianess (12345678 or 87654321), in CPUs
500500 ** that do not produce signaling NaN values (all NaNs are quiet).
501501 */
502−#if defined(LUA_CORE) /* { */
503−
504−#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */
502+#if defined(LUA_CORE) && \
503+ defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */
505504
506505 /* little-endian architectures that satisfy those conditions */
507−#if defined(__i386__) || defined(__i386) || defined(__X86__)
506+#if defined(__i386__) || defined(__i386) || defined(__X86__) || \
507+ defined(_M_IX86)
508508
509509 #define LUA_NANTRICKLE
510510
@@ -512,8 +512,6 @@ · 1 unmodified line
512512
513513 #endif /* } */
514514
515−#endif /* } */
516−
517515
518516
519517