Changeset 182
- Timestamp:
- 03/15/06 23:17:36 (3 years ago)
- Files:
-
- trunk/include/common.mk (modified) (2 diffs)
- trunk/lib/lua51/Makefile (modified) (2 diffs)
- trunk/lib/lua51/lpow.c (added)
- trunk/lib/lua51/lpow.h (added)
- trunk/lib/lua51/luaconf.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/common.mk
r165 r182 40 40 $(foreach ldir,$(LIBDIRS),-L$(ldir)) \ 41 41 $(LIBARGS) \ 42 -Wl,-Map=$(PROJECT)_$(HALNAME).map \ 43 -Wl,--cref \ 42 44 -Wl,-whole-archive \ 43 45 -lhal-$(HALNAME) \ … … 62 64 clean: 63 65 $(RM) *.hex 66 $(RM) *.map 64 67 $(RM) $(PROJECT)_$(HALNAME) 65 68 $(RM) $(PROJECT)_$(HALNAME).exe trunk/lib/lua51/Makefile
r143 r182 6 6 lparser.c lstrlib.c ltm.c lundump.c print.c \ 7 7 lbaselib.c ldebug.c lfunc.c liolib.c lmem.c lopcodes.c \ 8 lstate.c ltable.c lvm.c 8 lstate.c ltable.c lvm.c lpow.c 9 9 10 10 … … 13 13 lstate.h ltm.h lualib.h lzio.h \ 14 14 lcode.h lfunc.h llimits.h lopcodes.h lstring.h \ 15 luaconf.h lundump.h 15 luaconf.h lundump.h lpow.h 16 16 17 17 trunk/lib/lua51/luaconf.h
r173 r182 489 489 */ 490 490 491 #define LUA_NUMBER_DOUBLE 492 #define LUA_NUMBER double491 /*#define LUA_NUMBER_DOUBLE */ 492 #define LUA_NUMBER long 493 493 494 494 /* … … 496 496 @* over a number. 497 497 */ 498 #define LUAI_UACNUMBER double498 #define LUAI_UACNUMBER long 499 499 500 500 … … 506 506 @@ lua_str2number converts a string to a number. 507 507 */ 508 #define LUA_NUMBER_SCAN "%l f"509 #define LUA_NUMBER_FMT "% .14g"508 #define LUA_NUMBER_SCAN "%ld" 509 #define LUA_NUMBER_FMT "%ld" 510 510 #define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) 511 511 #define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ 512 #define lua_str2number(s,p) strto d((s), (p))512 #define lua_str2number(s,p) strtol((s), (p), 10) 513 513 514 514 … … 518 518 #if defined(LUA_CORE) 519 519 #include <math.h> 520 #include "lpow.h" 520 521 #define luai_numadd(a,b) ((a)+(b)) 521 522 #define luai_numsub(a,b) ((a)-(b)) 522 523 #define luai_nummul(a,b) ((a)*(b)) 523 524 #define luai_numdiv(a,b) ((a)/(b)) 524 #define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))525 #define luai_numpow(a,b) ( pow(a,b))525 #define luai_nummod(a,b) ((a)%(b)) 526 #define luai_numpow(a,b) (lpow(a,b)) 526 527 #define luai_numunm(a) (-(a)) 527 528 #define luai_numeq(a,b) ((a)==(b)) 528 529 #define luai_numlt(a,b) ((a)<(b)) 529 530 #define luai_numle(a,b) ((a)<=(b)) 530 #define luai_numisnan(a) ( !luai_numeq((a), (a)))531 #define luai_numisnan(a) (0) 531 532 #endif 532 533
