Properly handling smobs in macros.c

[Martin Grabmueller]

Hi all,

this is not really a bug, but I think the attached change should be
made for the sake of consistency.

2001-02-08  Martin Grabmueller  <address@hidden>

        * macros.c (scm_macro_name, scm_macro_transformer): Use
        SCM_SMOB_DATA instead of SCM_CDR.


Regards,
  'martin

===File ~/cvs/guile-core/libguile/diff-macro================
Index: macros.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/macros.c,v
retrieving revision 1.24
diff -c -r1.24 macros.c
*** macros.c    2000/12/08 17:32:56     1.24
--- macros.c    2001/02/08 19:54:00
***************
*** 148,169 ****
  
  SCM_DEFINE (scm_macro_name, "macro-name", 1, 0, 0, 
              (SCM m),
!           "")
  #define FUNC_NAME s_scm_macro_name
  {
    SCM_VALIDATE_SMOB (1,m,macro);
!   return scm_procedure_name (SCM_CDR (m));
  }
  #undef FUNC_NAME
  
  
  SCM_DEFINE (scm_macro_transformer, "macro-transformer", 1, 0, 0, 
              (SCM m),
!           "")
  #define FUNC_NAME s_scm_macro_transformer
  {
    SCM_VALIDATE_SMOB (1,m,macro);
!   return SCM_CLOSUREP (SCM_CDR (m)) ? SCM_CDR (m) : SCM_BOOL_F;
  }
  #undef FUNC_NAME
  
--- 148,169 ----
  
  SCM_DEFINE (scm_macro_name, "macro-name", 1, 0, 0, 
              (SCM m),
!           "Return the name of the macro @var{m}.")
  #define FUNC_NAME s_scm_macro_name
  {
    SCM_VALIDATE_SMOB (1,m,macro);
!   return scm_procedure_name (SCM_PACK (SCM_SMOB_DATA (m)));
  }
  #undef FUNC_NAME
  
  
  SCM_DEFINE (scm_macro_transformer, "macro-transformer", 1, 0, 0, 
              (SCM m),
!           "Return the transformer of the macro @var{m}.")
  #define FUNC_NAME s_scm_macro_transformer
  {
    SCM_VALIDATE_SMOB (1,m,macro);
!   return SCM_CLOSUREP (SCM_PACK(SCM_SMOB_DATA (m))) ? SCM_CDR (m) : 
SCM_BOOL_F;
  }
  #undef FUNC_NAME
  
============================================================