summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Livshin <mlivshin@bigfoot.com>2001-05-28 12:36:41 +0000
committerMichael Livshin <mlivshin@bigfoot.com>2001-05-28 12:36:41 +0000
commitdd85ce4758260f712d0efc806df6643aca8e3b74 (patch)
treefad1618800dd61fb9ab43ffa9584a7fcb4a9b6bb
parent1db81cb09afe3afec94903a4f83a5e947829a58e (diff)
downloadguile-dd85ce4758260f712d0efc806df6643aca8e3b74.tar.gz
* 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.
-rw-r--r--libguile/ChangeLog18
-rw-r--r--libguile/debug.c10
-rw-r--r--libguile/environments.c4
-rw-r--r--libguile/hashtab.c4
-rw-r--r--libguile/num2integral.i.c2
-rw-r--r--libguile/socket.c6
-rw-r--r--libguile/strop.c6
7 files changed, 34 insertions, 16 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 9c375df04..f0fdd1572 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -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>
* __scm.h (SCM_DEBUG_TYPING_STRICTNESS): Make 1 the default.
diff --git a/libguile/debug.c b/libguile/debug.c
index efece65f7..dc47c9dbc 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -265,7 +265,7 @@ SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE);
else
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
@@ -288,10 +288,10 @@ SCM_DEFINE (scm_make_iloc, "make-iloc", 3, 0, 0,
{
SCM_VALIDATE_INUM (1,frame);
SCM_VALIDATE_INUM (2,binding);
- return (SCM_ILOC00
- + SCM_IFRINC * SCM_INUM (frame)
- + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
- + SCM_IDINC * SCM_INUM (binding));
+ return SCM_PACK (SCM_UNPACK (SCM_ILOC00)
+ + SCM_IFRINC * SCM_INUM (frame)
+ + (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
+ + SCM_IDINC * SCM_INUM (binding));
}
#undef FUNC_NAME
diff --git a/libguile/environments.c b/libguile/environments.c
index aad811d32..eecf4fe3f 100644
--- a/libguile/environments.c
+++ b/libguile/environments.c
@@ -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))
{
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))
{
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index d9f629240..da802a5e1 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -551,10 +551,10 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
while (!SCM_NULLP (ls))
{
SCM_ASSERT (SCM_CONSP (ls),
- table, SCM_ARG1, s_scm_hash_fold);
+ table, SCM_ARG3, s_scm_hash_fold);
handle = SCM_CAR (ls);
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);
ls = SCM_CDR (ls);
}
diff --git a/libguile/num2integral.i.c b/libguile/num2integral.i.c
index 3e5d65389..a68fe5d87 100644
--- a/libguile/num2integral.i.c
+++ b/libguile/num2integral.i.c
@@ -92,7 +92,7 @@ INTEGRAL2NUM (ITYPE n)
SCM_POSFIXABLE (n)
#endif
)
- return SCM_MAKINUM (n);
+ return SCM_MAKINUM ((long) n);
#ifdef SCM_BIGDIG
return INTEGRAL2BIG (n);
diff --git a/libguile/socket.c b/libguile/socket.c
index 109918d83..685d93277 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -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"
"@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\n"
"@lisp\n"
- "(inet-pton AF_INET "127.0.0.1") @result{} 2130706433\n"
- "(inet-pton AF_INET6 "::1") @result{} 1\n"
+ "(inet-pton AF_INET \"127.0.0.1\") @result{} 2130706433\n"
+ "(inet-pton AF_INET6 \"::1\") @result{} 1\n"
"@end lisp")
#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"
"@var{family} can be @code{AF_INET} or @code{AF_INET6}. E.g.,\n\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"
"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
"@end lisp")
diff --git a/libguile/strop.c b/libguile/strop.c
index ff2698fb3..d8336634f 100644
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -483,9 +483,9 @@ SCM_DEFINE (scm_string_capitalize_x, "string-capitalize!", 1, 0, 0,
"destructively and return @var{str}.\n"
"\n"
"@lisp\n"
- "y @result{} "hello world"\n"
- "(string-capitalize! y) @result{} "Hello World"\n"
- "y @result{} "Hello World"\n"
+ "y @result{} \"hello world\"\n"
+ "(string-capitalize! y) @result{} \"Hello World\"\n"
+ "y @result{} \"Hello World\"\n"
"@end lisp")
#define FUNC_NAME s_scm_string_capitalize_x
{