new version (from lhf)

1 files changed, 15 insertions, 20 deletions

diff --git a/lundump.c b/lundump.c
index f4940239..d91d4508 100644
--- a/lundump.c
+++ b/lundump.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.c,v 1.54 2002/10/08 18:46:08 roberto Exp roberto $
+** $Id: lundump.c,v 1.43 2002/08/07 00:36:03 lhf Exp lhf $
 ** load pre-compiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -19,7 +19,7 @@
 typedef struct {
  lua_State* L;
  ZIO* Z;
- Mbuffer *buff;
+ Mbuffer* b;
  int swap;
  const char* name;
 } LoadState;
@@ -46,7 +46,7 @@ static void LoadBlock (LoadState* S, void* b, size_t size)
 {
  if (S->swap)
  {
-  char *p=(char*) b+size-1;
+  char* p=(char*) b+size-1;
   int n=size;
   while (n--) *p--=(char)ezgetc(S);
  }
@@ -58,10 +58,10 @@ static void LoadVector (LoadState* S, void* b, int m, size_t size)
 {
  if (S->swap)
  {
-  char *q=(char*) b;
+  char* q=(char*) b;
   while (m--)
   {
-   char *p=q+size-1;
+   char* p=q+size-1;
    int n=size;
    while (n--) *p--=(char)ezgetc(S);
    q+=size;
@@ -100,7 +100,7 @@ static TString* LoadString (LoadState* S)
   return NULL;
  else
  {
-  char* s=luaZ_openspace(S->L,S->buff,size);
+  char* s=luaZ_openspace(S->L,S->b,size);
   ezread(S,s,size);
   return luaS_newlstr(S->L,s,size-1);   /* remove trailing '\0' */
  }
@@ -130,10 +130,10 @@ static void LoadLocals (LoadState* S, Proto* f)
 
 static void LoadLines (LoadState* S, Proto* f)
 {
- int n;
- n=LoadInt(S);
- f->lineinfo=luaM_newvector(S->L,n,int);
- LoadVector(S,f->lineinfo,n,sizeof(*f->lineinfo));
+ int size=LoadInt(S);
+ f->lineinfo=luaM_newvector(S->L,size,int);
+ f->sizelineinfo=size;
+ LoadVector(S,f->lineinfo,size,sizeof(*f->lineinfo));
 }
 
 static Proto* LoadFunction (LoadState* S, TString* p);
@@ -233,8 +233,7 @@ static void LoadHeader (LoadState* S)
  TESTSIZE(sizeof(lua_Number), "number");
  x=LoadNumber(S);
  if ((long)x!=(long)tx)         /* disregard errors in last bits of fraction */
-  luaG_runerror(S->L,"unknown number format in %s: read %f; expected %f",
-      S->name,x,tx);
+  luaG_runerror(S->L,"unknown number format in %s",S->name);
 }
 
 static Proto* LoadChunk (LoadState* S)
@@ -244,12 +243,11 @@ static Proto* LoadChunk (LoadState* S)
 }
 
 /*
-** load one chunk from a file or buffer
+** load precompiled chunk
 */
-Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer *buff)
+Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff)
 {
  LoadState S;
- Proto* f;
  const char* s=zname(Z);
  if (*s=='@' || *s=='=')
   S.name=s+1;
@@ -259,11 +257,8 @@ Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer *buff)
   S.name=s;
  S.L=L;
  S.Z=Z;
- S.buff=buff;
- f=LoadChunk(&S);
- if (zgetc(Z)!=EOZ)
-  luaG_runerror(L,"%s apparently contains more than one chunk",S.name);
- return f;
+ S.b=buff;
+ return LoadChunk(&S);
 }
 
 /*