bug#18495: [PATCH] Fix SCM_SMOB_OBJECT_LOC

bug#18495: [PATCH] Fix SCM_SMOB_OBJECT_LOC

[David Kastrup]

* libguile/smob.h (SCM_SMOB_OBJECT_LOC): This elementary API macro has
  been broken by commit 56164dc47f6616b359f0ad23be208f01a77b55fa in 2009

Signed-off-by: David Kastrup <dak@gnu.org>
---
 libguile/smob.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libguile/smob.h b/libguile/smob.h
index 60abe37..e787cb1 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -163,7 +163,7 @@ scm_new_double_smob (scm_t_bits tc, scm_t_bits data1,
 
 #define SCM_SMOB_OBJECT(x)		(SCM_SMOB_OBJECT_1 (x))
 #define SCM_SET_SMOB_OBJECT(x,obj)	(SCM_SET_SMOB_OBJECT_1 ((x), (obj)))
-#define SCM_SMOB_OBJECT_LOC(x)		(SCM_SMOB_OBJECT_1_LOC (x)))
+#define SCM_SMOB_OBJECT_LOC(x)		(SCM_SMOB_OBJECT_1_LOC (x))
 
 
 #define SCM_SMOB_APPLY_0(x)		(scm_call_0 (x))
-- 
1.9.1

bug#18495: Alternatives?

[David Kastrup]

Any suggestions what non-deprecated alternative should be used instead
of SCM_SMOB_OBJECT_LOC in the year that it will take until this fix is
generally available?

-- 
David Kastrup

bug#18495: [PATCH] Fix SCM_SMOB_OBJECT{_,_0_,_1_,_2_,_3_}LOC

[David Kastrup]

* libguile/smob.h (SCM_SMOB_OBJECT_LOC, SCM_SMOB_OBJECT_0_LOC)
  (SCM_SMOB_OBJECT_1_LOC, SCM_SMOB_OBJECT_2_LOC)
  (SCM_SMOB_OBJECT_3_LOC):  These elementary API macros have been broken
  by commit 56164dc47f6616b359f0ad23be208f01a77b55fa in 2009

Signed-off-by: David Kastrup <dak@gnu.org>
---
 libguile/smob.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libguile/smob.h b/libguile/smob.h
index 60abe37..f910a24 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -156,14 +156,14 @@ scm_new_double_smob (scm_t_bits tc, scm_t_bits data1,
 #define SCM_SET_SMOB_OBJECT_1(x,obj)	(SCM_SET_SMOB_OBJECT_N ((x), 1, (obj)))
 #define SCM_SET_SMOB_OBJECT_2(x,obj)	(SCM_SET_SMOB_OBJECT_N ((x), 2, (obj)))
 #define SCM_SET_SMOB_OBJECT_3(x,obj)	(SCM_SET_SMOB_OBJECT_N ((x), 3, (obj)))
-#define SCM_SMOB_OBJECT_0_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 0)))
-#define SCM_SMOB_OBJECT_1_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 1)))
-#define SCM_SMOB_OBJECT_2_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 2)))
-#define SCM_SMOB_OBJECT_3_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 3)))
+#define SCM_SMOB_OBJECT_0_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 0))
+#define SCM_SMOB_OBJECT_1_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 1))
+#define SCM_SMOB_OBJECT_2_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 2))
+#define SCM_SMOB_OBJECT_3_LOC(x)	(SCM_SMOB_OBJECT_N_LOC ((x), 3))
 
 #define SCM_SMOB_OBJECT(x)		(SCM_SMOB_OBJECT_1 (x))
 #define SCM_SET_SMOB_OBJECT(x,obj)	(SCM_SET_SMOB_OBJECT_1 ((x), (obj)))
-#define SCM_SMOB_OBJECT_LOC(x)		(SCM_SMOB_OBJECT_1_LOC (x)))
+#define SCM_SMOB_OBJECT_LOC(x)		(SCM_SMOB_OBJECT_1_LOC (x))
 
 
 #define SCM_SMOB_APPLY_0(x)		(scm_call_0 (x))
-- 
1.9.1

bug#18495: Alternatives!?!

[David Kastrup]

Well, since the obvious fallback of using SCM_SMOB_OBJECT_1_LOC is
barred since _all_ of SCM_SMOB_OBJECT_LOC, SCM_SMOB_OBJECT_0_LOC,
SCM_SMOB_OBJECT_1_LOC, SCM_SMOB_OBJECT_2_LOC, SCM_SMOB_OBJECT_3_LOC are
broken, will there be something like an official guarantee that using
the undocumented SCM_SMOB_OBJECT_N_LOC will be supported for several
years?  Or is one supposed to use the undocumented SCM_CELL_OBJECT_LOC
instead?

I don't see any _documented_ accessor to SMOB cell locations that would
not be broken in the current source.

This is sort of important.

-- 
David Kastrup

bug#18495: Alternatives!?!

[Mark H Weaver]

David Kastrup <dak@gnu.org> writes:

> * libguile/smob.h (SCM_SMOB_OBJECT_LOC, SCM_SMOB_OBJECT_0_LOC)
>   (SCM_SMOB_OBJECT_1_LOC, SCM_SMOB_OBJECT_2_LOC)
>   (SCM_SMOB_OBJECT_3_LOC):  These elementary API macros have been broken
>   by commit 56164dc47f6616b359f0ad23be208f01a77b55fa in 2009

Ouch.  I've pushed this to stable-2.0, commit
8442211ef0029581b35f784489afcf210491fc41.  I'm closing this bug.

> will there be something like an official guarantee that using
> the undocumented SCM_SMOB_OBJECT_N_LOC will be supported for several
> years?

I think that's the best option.  Just use SCM_SMOB_OBJECT_N_LOC.

     Mark