[Scsh-checkins] CVS: scsh-0.6/c external.c,1.9,1.10 scheme48.h,1.6,1.7 scheme48.h.in,1.8,1.9

[Mike Sperber <sperber@users.sourceforge.net>]

Update of /cvsroot/scsh/scsh-0.6/c
In directory usw-pr-cvs1:/tmp/cvs-serv3107/c

Modified Files:
        external.c scheme48.h scheme48.h.in 
Log Message:
Make naming consistent with current Scheme 48:

argtype -> argument_type
argnumber -> argument_number


Index: external.c
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/c/external.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** external.c  2001/08/09 11:01:54     1.9
--- external.c  2001/12/03 15:19:23     1.10
***************
*** 474,483 ****
  
  void
! s48_raise_argtype_error(s48_value value) {
    s48_raise_scheme_exception(S48_EXCEPTION_WRONG_TYPE_ARGUMENT, 1, value);
  }
  
  void
! s48_raise_argnumber_error(s48_value value, s48_value min, s48_value max) {
    s48_raise_scheme_exception(S48_EXCEPTION_WRONG_NUMBER_OF_ARGUMENTS,
                             3, value, min, max);
--- 474,483 ----
  
  void
! s48_raise_argument_type_error(s48_value value) {
    s48_raise_scheme_exception(S48_EXCEPTION_WRONG_TYPE_ARGUMENT, 1, value);
  }
  
  void
! s48_raise_argument_number_error(s48_value value, s48_value min, s48_value 
max) {
    s48_raise_scheme_exception(S48_EXCEPTION_WRONG_NUMBER_OF_ARGUMENTS,
                             3, value, min, max);
***************
*** 583,587 ****
  {
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argtype_error(thing);
    
    return S48_STOB_DESCRIPTOR_LENGTH(thing);
--- 583,587 ----
  {
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argument_type_error(thing);
    
    return S48_STOB_DESCRIPTOR_LENGTH(thing);
***************
*** 592,596 ****
  {
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argtype_error(thing);
  
    if (type == S48_STOBTYPE_STRING)
--- 592,596 ----
  {
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argument_type_error(thing);
  
    if (type == S48_STOBTYPE_STRING)
***************
*** 606,610 ****
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argtype_error(thing);
  
    length = S48_STOB_DESCRIPTOR_LENGTH(thing);
--- 606,610 ----
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argument_type_error(thing);
  
    length = S48_STOB_DESCRIPTOR_LENGTH(thing);
***************
*** 626,630 ****
        (S48_STOB_TYPE(thing) == type) &&
        !S48_STOB_IMMUTABLEP(thing)))
!     s48_raise_argtype_error(thing);
    
    length = S48_STOB_DESCRIPTOR_LENGTH(thing);
--- 626,630 ----
        (S48_STOB_TYPE(thing) == type) &&
        !S48_STOB_IMMUTABLEP(thing)))
!     s48_raise_argument_type_error(thing);
    
    length = S48_STOB_DESCRIPTOR_LENGTH(thing);
***************
*** 644,648 ****
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argtype_error(thing);
    
    length = (type == S48_STOBTYPE_STRING) ?
--- 644,648 ----
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argument_type_error(thing);
    
    length = (type == S48_STOBTYPE_STRING) ?
***************
*** 664,668 ****
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argtype_error(thing);
    
    length = (type == S48_STOBTYPE_STRING) ?
--- 664,668 ----
  
    if (!(S48_STOB_P(thing) && (S48_STOB_TYPE(thing) == type)))
!     s48_raise_argument_type_error(thing);
    
    length = (type == S48_STOBTYPE_STRING) ?
***************
*** 699,703 ****
  {
    if (value < S48_MIN_FIXNUM_VALUE || S48_MAX_FIXNUM_VALUE < value)
!     s48_raise_argtype_error(s48_enter_integer(value));
  
    return S48_UNSAFE_ENTER_FIXNUM(value);
--- 699,703 ----
  {
    if (value < S48_MIN_FIXNUM_VALUE || S48_MAX_FIXNUM_VALUE < value)
!     s48_raise_argument_type_error(s48_enter_integer(value));
  
    return S48_UNSAFE_ENTER_FIXNUM(value);
***************
*** 708,712 ****
  {
    if (! S48_FIXNUM_P(value))
!     s48_raise_argtype_error(value);
    
    return S48_UNSAFE_EXTRACT_FIXNUM(value);
--- 708,712 ----
  {
    if (! S48_FIXNUM_P(value))
!     s48_raise_argument_type_error(value);
    
    return S48_UNSAFE_EXTRACT_FIXNUM(value);
***************
*** 787,791 ****
  
      if (stuff == S48_FALSE)
!       s48_raise_argtype_error(value);
  
      /* The first VECTOR_REF does the type checking for the rest. */
--- 787,791 ----
  
      if (stuff == S48_FALSE)
!       s48_raise_argument_type_error(value);
  
      /* The first VECTOR_REF does the type checking for the rest. */
***************
*** 798,802 ****
        if ((! S48_FIXNUM_P(boxed_high)) ||
          high > (pos_p ? 0x7FFF : 0x8000))
!       s48_raise_argtype_error(value);
        
        {
--- 798,802 ----
        if ((! S48_FIXNUM_P(boxed_high)) ||
          high > (pos_p ? 0x7FFF : 0x8000))
!       s48_raise_argument_type_error(value);
        
        {
***************
*** 815,819 ****
      temp = S48_UNSAFE_EXTRACT_FIXNUM(value);
      if (temp < 0)
!       s48_raise_argtype_error(value);
      else return (unsigned long) temp;
    }
--- 815,819 ----
      temp = S48_UNSAFE_EXTRACT_FIXNUM(value);
      if (temp < 0)
!       s48_raise_argument_type_error(value);
      else return (unsigned long) temp;
    }
***************
*** 833,837 ****
  
      if (stuff == S48_FALSE)
!       s48_raise_argtype_error(value);
  
      /* The first VECTOR_REF does the type checking for the rest. */
--- 833,837 ----
  
      if (stuff == S48_FALSE)
!       s48_raise_argument_type_error(value);
  
      /* The first VECTOR_REF does the type checking for the rest. */
***************
*** 845,849 ****
          (! S48_FIXNUM_P(boxed_high)) ||
          (high >  0xFFFF)) 
!       s48_raise_argtype_error(value);
        else return ((((unsigned long) high) << 16) + low);
      }
--- 845,849 ----
          (! S48_FIXNUM_P(boxed_high)) ||
          (high >  0xFFFF)) 
!       s48_raise_argument_type_error(value);
        else return ((((unsigned long) high) << 16) + low);
      }
***************
*** 870,874 ****
  {
    if (! S48_DOUBLE_P(s48_double))
!     s48_raise_argtype_error(s48_double);
    
    return S48_UNSAFE_EXTRACT_DOUBLE(s48_double);
--- 870,874 ----
  {
    if (! S48_DOUBLE_P(s48_double))
!     s48_raise_argument_type_error(s48_double);
    
    return S48_UNSAFE_EXTRACT_DOUBLE(s48_double);
***************
*** 890,894 ****
  {
    if (! S48_CHAR_P(a_char))
!     s48_raise_argtype_error(a_char);
    
    return S48_UNSAFE_EXTRACT_CHAR(a_char);
--- 890,894 ----
  {
    if (! S48_CHAR_P(a_char))
!     s48_raise_argument_type_error(a_char);
    
    return S48_UNSAFE_EXTRACT_CHAR(a_char);
***************
*** 1064,1068 ****
        (S48_UNSAFE_SHARED_BINDING_REF(type_binding) !=
         S48_UNSAFE_RECORD_REF(record, -1)))
!     s48_raise_argtype_error(record);
  }    
  
--- 1064,1068 ----
        (S48_UNSAFE_SHARED_BINDING_REF(type_binding) !=
         S48_UNSAFE_RECORD_REF(record, -1)))
!     s48_raise_argument_type_error(record);
  }    
  

Index: scheme48.h
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/c/scheme48.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** scheme48.h  2001/08/09 11:01:54     1.6
--- scheme48.h  2001/12/03 15:19:23     1.7
***************
*** 189,195 ****
  
  extern void s48_raise_scheme_exception(long type, long nargs, ...);
! extern void s48_raise_argtype_error(s48_value value);
! extern void s48_raise_argnumber_error(s48_value value,
!                                 s48_value min, s48_value max);
  extern void s48_raise_range_error(s48_value value,
                              s48_value min, s48_value max);
--- 189,196 ----
  
  extern void s48_raise_scheme_exception(long type, long nargs, ...);
! extern void s48_raise_argument_type_error(s48_value value);
! extern void s48_raise_argument_number_error(s48_value value,
!                                           s48_value min,
!                                           s48_value max);
  extern void s48_raise_range_error(s48_value value,
                              s48_value min, s48_value max);
***************
*** 212,226 ****
  /* Type checking */
  
! #define S48_CHECK_PAIR(v) do { if (!S48_PAIR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_FIXNUM(v) do { if (!S48_FIXNUM_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_STRING(v) do { if (!S48_STRING_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_BYTE_VECTOR(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_CHANNEL(v) do { if (!S48_CHANNEL_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_RECORD(v) do { if (!S48_RECORD_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_VALUE(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_EXPORT_BINDING(v) do { if (!S48_EXPORT_BINDING_P(v)) 
s48_raise_argtype_error(v); } while (0)
  
  #define S48_VALUE_P(v) (S48_BYTE_VECTOR_P(v))
  
  extern void s48_check_record_type(s48_value record, s48_value type_binding);
  
--- 213,232 ----
  /* Type checking */
  
! #define S48_CHECK_PAIR(v) do { if (!S48_PAIR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_FIXNUM(v) do { if (!S48_FIXNUM_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_STRING(v) do { if (!S48_STRING_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_BYTE_VECTOR(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_CHANNEL(v) do { if (!S48_CHANNEL_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_RECORD(v) do { if (!S48_RECORD_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_VALUE(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_EXPORT_BINDING(v) do { if (!S48_EXPORT_BINDING_P(v)) 
s48_raise_argument_type_error(v); } while (0)
  
  #define S48_VALUE_P(v) (S48_BYTE_VECTOR_P(v))
  
