summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2003-04-10 14:39:41 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2003-04-10 14:39:41 -0300
commit762c7370376dbd13cd8aeb4d8c8da0bb153269c3 (patch)
tree6170a2d6bc5d2a7cd4f15cf180dd17d89bf36554
parentde57dc2653ff9efcdfd1ddc5f21aaaa159e5f79a (diff)
downloadlua-github-5_0.tar.gz
last changes by lhfv5_0v5.0
-rw-r--r--ldump.c9
-rw-r--r--lundump.c10
-rw-r--r--lundump.h8
3 files changed, 14 insertions, 13 deletions
diff --git a/ldump.c b/ldump.c
index a34aeed3..234b011f 100644
--- a/ldump.c
+++ b/ldump.c
@@ -1,5 +1,5 @@
/*
-** $Id: ldump.c,v 1.3 2003/01/27 15:52:57 roberto Exp roberto $
+** $Id: ldump.c,v 1.4 2003/02/11 23:52:12 lhf Exp $
** save bytecodes
** See Copyright Notice in lua.h
*/
@@ -90,9 +90,9 @@ static void DumpLines(const Proto* f, DumpState* D)
static void DumpUpvalues(const Proto* f, DumpState* D)
{
- int i,n=f->sizeupvalues;
- DumpInt(n,D);
- for (i=0; i<n; i++) DumpString(f->upvalues[i],D);
+ int i,n=f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpString(f->upvalues[i],D);
}
static void DumpFunction(const Proto* f, const TString* p, DumpState* D);
@@ -167,3 +167,4 @@ void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data)
DumpHeader(&D);
DumpFunction(Main,NULL,&D);
}
+
diff --git a/lundump.c b/lundump.c
index a35d2e9c..151a8507 100644
--- a/lundump.c
+++ b/lundump.c
@@ -1,5 +1,5 @@
/*
-** $Id: lundump.c,v 1.59 2003/01/27 15:52:57 roberto Exp roberto $
+** $Id: lundump.c,v 1.49 2003/04/07 20:34:20 lhf Exp $
** load pre-compiled Lua chunks
** See Copyright Notice in lua.h
*/
@@ -104,7 +104,7 @@ static TString* LoadString (LoadState* S)
{
char* s=luaZ_openspace(S->L,S->b,size);
ezread(S,s,size);
- return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
+ return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
}
}
@@ -146,7 +146,7 @@ static void LoadUpvalues (LoadState* S, Proto* f)
luaG_runerror(S->L,"bad nupvalues in %s: read %d; expected %d",
S->name,n,f->nups);
f->upvalues=luaM_newvector(S->L,n,TString*);
- f->sizeupvalues = n;
+ f->sizeupvalues=n;
for (i=0; i<n; i++) f->upvalues[i]=LoadString(S);
}
@@ -226,14 +226,14 @@ static void TestSize (LoadState* S, int s, const char* what)
static void LoadHeader (LoadState* S)
{
int version;
- lua_Number x=0,tx=TEST_NUMBER;
+ lua_Number x,tx=TEST_NUMBER;
LoadSignature(S);
version=LoadByte(S);
if (version>VERSION)
luaG_runerror(S->L,"%s too new: "
"read version %d.%d; expected at most %d.%d",
S->name,V(version),V(VERSION));
- if (version<VERSION0) /* check last major change */
+ if (version<VERSION0) /* check last major change */
luaG_runerror(S->L,"%s too old: "
"read version %d.%d; expected at least %d.%d",
S->name,V(version),V(VERSION0));
diff --git a/lundump.h b/lundump.h
index 474075a0..c7e6959b 100644
--- a/lundump.h
+++ b/lundump.h
@@ -1,5 +1,5 @@
/*
-** $Id: lundump.h,v 1.28 2002/12/13 11:12:35 lhf Exp $
+** $Id: lundump.h,v 1.30 2003/04/07 20:34:20 lhf Exp $
** load pre-compiled Lua chunks
** See Copyright Notice in lua.h
*/
@@ -23,12 +23,12 @@ void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data);
void luaU_print (const Proto* Main);
/* definitions for headers of binary files */
-#define LUA_SIGNATURE "\033Lua" /* binary files start with <esc>Lua */
+#define LUA_SIGNATURE "\033Lua" /* binary files start with "<esc>Lua" */
#define VERSION 0x50 /* last format change was in 5.0 */
#define VERSION0 0x50 /* last major change was in 5.0 */
/* a multiple of PI for testing native format */
-/* multiplying by 1E8 gives non-trivial integer values */
-#define TEST_NUMBER 3.14159265358979323846E8
+/* multiplying by 1E7 gives non-trivial integer values */
+#define TEST_NUMBER ((lua_Number)3.14159265358979323846E7)
#endif