summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-05-17 18:35:05 +0200
committerAndy Wingo <wingo@pobox.com>2013-05-27 07:14:26 +0200
commita0ec1ca11650ad7c16cf1c3261ec1b8665d46ac8 (patch)
treeb0de115042fb1cbdf6e5ab611944697c7718df35 /libguile
parentc850a0ff4d0073364612ff5785bda8217ea9ae7f (diff)
downloadguile-a0ec1ca11650ad7c16cf1c3261ec1b8665d46ac8.tar.gz
cpp hygiene in the vm
* libguile/vm-engine.c: * libguile/vm-i-scheme.c: * libguile/vm-i-system.c: CPP hygiene: the code that #defines, #undefs. Makes things cleaner given the multiple inclusion dance we do.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/vm-engine.c26
-rw-r--r--libguile/vm-i-scheme.c24
-rw-r--r--libguile/vm-i-system.c3
3 files changed, 47 insertions, 6 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 1cd623d95..44546323b 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -433,8 +433,34 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
abort (); /* never reached */
}
+#undef ALIGNED_P
+#undef CACHE_REGISTER
+#undef CHECK_OVERFLOW
+#undef FREE_VARIABLE_REF
+#undef FUNC2
+#undef INIT
+#undef INUM_MAX
+#undef INUM_MIN
+#undef jump_table
+#undef LOCAL_REF
+#undef LOCAL_SET
+#undef NEXT
+#undef NEXT_JUMP
+#undef REL
+#undef RETURN
+#undef RETURN_ONE_VALUE
+#undef RETURN_VALUE_LIST
#undef RUN_HOOK
#undef RUN_HOOK1
+#undef SYNC_ALL
+#undef SYNC_BEFORE_GC
+#undef SYNC_IP
+#undef SYNC_REGISTER
+#undef VARIABLE_BOUNDP
+#undef VARIABLE_REF
+#undef VARIABLE_SET
+#undef VM_DEFINE_OP
+#undef VM_INSTRUCTION_TO_LABEL
#undef VM_USE_HOOKS
/*
diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c
index c12c42ba1..ef3d02b7c 100644
--- a/libguile/vm-i-scheme.c
+++ b/libguile/vm-i-scheme.c
@@ -176,7 +176,6 @@ VM_DEFINE_INSTRUCTION (146, set_cdr, "set-cdr!", 0, 2, 0)
* Numeric relational tests
*/
-#undef REL
#define REL(crel,srel) \
{ \
ARGS2 (x, y); \
@@ -212,18 +211,17 @@ VM_DEFINE_FUNCTION (151, ge, "ge?", 2)
REL (>=, scm_geq_p);
}
+#undef REL
+
/*
* Numeric functions
*/
/* The maximum/minimum tagged integers. */
-#undef INUM_MAX
-#undef INUM_MIN
#define INUM_MAX (INTPTR_MAX - 1)
#define INUM_MIN (INTPTR_MIN + scm_tc2_int)
-#undef FUNC2
#define FUNC2(CFUNC,SFUNC) \
{ \
ARGS2 (x, y); \
@@ -357,8 +355,11 @@ VM_DEFINE_FUNCTION (155, sub1, "sub1", 1)
RETURN (scm_difference (x, SCM_I_MAKINUM (1)));
}
-# undef ASM_ADD
-# undef ASM_SUB
+#undef ASM_ADD
+#undef ASM_SUB
+#undef FUNC2
+#undef INUM_MAX
+#undef INUM_MIN
VM_DEFINE_FUNCTION (156, mul, "mul", 2)
{
@@ -992,6 +993,17 @@ BV_FLOAT_SET (f64, ieee_double, double, 8)
#undef BV_INT_SET
#undef BV_FLOAT_SET
+#undef ALIGNED_P
+#undef VM_VALIDATE_BYTEVECTOR
+
+#undef VM_VALIDATE_STRUCT
+#undef VM_VALIDATE_CONS
+
+#undef ARGS1
+#undef ARGS2
+#undef ARGS3
+#undef RETURN
+
/*
(defun renumber-ops ()
"start from top of buffer and renumber 'VM_DEFINE_FOO (\n' sequences"
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index f64982260..9b24c9295 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -538,6 +538,9 @@ VM_DEFINE_INSTRUCTION (42, br_if_not_nil, "br-if-not-nil", 3, 0, 0)
POP (x);
BR (!scm_is_lisp_false (x));
}
+
+#undef BR
+
/*
* Subprogram call