diff options
Diffstat (limited to 'lundump.c')
-rw-r--r-- | lundump.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lundump.c,v 1.38 2001/01/15 16:13:24 roberto Exp roberto $ | 2 | ** $Id: lundump.c,v 1.39 2001/02/23 17:17:25 roberto Exp roberto $ |
3 | ** load bytecodes from files | 3 | ** load bytecodes from files |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -7,6 +7,9 @@ | |||
7 | #include <stdio.h> | 7 | #include <stdio.h> |
8 | #include <string.h> | 8 | #include <string.h> |
9 | 9 | ||
10 | #define LUA_PRIVATE | ||
11 | #include "lua.h" | ||
12 | |||
10 | #include "lfunc.h" | 13 | #include "lfunc.h" |
11 | #include "lmem.h" | 14 | #include "lmem.h" |
12 | #include "lopcodes.h" | 15 | #include "lopcodes.h" |
@@ -96,7 +99,7 @@ static TString* LoadString (lua_State* L, ZIO* Z, int swap) | |||
96 | return NULL; | 99 | return NULL; |
97 | else | 100 | else |
98 | { | 101 | { |
99 | l_char* s=luaO_openspace(L,size); | 102 | char* s=luaO_openspace(L,size,char); |
100 | LoadBlock(L,s,size,Z,0); | 103 | LoadBlock(L,s,size,Z,0); |
101 | return luaS_newlstr(L,s,size-1); /* remove trailing l_c('\0') */ | 104 | return luaS_newlstr(L,s,size-1); /* remove trailing l_c('\0') */ |
102 | } | 105 | } |
@@ -171,7 +174,7 @@ static Proto* LoadFunction (lua_State* L, ZIO* Z, int swap) | |||
171 | 174 | ||
172 | static void LoadSignature (lua_State* L, ZIO* Z) | 175 | static void LoadSignature (lua_State* L, ZIO* Z) |
173 | { | 176 | { |
174 | const l_char* s=SIGNATURE; | 177 | const l_char* s=l_s(SIGNATURE); |
175 | while (*s!=0 && ezgetc(L,Z)==*s) | 178 | while (*s!=0 && ezgetc(L,Z)==*s) |
176 | ++s; | 179 | ++s; |
177 | if (*s!=0) luaO_verror(L,l_s("bad signature in `%.99s'"),ZNAME(Z)); | 180 | if (*s!=0) luaO_verror(L,l_s("bad signature in `%.99s'"),ZNAME(Z)); |
@@ -213,7 +216,8 @@ static int LoadHeader (lua_State* L, ZIO* Z) | |||
213 | f=LoadNumber(L,Z,swap); | 216 | f=LoadNumber(L,Z,swap); |
214 | if ((long)f!=(long)tf) /* disregard errors in last bit of fraction */ | 217 | if ((long)f!=(long)tf) /* disregard errors in last bit of fraction */ |
215 | luaO_verror(L,l_s("unknown number format in `%.99s':\n") | 218 | luaO_verror(L,l_s("unknown number format in `%.99s':\n") |
216 | l_s(" read ") NUMBER_FMT l_s("; expected ") NUMBER_FMT, ZNAME(Z),f,tf); | 219 | l_s(" read ") l_s(LUA_NUMBER_FMT) l_s("; expected ") l_s(LUA_NUMBER_FMT), |
220 | ZNAME(Z),f,tf); | ||
217 | return swap; | 221 | return swap; |
218 | } | 222 | } |
219 | 223 | ||