+ #define S48_TRUE_P(v) ((v) == S48_TRUE)
+ #define S48_FALSE_P(v) ((v) == S48_FALSE)
+ #define S48_EXTRACT_BOOLEAN(v) ((v) != S48_FALSE)
+ #define S48_ENTER_BOOLEAN(v) ((v) ? S48_TRUE : S48_FALSE)
+ 
  extern void s48_check_record_type(s48_value record, s48_value type_binding);
  
***************
*** 263,268 ****
  #define S48_STOB_REF(x, i) (S48_ADDRESS_AFTER_HEADER(x, s48_value)[i])
  #define S48_STOB_BYTE_REF(x, i) (((char *)S48_ADDRESS_AFTER_HEADER(x, 
s48_value))[i])
! #define S48_STOB_SET(x, i, v) do { s48_value __stob_set_x = (x); long 
__stob_set_i = (i); s48_value __stob_set_v = (v); if 
(S48_STOB_IMMUTABLEP(__stob_set_x)) s48_raise_argtype_error(__stob_set_x); else 
{ S48_WRITE_BARRIER((__stob_set_x), (char *) (&S48_STOB_REF((__stob_set_x), 
(__stob_set_i))),(__stob_set_v)); *(&S48_STOB_REF((__stob_set_x), 
(__stob_set_i))) = (__stob_set_v); } } while (0)
! #define S48_STOB_BYTE_SET(x, i, v) do { s48_value __stob_set_x = (x); long 
__stob_set_i = (i); char __stob_set_v = (v); if 
(S48_STOB_IMMUTABLEP(__stob_set_x)) s48_raise_argtype_error(__stob_set_x); else 
*(&S48_STOB_BYTE_REF((__stob_set_x), (__stob_set_i))) = (__stob_set_v); } while 
(0)
  #define S48_STOB_TYPE(x)   ((S48_STOB_HEADER(x)>>2)&31)
  #define S48_STOB_HEADER(x) (S48_STOB_REF((x),-1))
--- 269,274 ----
  #define S48_STOB_REF(x, i) (S48_ADDRESS_AFTER_HEADER(x, s48_value)[i])
  #define S48_STOB_BYTE_REF(x, i) (((char *)S48_ADDRESS_AFTER_HEADER(x, 
s48_value))[i])
! #define S48_STOB_SET(x, i, v) do { s48_value __stob_set_x = (x); long 
__stob_set_i = (i); s48_value __stob_set_v = (v); if 
(S48_STOB_IMMUTABLEP(__stob_set_x)) 
s48_raise_argument_type_error(__stob_set_x); else { 
S48_WRITE_BARRIER((__stob_set_x), (char *) (&S48_STOB_REF((__stob_set_x), 
(__stob_set_i))),(__stob_set_v)); *(&S48_STOB_REF((__stob_set_x), 
(__stob_set_i))) = (__stob_set_v); } } while (0)
! #define S48_STOB_BYTE_SET(x, i, v) do { s48_value __stob_set_x = (x); long 
__stob_set_i = (i); char __stob_set_v = (v); if 
(S48_STOB_IMMUTABLEP(__stob_set_x)) 
s48_raise_argument_type_error(__stob_set_x); else 
*(&S48_STOB_BYTE_REF((__stob_set_x), (__stob_set_i))) = (__stob_set_v); } while 
(0)
  #define S48_STOB_TYPE(x)   ((S48_STOB_HEADER(x)>>2)&31)
  #define S48_STOB_HEADER(x) (S48_STOB_REF((x),-1))

