refactor tc7 and tc16 checks

[bpt/guile.git] / libguile / control.h

diff --git a/libguile/control.h b/libguile/control.h
index 2167ffa..ebf255f 100644 (file)
--- a/libguile/control.h
+++ b/libguile/control.h
@@ -22,7 +22,7 @@
 
 #define SCM_F_PROMPT_ESCAPE 0x1
 
-#define SCM_PROMPT_P(x)                (!SCM_IMP (x) && SCM_TYP7(x) == scm_tc7_prompt)
+#define SCM_PROMPT_P(x)                (SCM_HAS_TYP7 (x, scm_tc7_prompt))
 #define SCM_PROMPT_FLAGS(x)    (SCM_CELL_WORD ((x), 0) >> 8)
 #define SCM_PROMPT_ESCAPE_P(x) (SCM_PROMPT_FLAGS (x) & SCM_F_PROMPT_ESCAPE)
 #define SCM_PROMPT_TAG(x)      (SCM_CELL_OBJECT ((x), 1))