summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
-rw-r--r--configure.in6
-rw-r--r--cont.c8
-rw-r--r--debug.h8
-rw-r--r--dln.h9
-rw-r--r--encoding.c11
-rw-r--r--include/ruby/defines.h8
-rw-r--r--include/ruby/encoding.h8
-rw-r--r--include/ruby/intern.h8
-rw-r--r--include/ruby/io.h8
-rw-r--r--include/ruby/missing.h8
-rw-r--r--include/ruby/oniguruma.h8
-rw-r--r--include/ruby/re.h9
-rw-r--r--include/ruby/regex.h8
-rw-r--r--include/ruby/ruby.h8
-rw-r--r--include/ruby/st.h8
-rw-r--r--include/ruby/util.h8
-rw-r--r--include/ruby/version.h10
-rw-r--r--include/ruby/vm.h8
-rw-r--r--include/ruby/win32.h8
-rw-r--r--iseq.h8
-rw-r--r--regenc.h8
-rw-r--r--regint.h8
-rw-r--r--regparse.h8
-rw-r--r--transcode_data.h8
26 files changed, 200 insertions, 3 deletions
@@ -1,4 +1,6 @@
-Thu Jul 22 06:26:48 2010 Nobuyoshi Nakada <[email protected]>
* configure.in (RMDIR): use --ignore-fail-on-non-empty if possible.
@@ -680,6 +680,8 @@ newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
{$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
{$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
INSNS2VMOPT = --srcdir="$(srcdir)"
{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
@@ -269,6 +269,7 @@ if test "$GCC" = yes; then
linker_flag=-Wl,
: ${optflags=-O3}
AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
else
linker_flag=
fi
@@ -414,6 +415,9 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
[wflag=-Wall])
RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
fi
test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
@@ -2160,8 +2164,6 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
@@ -1428,6 +1428,10 @@ Init_Cont(void)
rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
}
void
ruby_Init_Continuation_body(void)
{
@@ -1446,3 +1450,7 @@ ruby_Init_Fiber_as_Coroutine(void)
rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
}
@@ -15,6 +15,10 @@
#include "ruby/ruby.h"
#include "node.h"
#define dpv(h,v) ruby_debug_print_value(-1, 0, h, v)
#define dp(v) ruby_debug_print_value(-1, 0, "", v)
#define dpi(i) ruby_debug_print_id(-1, 0, "", i)
@@ -33,4 +37,8 @@ void ruby_debug_gc_check_func(void);
void ruby_set_debug_option(const char *str);
#endif
#endif /* RUBY_DEBUG_H */
@@ -28,6 +28,10 @@
# define _(args) ()
#endif
DEPRECATED(char *dln_find_exe(const char*,const char*));
DEPRECATED(char *dln_find_file(const char*,const char*));
char *dln_find_exe_r(const char*,const char*,char*,size_t);
@@ -38,4 +42,9 @@ extern char *dln_argv0;
#endif
void *dln_load(const char*);
#endif
@@ -23,6 +23,17 @@
#endif
#include "ruby/util.h"
static ID id_encoding;
VALUE rb_cEncoding;
static VALUE rb_encoding_list;
@@ -49,6 +49,10 @@ extern "C" {
#define ANYARGS
#endif
#define xmalloc ruby_xmalloc
#define xmalloc2 ruby_xmalloc2
#define xcalloc ruby_xcalloc
@@ -311,6 +315,10 @@ void rb_ia64_flushrs(void);
RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
#endif
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -22,6 +22,10 @@ extern "C" {
#include <stdarg.h>
#include "ruby/oniguruma.h"
#define ENCODING_INLINE_MAX 1023
#define ENCODING_SHIFT (FL_USHIFT+10)
#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT)
@@ -312,6 +316,10 @@ void rb_econv_binmode(rb_econv_t *ec);
#define ECONV_AFTER_OUTPUT 0x00020000
/* end of flags for rb_econv_convert */
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -28,6 +28,10 @@ extern "C" {
#endif
#include "ruby/st.h"
/*
* Functions and variables that are used by more than one source file of
* the kernel.
@@ -841,6 +845,10 @@ VALUE rb_time_succ(VALUE);
void rb_frame_pop(void);
int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -27,6 +27,10 @@ extern "C" {
#include <stdio_ext.h>
#endif
typedef struct rb_io_t {
int fd; /* file descriptor */
FILE *stdio_file; /* stdio ptr for read/write if available */
@@ -165,6 +169,10 @@ void rb_io_read_check(rb_io_t*);
int rb_io_read_pending(rb_io_t*);
DEPRECATED(void rb_read_check(FILE*));
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -49,6 +49,10 @@ struct timezone {
#define RUBY_EXTERN extern
#endif
#ifndef HAVE_ACOSH
RUBY_EXTERN double acosh(double);
RUBY_EXTERN double asinh(double);
@@ -169,6 +173,10 @@ RUBY_EXTERN int signbit(double x);
RUBY_EXTERN int ffs(int);
#endif
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -97,6 +97,10 @@ extern "C" {
#define ONIG_EXTERN extern
#endif
/* PART: character encoding */
#ifndef ONIG_ESCAPE_UCHAR_COLLISION
@@ -789,6 +793,10 @@ const char* onig_version P_((void));
ONIG_EXTERN
const char* onig_copyright P_((void));
#ifdef __cplusplus
#if 0
{ /* satisfy cc-mode */
@@ -24,6 +24,10 @@ extern "C" {
#include "ruby/regex.h"
typedef struct re_pattern_buffer Regexp;
struct rmatch_offset {
@@ -55,6 +59,11 @@ VALUE rb_reg_regsub(VALUE, VALUE, struct re_registers *, VALUE);
long rb_reg_adjust_startpos(VALUE, VALUE, long, int);
void rb_match_busy(VALUE);
VALUE rb_reg_quote(VALUE);
#if defined(__cplusplus)
#if 0
@@ -24,6 +24,10 @@ extern "C" {
#include "oniguruma.h"
#endif
#ifndef ONIG_RUBY_M17N
ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
@@ -32,6 +36,10 @@ ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
#endif /* ifndef ONIG_RUBY_M17N */
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -73,6 +73,10 @@ extern "C" {
#include "defines.h"
#if defined(HAVE_ALLOCA_H)
#include <alloca.h>
#else
@@ -1447,6 +1451,10 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#define close ruby_close
#endif
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -33,6 +33,10 @@ extern "C" {
# include <inttypes.h>
#endif
#if SIZEOF_LONG == SIZEOF_VOIDP
typedef unsigned long st_data_t;
#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
@@ -125,6 +129,10 @@ st_index_t st_hash_end(st_index_t h);
st_index_t st_hash_start(st_index_t h);
#define st_hash_start(h) ((st_index_t)(h))
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -40,6 +40,10 @@ extern "C" {
#endif
#endif
#define scan_oct(s,l,e) (int)ruby_scan_oct(s,l,e)
unsigned long ruby_scan_oct(const char *, size_t, size_t *);
#define scan_hex(s,l,e) (int)ruby_scan_hex(s,l,e)
@@ -80,6 +84,10 @@ double ruby_strtod(const char *, char **);
void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -36,6 +36,11 @@ extern "C" {
} /* satisfy cc-mode */
#endif
#endif
/*
* Interfaces from extension libraries.
*
@@ -50,6 +55,11 @@ RUBY_EXTERN const int ruby_level;
RUBY_EXTERN const char ruby_description[];
RUBY_EXTERN const char ruby_copyright[];
RUBY_EXTERN const char ruby_engine[];
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -19,6 +19,10 @@ extern "C" {
#endif
#endif
/* Place holder.
*
* We will prepare VM creation/control APIs on 1.9.2 or later.
@@ -32,6 +36,10 @@ typedef struct rb_vm_struct ruby_vm_t;
/* core API */
int ruby_vm_destruct(ruby_vm_t *vm);
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -8,6 +8,10 @@ extern "C" {
#endif
#endif
/*
* Copyright (c) 1993, Intergraph Corporation
*
@@ -662,6 +666,10 @@ in asynchronous_func_t.
typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
@@ -12,6 +12,10 @@
#ifndef RUBY_COMPILE_H
#define RUBY_COMPILE_H
/* compile.c */
VALUE rb_iseq_compile_node(VALUE self, NODE *node);
int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
@@ -101,4 +105,8 @@ struct iseq_compile_data {
#define DEFINED_ZSUPER INT2FIX(9)
#define DEFINED_FUNC INT2FIX(10)
#endif /* RUBY_COMPILE_H */
@@ -39,6 +39,10 @@
#endif
#include "ruby/oniguruma.h"
typedef struct {
OnigCodePoint from;
OnigCodePoint to;
@@ -208,4 +212,8 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
#define ENC_ALIAS(name, orig)
#define ENC_DUMMY(name)
#endif /* ONIGURUMA_REGENC_H */
@@ -225,6 +225,10 @@
#include "regenc.h"
#ifdef MIN
#undef MIN
#endif
@@ -838,4 +842,8 @@ typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);
extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
#endif /* ONIGURUMA_REGINT_H */
@@ -31,6 +31,10 @@
#include "regint.h"
/* node type */
#define NT_STR 0
#define NT_CCLASS 1
@@ -351,4 +355,8 @@ extern int onig_print_names(FILE*, regex_t*);
#endif
#endif
#endif /* ONIGURUMA_REGPARSE_H */
@@ -14,6 +14,10 @@
#ifndef RUBY_TRANSCODE_DATA_H
#define RUBY_TRANSCODE_DATA_H 1
#define WORDINDEX_SHIFT_BITS 2
#define WORDINDEX2INFO(widx) ((widx) << WORDINDEX_SHIFT_BITS)
#define INFO2WORDINDEX(info) ((info) >> WORDINDEX_SHIFT_BITS)
@@ -106,4 +110,8 @@ struct rb_transcoder {
void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);
void rb_register_transcoder(const rb_transcoder *);
#endif /* RUBY_TRANSCODE_DATA_H */