summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-12-08 05:35:58 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-12-08 05:35:58 +0000
commitea14c6e09a5fc236744ff0a5b51f30ffd7a28241 (patch)
tree368c81a7fca3147e873ff7ff20bfef1033db635b
parent1d9aaa67f385650d8eef5a2e259724a6cb57a925 (diff)
19991208
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--README.jp2
-rw-r--r--bignum.c2
-rw-r--r--config_s.dj2
-rw-r--r--configure41
-rw-r--r--gc.c3
-rw-r--r--st.c4
-rw-r--r--top.sed2
7 files changed, 29 insertions, 27 deletions
diff --git a/README.jp b/README.jp
index 19e5e0c896..6c320c89f4 100644
--- a/README.jp
+++ b/README.jp
@@ -10,7 +10,7 @@ Rubyはテキスト処理関係の能力などに優れ,Perlと同じくらい強力
によって,より分かりやすいプログラミングが出来ます.
-* Rubyの特長.
+* Rubyの特長
+ シンプルな文法
+ 普通のオブジェクト指向機能(クラス,メソッドコールなど)
diff --git a/bignum.c b/bignum.c
index 870e4129c5..828e0cb9aa 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1262,7 +1262,7 @@ rb_big_rand(max, rand)
VALUE v;
long len;
- len = RBIGNUM(v)->len;
+ len = RBIGNUM(max)->len;
v = bignew(len,1);
while (len--) {
BDIGITS(v)[len] = ((USHORT)~0) * rand;
diff --git a/config_s.dj b/config_s.dj
index 7ba18e4376..6f77b7f738 100644
--- a/config_s.dj
+++ b/config_s.dj
@@ -32,7 +32,7 @@ s%@AR@%ar%g
s%@INSTALL_PROGRAM@%${INSTALL}%g
s%@INSTALL_DATA@%${INSTALL} -m 644%g
s%@SET_MAKE@%%g
-s%@LIBOBJS@% crypt.o flock.o fnmatch.o snprintf.o%g
+s%@LIBOBJS@% crypt.o flock.o snprintf.o%g
s%@ALLOCA@%%g
s%@DEFAULT_KCODE@%%g
s%@EXEEXT@%.exe%g
diff --git a/configure b/configure
index fc3575ea03..56fe743679 100644
--- a/configure
+++ b/configure
@@ -4043,8 +4043,9 @@ echo "configure:4028: checking whether OS depend dynamic link works" >&5
else
case "$host_os" in
hpux*) CCDLFLAGS='+z';;
- solaris*|irix*) CCDLFLAGS='-K PIC' ;;
+ solaris*) CCDLFLAGS='-K PIC' ;;
sunos*) CCDLFLAGS='-PIC' ;;
+ irix*) CCDLFLAGS='-KPIC' ;;
esix*|uxpds*) CCDLFLAGS='-KPIC' ;;
*) CCDLFLAGS='' ;;
esac
@@ -4064,7 +4065,7 @@ echo "configure:4028: checking whether OS depend dynamic link works" >&5
rb_cv_dlopen=yes;;
sunos*) LDSHARED='ld -assert nodefinitions'
rb_cv_dlopen=yes;;
- irix*) LDSHARED='ld -ignore_unresolved'
+ irix*) LDSHARED='ld -shared'
rb_cv_dlopen=yes;;
sysv4*) LDSHARED='ld -G'
rb_cv_dlopen=yes;;
@@ -4145,12 +4146,12 @@ if test "$ac_cv_header_a_out_h" = yes; then
if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
cat confdefs.h > config.h
echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6
-echo "configure:4149: checking whether matz's dln works" >&5
+echo "configure:4150: checking whether matz's dln works" >&5
if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4154 "configure"
+#line 4155 "configure"
#include "confdefs.h"
#define USE_DLN_A_OUT
@@ -4160,7 +4161,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rb_cv_dln_a_out=yes
else
@@ -4267,7 +4268,7 @@ fi
case "$host_os" in
human*)
echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6
-echo "configure:4271: checking for _harderr in -lsignal" >&5
+echo "configure:4272: checking for _harderr in -lsignal" >&5
ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4275,7 +4276,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsignal $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+#line 4280 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4286,7 +4287,7 @@ int main() {
_harderr()
; return 0; }
EOF
-if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4314,7 +4315,7 @@ else
fi
echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6
-echo "configure:4318: checking for hmemset in -lhmem" >&5
+echo "configure:4319: checking for hmemset in -lhmem" >&5
ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4322,7 +4323,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lhmem $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4326 "configure"
+#line 4327 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4333,7 +4334,7 @@ int main() {
hmemset()
; return 0; }
EOF
-if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4363,12 +4364,12 @@ fi
for ac_func in select
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4367: checking for $ac_func" >&5
+echo "configure:4368: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4373 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4391,7 +4392,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4416,7 +4417,7 @@ fi
done
echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6
-echo "configure:4420: checking whether PD libc _dtos18 fail to convert big number" >&5
+echo "configure:4421: checking whether PD libc _dtos18 fail to convert big number" >&5
if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4424,7 +4425,7 @@ else
rb_cv_missing__dtos18=no
else
cat > conftest.$ac_ext <<EOF
-#line 4428 "configure"
+#line 4429 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4436,7 +4437,7 @@ main ()
}
EOF
-if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rb_cv_missing__dtos18=yes
else
@@ -4458,7 +4459,7 @@ EOF
fi
echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6
-echo "configure:4462: checking whether PD libc fconvert fail to round" >&5
+echo "configure:4463: checking whether PD libc fconvert fail to round" >&5
if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4466,7 +4467,7 @@ else
rb_cv_missing_fconvert=no
else
cat > conftest.$ac_ext <<EOF
-#line 4470 "configure"
+#line 4471 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4479,7 +4480,7 @@ main ()
}
EOF
-if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rb_cv_missing_fconvert=yes
else
diff --git a/gc.c b/gc.c
index c477d45456..6122724175 100644
--- a/gc.c
+++ b/gc.c
@@ -896,7 +896,8 @@ rb_gc()
alloca(0);
# define STACK_END (&stack_end)
#else
-# define STACK_END alloca(1)
+ VALUE *stack_end = alloca(1);
+# define STACK_END (stack_end)
#endif
alloc_objects = 0;
diff --git a/st.c b/st.c
index 486b72a434..503686b111 100644
--- a/st.c
+++ b/st.c
@@ -79,8 +79,8 @@ static long primes[] = {
32 + 5,
64 + 3,
128 + 3,
- 256 + 29,
- 512 + 17,
+ 256 + 27,
+ 512 + 9,
1024 + 9,
2048 + 5,
4096 + 83,
diff --git a/top.sed b/top.sed
index feef9006ba..40f1316109 100644
--- a/top.sed
+++ b/top.sed
@@ -33,7 +33,7 @@ s%@AR@%ar%g
s%@INSTALL_PROGRAM@%${INSTALL}%g
s%@INSTALL_DATA@%${INSTALL} -m 644%g
s%@SET_MAKE@%%g
-s%@LIBOBJS@% crypt.o flock.o fnmatch.o vsnprintf.o%g
+s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g
s%@ALLOCA@%%g
s%@DEFAULT_KCODE@%%g
s%@EXEEXT@%.exe%g