Index: scheme48.h.in
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/c/scheme48.h.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** scheme48.h.in       2001/08/09 11:01:54     1.8
--- scheme48.h.in       2001/12/03 15:19:23     1.9
***************
*** 183,189 ****
  
  extern void s48_raise_scheme_exception(long type, long nargs, ...);
! extern void s48_raise_argtype_error(s48_value value);
! extern void s48_raise_argnumber_error(s48_value value,
!                                 s48_value min, s48_value max);
  extern void s48_raise_range_error(s48_value value,
                              s48_value min, s48_value max);
--- 183,190 ----
  
  extern void s48_raise_scheme_exception(long type, long nargs, ...);
! extern void s48_raise_argument_type_error(s48_value value);
! extern void s48_raise_argument_number_error(s48_value value,
!                                           s48_value min,
!                                           s48_value max);
  extern void s48_raise_range_error(s48_value value,
                              s48_value min, s48_value max);
***************
*** 206,219 ****
  /* Type checking */
  
! #define S48_CHECK_PAIR(v) do { if (!S48_PAIR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_FIXNUM(v) do { if (!S48_FIXNUM_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_STRING(v) do { if (!S48_STRING_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_BYTE_VECTOR(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_CHANNEL(v) do { if (!S48_CHANNEL_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_RECORD(v) do { if (!S48_RECORD_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_VALUE(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argtype_error(v); } while (0)
! #define S48_CHECK_EXPORT_BINDING(v) do { if (!S48_EXPORT_BINDING_P(v)) 
s48_raise_argtype_error(v); } while (0)
  
  #define S48_VALUE_P(v) (S48_BYTE_VECTOR_P(v))
  
  extern void s48_check_record_type(s48_value record, s48_value type_binding);
--- 207,225 ----
  /* Type checking */
  
! #define S48_CHECK_PAIR(v) do { if (!S48_PAIR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_FIXNUM(v) do { if (!S48_FIXNUM_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_STRING(v) do { if (!S48_STRING_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_BYTE_VECTOR(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_CHANNEL(v) do { if (!S48_CHANNEL_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_RECORD(v) do { if (!S48_RECORD_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_VALUE(v) do { if (!S48_BYTE_VECTOR_P(v)) 
s48_raise_argument_type_error(v); } while (0)
! #define S48_CHECK_EXPORT_BINDING(v) do { if (!S48_EXPORT_BINDING_P(v)) 
s48_raise_argument_type_error(v); } while (0)
  
  #define S48_VALUE_P(v) (S48_BYTE_VECTOR_P(v))
+ 
+ #define S48_TRUE_P(v) ((v) == S48_TRUE)
+ #define S48_FALSE_P(v) ((v) == S48_FALSE)
+ #define S48_EXTRACT_BOOLEAN(v) ((v) != S48_FALSE)
+ #define S48_ENTER_BOOLEAN(v) ((v) ? S48_TRUE : S48_FALSE)
  
  extern void s48_check_record_type(s48_value record, s48_value type_binding);