* deprecated.h, deprecated.c, numbers.h (SCM_INUMP, SCM_NINUMP,
SCM_INUM): Deprecated by reenaming them to SCM_I_INUMP, SCM_I_NINUMP and SCM_I_INUM, respectively and adding deprecated versions to deprecated.h and deprecated.c. Changed all uses to either use the SCM_I_ variants or scm_is_*, scm_to_*, or scm_from_*, as appropriate.
This commit is contained in:
parent
928e0f4210
commit
e11e83f3d9
59 changed files with 840 additions and 1172 deletions
|
|
@ -53,18 +53,17 @@ SCM_API SCM scm_stack_type;
|
|||
|
||||
#define SCM_FRAMEP(obj) \
|
||||
(SCM_CONSP (obj) && SCM_STACKP (SCM_CAR (obj)) \
|
||||
&& SCM_INUMP (SCM_CDR (obj)) && SCM_INUM (SCM_CDR (obj)) >= 0 \
|
||||
&& ((unsigned long int) SCM_INUM (SCM_CDR (obj)) \
|
||||
< SCM_STACK_LENGTH (SCM_CAR (obj))))
|
||||
&& scm_is_unsigned_integer (SCM_CDR (obj), \
|
||||
0, SCM_STACK_LENGTH (SCM_CAR (obj))-1))
|
||||
|
||||
#define SCM_FRAME_REF(frame, slot) \
|
||||
(SCM_STACK (SCM_CAR (frame)) -> frames[SCM_INUM (SCM_CDR (frame))].slot) \
|
||||
(SCM_STACK (SCM_CAR (frame)) -> frames[scm_to_size_t (SCM_CDR (frame))].slot)
|
||||
|
||||
#define SCM_FRAME_NUMBER(frame) \
|
||||
(SCM_BACKWARDS_P \
|
||||
? SCM_INUM (SCM_CDR (frame)) \
|
||||
? scm_to_size_t (SCM_CDR (frame)) \
|
||||
: (SCM_STACK_LENGTH (SCM_CAR (frame)) \
|
||||
- SCM_INUM (SCM_CDR (frame)) \
|
||||
- scm_to_size_t (SCM_CDR (frame)) \
|
||||
- 1)) \
|
||||
|
||||
#define SCM_FRAME_FLAGS(frame) SCM_FRAME_REF (frame, flags)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue