1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 04:10:18 +02:00

* strop.c (s_scm_string_capitalize_x): fix docstring quoting.

* socket.c (s_scm_inet_pton): fix docstring quoting.
(s_scm_inet_ntop): ditto.

* num2integral.i.c (INTEGRAL2NUM): cast to fix a warning.

* hashtab.c (scm_internal_hash_fold): fix argument position in
SCM_ASSERT.

* environments.c (s_scm_import_environment_set_imports_x): fix
argument position in SCM_ASSERT.

* debug.c (s_scm_make_gloc): fix SCM packing/unpacking.
(s_scm_make_iloc): ditto.
This commit is contained in:
Michael Livshin 2001-05-28 12:36:41 +00:00
parent 1db81cb09a
commit dd85ce4758
7 changed files with 34 additions and 16 deletions

View file

@ -1,3 +1,21 @@
2001-05-28 Michael Livshin <mlivshin@bigfoot.com>
* strop.c (s_scm_string_capitalize_x): fix docstring quoting.
* socket.c (s_scm_inet_pton): fix docstring quoting.
(s_scm_inet_ntop): ditto.
* num2integral.i.c (INTEGRAL2NUM): cast to fix a warning.
* hashtab.c (scm_internal_hash_fold): fix argument position in
SCM_ASSERT.
* environments.c (s_scm_import_environment_set_imports_x): fix
argument position in SCM_ASSERT.
* debug.c (s_scm_make_gloc): fix SCM packing/unpacking.
(s_scm_make_iloc): ditto.
2001-05-26 Dirk Herrmann <D.Herrmann@tu-bs.de> 2001-05-26 Dirk Herrmann <D.Herrmann@tu-bs.de>
* __scm.h (SCM_DEBUG_TYPING_STRICTNESS): Make 1 the default. * __scm.h (SCM_DEBUG_TYPING_STRICTNESS): Make 1 the default.

View file

@ -265,7 +265,7 @@ SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE); env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE);
else else
SCM_VALIDATE_NULLORCONS (2,env); SCM_VALIDATE_NULLORCONS (2,env);
return scm_make_memoized (SCM_UNPACK (var) + scm_tc3_cons_gloc, env); return scm_make_memoized (SCM_PACK (SCM_UNPACK (var) + scm_tc3_cons_gloc), env);
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -288,7 +288,7 @@ SCM_DEFINE (scm_make_iloc, "make-iloc", 3, 0, 0,
{ {
SCM_VALIDATE_INUM (1,frame); SCM_VALIDATE_INUM (1,frame);
SCM_VALIDATE_INUM (2,binding); SCM_VALIDATE_INUM (2,binding);
return (SCM_ILOC00 return SCM_PACK (SCM_UNPACK (SCM_ILOC00)
+ SCM_IFRINC * SCM_INUM (frame) + SCM_IFRINC * SCM_INUM (frame)
+ (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0) + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
+ SCM_IDINC * SCM_INUM (binding)); + SCM_IDINC * SCM_INUM (binding));

View file

@ -1907,9 +1907,9 @@ SCM_DEFINE (scm_import_environment_set_imports_x, "import-environment-set-import
for (l = imports; SCM_CONSP (l); l = SCM_CDR (l)) for (l = imports; SCM_CONSP (l); l = SCM_CDR (l))
{ {
SCM obj = SCM_CAR (l); SCM obj = SCM_CAR (l);
SCM_ASSERT (SCM_ENVIRONMENT_P (obj), imports, SCM_ARG1, FUNC_NAME); SCM_ASSERT (SCM_ENVIRONMENT_P (obj), imports, SCM_ARG2, FUNC_NAME);
} }
SCM_ASSERT (SCM_NULLP (l), imports, SCM_ARG1, FUNC_NAME); SCM_ASSERT (SCM_NULLP (l), imports, SCM_ARG2, FUNC_NAME);
for (l = body->import_observers; !SCM_NULLP (l); l = SCM_CDR (l)) for (l = body->import_observers; !SCM_NULLP (l); l = SCM_CDR (l))
{ {

View file

@ -551,10 +551,10 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
while (!SCM_NULLP (ls)) while (!SCM_NULLP (ls))
{ {
SCM_ASSERT (SCM_CONSP (ls), SCM_ASSERT (SCM_CONSP (ls),
table, SCM_ARG1, s_scm_hash_fold); table, SCM_ARG3, s_scm_hash_fold);
handle = SCM_CAR (ls); handle = SCM_CAR (ls);
SCM_ASSERT (SCM_CONSP (handle), SCM_ASSERT (SCM_CONSP (handle),
table, SCM_ARG1, s_scm_hash_fold); table, SCM_ARG3, s_scm_hash_fold);
result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result); result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result);
ls = SCM_CDR (ls); ls = SCM_CDR (ls);
} }

View file

@ -92,7 +92,7 @@ INTEGRAL2NUM (ITYPE n)
SCM_POSFIXABLE (n) SCM_POSFIXABLE (n)
#endif #endif
) )
return SCM_MAKINUM (n); return SCM_MAKINUM ((long) n);
#ifdef SCM_BIGDIG #ifdef SCM_BIGDIG
return INTEGRAL2BIG (n); return INTEGRAL2BIG (n);

View file

@ -355,8 +355,8 @@ SCM_DEFINE (scm_inet_pton, "inet-pton", 2, 0, 0,
"the result is an integer with normal host byte ordering.\n" "the result is an integer with normal host byte ordering.\n"
"@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n" "@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n"
"@lisp\n" "@lisp\n"
"(inet-pton AF_INET "127.0.0.1") @result{} 2130706433\n" "(inet-pton AF_INET \"127.0.0.1\") @result{} 2130706433\n"
"(inet-pton AF_INET6 "::1") @result{} 1\n" "(inet-pton AF_INET6 \"::1\") @result{} 1\n"
"@end lisp") "@end lisp")
#define FUNC_NAME s_scm_inet_pton #define FUNC_NAME s_scm_inet_pton
{ {
@ -389,7 +389,7 @@ SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0,
"the input is an integer with normal host byte ordering.\n" "the input is an integer with normal host byte ordering.\n"
"@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n" "@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n"
"@lisp\n" "@lisp\n"
"(inet-ntop AF_INET 2130706433) @result{} "127.0.0.1"\n" "(inet-ntop AF_INET 2130706433) @result{} \"127.0.0.1\"\n"
"(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}\n" "(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}\n"
"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n" "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
"@end lisp") "@end lisp")

View file

@ -483,9 +483,9 @@ SCM_DEFINE (scm_string_capitalize_x, "string-capitalize!", 1, 0, 0,
"destructively and return @var{str}.\n" "destructively and return @var{str}.\n"
"\n" "\n"
"@lisp\n" "@lisp\n"
"y @result{} "hello world"\n" "y @result{} \"hello world\"\n"
"(string-capitalize! y) @result{} "Hello World"\n" "(string-capitalize! y) @result{} \"Hello World\"\n"
"y @result{} "Hello World"\n" "y @result{} \"Hello World\"\n"
"@end lisp") "@end lisp")
#define FUNC_NAME s_scm_string_capitalize_x #define FUNC_NAME s_scm_string_capitalize_x
{ {