aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0546: supporting Ruby 1.8 makes code complicated

Browse Source 
Problem:    Supporting Ruby 1.8 makes code complicated.
Solution:   Drop Ruby 1.8 support, it is ancient. (Ken Takata, closes #11195)
This commit is contained in:
K.Takata
2022-09-22 16:12:06 +01:00
committed by Bram Moolenaar
parent daaa3d9965
commit 236ccbf6f8
6 changed files with 105 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Make_cyg_ming.mak
View File

@@ -441,7 +441,7 @@ endif
# RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak) # RUBY=[Path to Ruby directory] (Set inside Make_cyg.mak or Make_ming.mak)
# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically, "no" for static) # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically, "no" for static)
# RUBY_VER=[Ruby version, eg 19, 22] (default is 22) # RUBY_VER=[Ruby version, eg 19, 22] (default is 22)
# RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0] # RUBY_API_VER_LONG=[Ruby API version, eg 1.9.1, 2.2.0]
# (default is 2.2.0) # (default is 2.2.0)
# You must set RUBY_API_VER_LONG when changing RUBY_VER. # You must set RUBY_API_VER_LONG when changing RUBY_VER.
# Note: If you use Ruby 1.9.3, set as follows: # Note: If you use Ruby 1.9.3, set as follows:
@@ -466,9 +466,7 @@ RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG))
endif endif
ifndef RUBY_PLATFORM ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16) ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
RUBY_PLATFORM = i586-mswin32
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
RUBY_PLATFORM = i386-mingw32 RUBY_PLATFORM = i386-mingw32
else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),) else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
RUBY_PLATFORM = x64-mingw32 RUBY_PLATFORM = x64-mingw32
@@ -480,32 +478,20 @@ RUBY_PLATFORM = i386-mswin32
endif endif
ifndef RUBY_INSTALL_NAME ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16) ifndef RUBY_MSVCRT_NAME
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
else
ifndef RUBY_MSVCRT_NAME
# Base name of msvcrXX.dll which is used by ruby's dll. # Base name of msvcrXX.dll which is used by ruby's dll.
RUBY_MSVCRT_NAME = msvcrt RUBY_MSVCRT_NAME = msvcrt
endif endif
ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt) ifeq ($(RUBY_PLATFORM),x64-mingw-ucrt)
RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
else ifeq ($(ARCH),x86-64) else ifeq ($(ARCH),x86-64)
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
else else
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
endif
endif endif
endif endif
ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
RUBY_19_OR_LATER = 1
endif
ifdef RUBY_19_OR_LATER
RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
else
RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
endif
ifeq (no, $(DYNAMIC_RUBY)) ifeq (no, $(DYNAMIC_RUBY))
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
endif endif

51
src/Make_mvc.mak
View File

@@ -86,7 +86,7 @@
# RUBY=[Path to Ruby directory] # RUBY=[Path to Ruby directory]
# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically) # DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
# RUBY_VER=[Ruby version, eg 19, 22] (default is 22) # RUBY_VER=[Ruby version, eg 19, 22] (default is 22)
# RUBY_API_VER_LONG=[Ruby API version, eg 1.8, 1.9.1, 2.2.0] # RUBY_API_VER_LONG=[Ruby API version, eg 1.9.1, 2.2.0]
# (default is 2.2.0) # (default is 2.2.0)
# You must set RUBY_API_VER_LONG when change RUBY_VER. # You must set RUBY_API_VER_LONG when change RUBY_VER.
# Note: If you use Ruby 1.9.3, set as follows: # Note: If you use Ruby 1.9.3, set as follows:
@@ -1076,54 +1076,35 @@ RUBY_API_VER_LONG = $(RUBY_VER_LONG)
RUBY_API_VER = $(RUBY_API_VER_LONG:.=) RUBY_API_VER = $(RUBY_API_VER_LONG:.=)
! endif ! endif
! if $(RUBY_VER) >= 18 ! ifndef RUBY_PLATFORM
! if "$(CPU)" == "i386"
! ifndef RUBY_PLATFORM
! if "$(CPU)" == "i386"
RUBY_PLATFORM = i386-mswin32 RUBY_PLATFORM = i386-mswin32
! else # CPU ! else # CPU
RUBY_PLATFORM = x64-mswin64 RUBY_PLATFORM = x64-mswin64
! endif # CPU ! endif # CPU
! if $(RUBY_VER) > 19
RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER) RUBY_PLATFORM = $(RUBY_PLATFORM)_$(MSVCRT_VER)
! endif # RUBY_VER ! endif # RUBY_PLATFORM
! endif # RUBY_PLATFORM
! ifndef RUBY_INSTALL_NAME ! ifndef RUBY_INSTALL_NAME
! ifndef RUBY_MSVCRT_NAME ! ifndef RUBY_MSVCRT_NAME
# Base name of msvcrXX.dll which is used by ruby's dll. # Base name of msvcrXX.dll which is used by ruby's dll.
RUBY_MSVCRT_NAME = $(MSVCRT_NAME) RUBY_MSVCRT_NAME = $(MSVCRT_NAME)
! endif # RUBY_MSVCRT_NAME ! endif # RUBY_MSVCRT_NAME
! if "$(CPU)" == "i386" ! if "$(CPU)" == "i386"
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
! else # CPU ! else # CPU
! if EXIST($(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt) ! if EXIST($(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw-ucrt)
RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = x64-ucrt-ruby$(RUBY_API_VER)
! else ! else
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
! endif ! endif
! endif # CPU ! endif # CPU
! endif # RUBY_INSTALL_NAME ! endif # RUBY_INSTALL_NAME
! else # $(RUBY_VER) >= 18
! ifndef RUBY_PLATFORM
RUBY_PLATFORM = i586-mswin32
! endif
! ifndef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
! endif
! endif # $(RUBY_VER) >= 18
! message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" ! message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
CFLAGS = $(CFLAGS) -DFEAT_RUBY CFLAGS = $(CFLAGS) -DFEAT_RUBY
RUBY_OBJ = $(OUTDIR)\if_ruby.obj RUBY_OBJ = $(OUTDIR)\if_ruby.obj
! if $(RUBY_VER) >= 19
RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
! else
RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
! endif
RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib
# Do we want to load Ruby dynamically? # Do we want to load Ruby dynamically?
! if "$(DYNAMIC_RUBY)" == "yes" ! if "$(DYNAMIC_RUBY)" == "yes"

8
src/auto/configure vendored
View File

@@ -7639,7 +7639,7 @@ fi
if test "X$vi_cv_path_ruby" != "X"; then if test "X$vi_cv_path_ruby" != "X"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5
$as_echo_n "checking Ruby version... " >&6; } $as_echo_n "checking Ruby version... " >&6; }
if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then if $vi_cv_path_ruby -e 'RUBY_VERSION >= "1.9.1" or exit 1' >/dev/null 2>/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
$as_echo "OK" >&6; } $as_echo "OK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5
@@ -7663,7 +7663,7 @@ $as_echo "$rubyhdrdir" >&6; }
fi fi
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"` rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
if test "X$rubyversion" = "X"; then if test "X$rubyversion" = "X"; then
rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[0,2]"` rubyversion=`$vi_cv_path_ruby -e "print RUBY_VERSION.gsub(/\./, '')[0,2]"`
fi fi
RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"` rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"`
@@ -7715,8 +7715,8 @@ $as_echo "$rubyhdrdir" >&6; }
$as_echo "not found; disabling Ruby" >&6; } $as_echo "not found; disabling Ruby" >&6; }
fi fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.6.0 or later" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.9.1 or later" >&5
$as_echo "too old; need Ruby version 1.6.0 or later" >&6; } $as_echo "too old; need Ruby version 1.9.1 or later" >&6; }
fi fi
fi fi

6
src/configure.ac
View File

@@ -1990,7 +1990,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD) AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD)
if test "X$vi_cv_path_ruby" != "X"; then if test "X$vi_cv_path_ruby" != "X"; then
AC_MSG_CHECKING(Ruby version) AC_MSG_CHECKING(Ruby version)
if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then if $vi_cv_path_ruby -e 'RUBY_VERSION >= "1.9.1" or exit 1' >/dev/null 2>/dev/null; then
AC_MSG_RESULT(OK) AC_MSG_RESULT(OK)
AC_MSG_CHECKING(Ruby rbconfig) AC_MSG_CHECKING(Ruby rbconfig)
ruby_rbconfig="RbConfig" ruby_rbconfig="RbConfig"
@@ -2009,7 +2009,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
fi fi
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"` rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
if test "X$rubyversion" = "X"; then if test "X$rubyversion" = "X"; then
rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[[0,2]]"` rubyversion=`$vi_cv_path_ruby -e "print RUBY_VERSION.gsub(/\./, '')[[0,2]]"`
fi fi
RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"` rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"`
@@ -2062,7 +2062,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
AC_MSG_RESULT(not found; disabling Ruby) AC_MSG_RESULT(not found; disabling Ruby)
fi fi
else else
AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later) AC_MSG_RESULT(too old; need Ruby version 1.9.1 or later)
fi fi
fi fi

249
src/if_ruby.c
View File

@@ -20,10 +20,8 @@
#include <string.h> #include <string.h>
#ifdef _WIN32 #ifdef _WIN32
# if !defined(DYNAMIC_RUBY) || (RUBY_VERSION < 18)
# define NT
# endif
# ifndef DYNAMIC_RUBY # ifndef DYNAMIC_RUBY
# define NT
# define IMPORT // For static dll usage __declspec(dllimport) # define IMPORT // For static dll usage __declspec(dllimport)
# define RUBYEXTERN __declspec(dllimport) # define RUBYEXTERN __declspec(dllimport)
# endif # endif
@@ -55,28 +53,24 @@
# define rb_cSymbol (*dll_rb_cSymbol) # define rb_cSymbol (*dll_rb_cSymbol)
# define rb_cTrueClass (*dll_rb_cTrueClass) # define rb_cTrueClass (*dll_rb_cTrueClass)
# if RUBY_VERSION >= 18
/* /*
* On ver 1.8, all Ruby functions are exported with "__declspec(dllimport)" * All Ruby functions are exported with "__declspec(dllimport)" in ruby.h.
* in ruby.h. But it causes trouble for these variables, because it is * But it causes trouble for these variables, because it is defined in this
* defined in this file. When defined this RUBY_EXPORT it modified to * file. When defined this RUBY_EXPORT it modified to "extern" and be able
* "extern" and be able to avoid this problem. * to avoid this problem.
*/ */
# define RUBY_EXPORT # define RUBY_EXPORT
# endif
# if RUBY_VERSION >= 19
// Ruby 1.9 defines a number of static functions which use rb_num2long and // Ruby 1.9 defines a number of static functions which use rb_num2long and
// rb_int2big // rb_int2big
# define rb_num2long rb_num2long_stub # define rb_num2long rb_num2long_stub
# define rb_int2big rb_int2big_stub # define rb_int2big rb_int2big_stub
# if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG # if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
// Ruby 1.9 defines a number of static functions which use rb_fix2int and // Ruby 1.9 defines a number of static functions which use rb_fix2int and
// rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit) // rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit)
# define rb_fix2int rb_fix2int_stub # define rb_fix2int rb_fix2int_stub
# define rb_num2int rb_num2int_stub # define rb_num2int rb_num2int_stub
# endif
# endif # endif
# if RUBY_VERSION == 21 # if RUBY_VERSION == 21
@@ -114,12 +108,7 @@
#endif #endif
#include <ruby.h> #include <ruby.h>
#if RUBY_VERSION >= 19 #include <ruby/encoding.h>
# include <ruby/encoding.h>
#endif
#if RUBY_VERSION <= 18
# include <st.h> // for ST_STOP and ST_CONTINUE
#endif
// See above. // See above.
#ifdef SIZEOF_TIME_T #ifdef SIZEOF_TIME_T
@@ -224,10 +213,8 @@ static void ruby_io_init(void);
static void ruby_vim_init(void); static void ruby_vim_init(void);
static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv); static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
#if (RUBY_VERSION >= 19) || defined(RUBY_INIT_STACK) #if defined(__ia64) && !defined(ruby_init_stack)
# if defined(__ia64) && !defined(ruby_init_stack) # define ruby_init_stack(addr) ruby_init_stack((addr), rb_ia64_bsp())
# define ruby_init_stack(addr) ruby_init_stack((addr), rb_ia64_bsp())
# endif
#endif #endif
#if defined(DYNAMIC_RUBY) || defined(PROTO) #if defined(DYNAMIC_RUBY) || defined(PROTO)
@@ -298,10 +285,6 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
# define rb_intern dll_rb_intern # define rb_intern dll_rb_intern
# if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only # if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only
# if RUBY_VERSION <= 18
# define rb_fix2int dll_rb_fix2int
# define rb_num2int dll_rb_num2int
# endif
# if RUBY_VERSION < 30 # if RUBY_VERSION < 30
# define rb_num2uint dll_rb_num2uint # define rb_num2uint dll_rb_num2uint
# endif # endif
@@ -311,10 +294,7 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
# define rb_lastline_set dll_rb_lastline_set # define rb_lastline_set dll_rb_lastline_set
# define rb_protect dll_rb_protect # define rb_protect dll_rb_protect
# define rb_load dll_rb_load # define rb_load dll_rb_load
# if RUBY_VERSION <= 18 # if RUBY_VERSION < 20
# define rb_num2long dll_rb_num2long
# endif
# if RUBY_VERSION <= 19
# define rb_num2ulong dll_rb_num2ulong # define rb_num2ulong dll_rb_num2ulong
# endif # endif
# define rb_obj_alloc dll_rb_obj_alloc # define rb_obj_alloc dll_rb_obj_alloc
@@ -335,57 +315,39 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
# else # else
# define rb_str_new2 dll_rb_str_new2 # define rb_str_new2 dll_rb_str_new2
# endif # endif
# if RUBY_VERSION >= 18 # define rb_string_value dll_rb_string_value
# define rb_string_value dll_rb_string_value # define rb_string_value_ptr dll_rb_string_value_ptr
# define rb_string_value_ptr dll_rb_string_value_ptr # define rb_float_new dll_rb_float_new
# define rb_float_new dll_rb_float_new # define rb_ary_new dll_rb_ary_new
# define rb_ary_new dll_rb_ary_new # ifdef rb_ary_new4
# ifdef rb_ary_new4 # define RB_ARY_NEW4_MACRO 1
# define RB_ARY_NEW4_MACRO 1 # undef rb_ary_new4
# undef rb_ary_new4
# endif
# define rb_ary_new4 dll_rb_ary_new4
# define rb_ary_push dll_rb_ary_push
# if (RUBY_VERSION >= 19) || defined(RUBY_INIT_STACK)
# ifdef __ia64
# define rb_ia64_bsp dll_rb_ia64_bsp
# undef ruby_init_stack
# define ruby_init_stack(addr) dll_ruby_init_stack((addr), rb_ia64_bsp())
# else
# define ruby_init_stack dll_ruby_init_stack
# endif
# endif
# else
# define rb_str2cstr dll_rb_str2cstr
# endif # endif
# if RUBY_VERSION >= 19 # define rb_ary_new4 dll_rb_ary_new4
# define rb_errinfo dll_rb_errinfo # define rb_ary_push dll_rb_ary_push
# ifdef __ia64
# define rb_ia64_bsp dll_rb_ia64_bsp
# undef ruby_init_stack
# define ruby_init_stack(addr) dll_ruby_init_stack((addr), rb_ia64_bsp())
# else # else
# define ruby_errinfo (*dll_ruby_errinfo) # define ruby_init_stack dll_ruby_init_stack
# endif # endif
# define rb_errinfo dll_rb_errinfo
# define ruby_init dll_ruby_init # define ruby_init dll_ruby_init
# define ruby_init_loadpath dll_ruby_init_loadpath # define ruby_init_loadpath dll_ruby_init_loadpath
# ifdef MSWIN # ifdef MSWIN
# if RUBY_VERSION >= 19 # define ruby_sysinit dll_ruby_sysinit
# define ruby_sysinit dll_ruby_sysinit # define rb_w32_snprintf dll_rb_w32_snprintf
# else
# define NtInitialize dll_NtInitialize
# endif
# if RUBY_VERSION >= 18
# define rb_w32_snprintf dll_rb_w32_snprintf
# endif
# endif # endif
# if RUBY_VERSION >= 19 # define ruby_script dll_ruby_script
# define ruby_script dll_ruby_script # define rb_enc_find_index dll_rb_enc_find_index
# define rb_enc_find_index dll_rb_enc_find_index # define rb_enc_find dll_rb_enc_find
# define rb_enc_find dll_rb_enc_find # undef rb_enc_str_new
# undef rb_enc_str_new # define rb_enc_str_new dll_rb_enc_str_new
# define rb_enc_str_new dll_rb_enc_str_new # define rb_sprintf dll_rb_sprintf
# define rb_sprintf dll_rb_sprintf # define rb_require dll_rb_require
# define rb_require dll_rb_require # define ruby_options dll_ruby_options
# define ruby_options dll_ruby_options
# endif
/* /*
* Pointers for dynamic link * Pointers for dynamic link
@@ -465,11 +427,7 @@ static VALUE (*dll_rb_obj_alloc) (VALUE);
static VALUE (*dll_rb_obj_as_string) (VALUE); static VALUE (*dll_rb_obj_as_string) (VALUE);
static VALUE (*dll_rb_obj_id) (VALUE); static VALUE (*dll_rb_obj_id) (VALUE);
static void (*dll_rb_raise) (VALUE, const char*, ...); static void (*dll_rb_raise) (VALUE, const char*, ...);
# if RUBY_VERSION >= 18
static VALUE (*dll_rb_string_value) (volatile VALUE*); static VALUE (*dll_rb_string_value) (volatile VALUE*);
# else
static char *(*dll_rb_str2cstr) (VALUE,int*);
# endif
static VALUE (*dll_rb_str_cat) (VALUE, const char*, long); static VALUE (*dll_rb_str_cat) (VALUE, const char*, long);
static VALUE (*dll_rb_str_concat) (VALUE, VALUE); static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
static VALUE (*dll_rb_str_new) (const char*, long); static VALUE (*dll_rb_str_new) (const char*, long);
@@ -479,22 +437,12 @@ static VALUE (*dll_rb_str_new_cstr) (const char*);
# else # else
static VALUE (*dll_rb_str_new2) (const char*); static VALUE (*dll_rb_str_new2) (const char*);
# endif # endif
# if RUBY_VERSION >= 19
static VALUE (*dll_rb_errinfo) (void); static VALUE (*dll_rb_errinfo) (void);
# else
static VALUE *dll_ruby_errinfo;
# endif
static void (*dll_ruby_init) (void); static void (*dll_ruby_init) (void);
static void (*dll_ruby_init_loadpath) (void); static void (*dll_ruby_init_loadpath) (void);
# ifdef MSWIN # ifdef MSWIN
# if RUBY_VERSION >= 19
static void (*dll_ruby_sysinit) (int*, char***); static void (*dll_ruby_sysinit) (int*, char***);
# else
static void (*dll_NtInitialize) (int*, char***);
# endif
# if RUBY_VERSION >= 18
static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...); static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
# endif
# endif # endif
# if RUBY_VERSION >= 31 # if RUBY_VERSION >= 31
# ifdef _MSC_VER # ifdef _MSC_VER
@@ -503,29 +451,22 @@ static void (*dll_rb_unexpected_type) (VALUE, int);
NORETURN(static void (*dll_rb_unexpected_type) (VALUE, int)); NORETURN(static void (*dll_rb_unexpected_type) (VALUE, int));
# endif # endif
# endif # endif
# if RUBY_VERSION >= 18
static char * (*dll_rb_string_value_ptr) (volatile VALUE*); static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
static VALUE (*dll_rb_float_new) (double); static VALUE (*dll_rb_float_new) (double);
static VALUE (*dll_rb_ary_new) (void); static VALUE (*dll_rb_ary_new) (void);
static VALUE (*dll_rb_ary_new4) (long n, const VALUE *elts); static VALUE (*dll_rb_ary_new4) (long n, const VALUE *elts);
static VALUE (*dll_rb_ary_push) (VALUE, VALUE); static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
# if RUBY_VERSION >= 26 # if RUBY_VERSION >= 26
static void (*dll_rb_ary_detransient) (VALUE); static void (*dll_rb_ary_detransient) (VALUE);
# endif # endif
# if (RUBY_VERSION >= 19) || defined(RUBY_INIT_STACK) # ifdef __ia64
# ifdef __ia64
static void * (*dll_rb_ia64_bsp) (void); static void * (*dll_rb_ia64_bsp) (void);
static void (*dll_ruby_init_stack)(VALUE*, void*); static void (*dll_ruby_init_stack)(VALUE*, void*);
# else # else
static void (*dll_ruby_init_stack)(VALUE*); static void (*dll_ruby_init_stack)(VALUE*);
# endif
# endif
# endif # endif
# if RUBY_VERSION >= 19
static VALUE (*dll_rb_int2big)(SIGNED_VALUE); static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
# endif
# if RUBY_VERSION >= 19
static void (*dll_ruby_script) (const char*); static void (*dll_ruby_script) (const char*);
static int (*dll_rb_enc_find_index) (const char*); static int (*dll_rb_enc_find_index) (const char*);
static rb_encoding* (*dll_rb_enc_find) (const char*); static rb_encoding* (*dll_rb_enc_find) (const char*);
@@ -533,7 +474,6 @@ static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
static VALUE (*dll_rb_sprintf) (const char*, ...); static VALUE (*dll_rb_sprintf) (const char*, ...);
static VALUE (*dll_rb_require) (const char*); static VALUE (*dll_rb_require) (const char*);
static void* (*dll_ruby_options)(int, char**); static void* (*dll_ruby_options)(int, char**);
# endif
# if defined(USE_RGENGC) && USE_RGENGC # if defined(USE_RGENGC) && USE_RGENGC
# if RUBY_VERSION == 21 # if RUBY_VERSION == 21
@@ -557,28 +497,27 @@ void rb_ary_detransient_stub(VALUE x);
// Do not generate a prototype here, VALUE isn't always defined. // Do not generate a prototype here, VALUE isn't always defined.
# ifndef PROTO # ifndef PROTO
# if RUBY_VERSION >= 19 # if RUBY_VERSION >= 22
# if RUBY_VERSION >= 22
long long
rb_num2long_stub(VALUE x) rb_num2long_stub(VALUE x)
# else # else
SIGNED_VALUE SIGNED_VALUE
rb_num2long_stub(VALUE x) rb_num2long_stub(VALUE x)
# endif # endif
{ {
return dll_rb_num2long(x); return dll_rb_num2long(x);
} }
# if RUBY_VERSION >= 26 # if RUBY_VERSION >= 26
VALUE VALUE
rb_int2big_stub(intptr_t x) rb_int2big_stub(intptr_t x)
# else # else
VALUE VALUE
rb_int2big_stub(SIGNED_VALUE x) rb_int2big_stub(SIGNED_VALUE x)
# endif # endif
{ {
return dll_rb_int2big(x); return dll_rb_int2big(x);
} }
# if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG # if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
long long
rb_fix2int_stub(VALUE x) rb_fix2int_stub(VALUE x)
{ {
@@ -589,24 +528,23 @@ rb_num2int_stub(VALUE x)
{ {
return dll_rb_num2int(x); return dll_rb_num2int(x);
} }
# endif # endif
# if RUBY_VERSION >= 20 # if RUBY_VERSION >= 20
VALUE VALUE
rb_float_new_in_heap(double d) rb_float_new_in_heap(double d)
{ {
return dll_rb_float_new(d); return dll_rb_float_new(d);
} }
# if RUBY_VERSION >= 22 # if RUBY_VERSION >= 22
unsigned long unsigned long
rb_num2ulong(VALUE x) rb_num2ulong(VALUE x)
# else # else
VALUE VALUE
rb_num2ulong(VALUE x) rb_num2ulong(VALUE x)
# endif # endif
{ {
return (long)RSHIFT((SIGNED_VALUE)(x),1); return (long)RSHIFT((SIGNED_VALUE)(x),1);
} }
# endif
# endif # endif
# if defined(USE_RGENGC) && USE_RGENGC # if defined(USE_RGENGC) && USE_RGENGC
# if RUBY_VERSION == 21 # if RUBY_VERSION == 21
@@ -748,11 +686,7 @@ static struct
{"rb_obj_as_string", (RUBY_PROC*)&dll_rb_obj_as_string}, {"rb_obj_as_string", (RUBY_PROC*)&dll_rb_obj_as_string},
{"rb_obj_id", (RUBY_PROC*)&dll_rb_obj_id}, {"rb_obj_id", (RUBY_PROC*)&dll_rb_obj_id},
{"rb_raise", (RUBY_PROC*)&dll_rb_raise}, {"rb_raise", (RUBY_PROC*)&dll_rb_raise},
# if RUBY_VERSION >= 18
{"rb_string_value", (RUBY_PROC*)&dll_rb_string_value}, {"rb_string_value", (RUBY_PROC*)&dll_rb_string_value},
# else
{"rb_str2cstr", (RUBY_PROC*)&dll_rb_str2cstr},
# endif
{"rb_str_cat", (RUBY_PROC*)&dll_rb_str_cat}, {"rb_str_cat", (RUBY_PROC*)&dll_rb_str_cat},
{"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat}, {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
{"rb_str_new", (RUBY_PROC*)&dll_rb_str_new}, {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
@@ -761,45 +695,32 @@ static struct
# else # else
{"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2}, {"rb_str_new2", (RUBY_PROC*)&dll_rb_str_new2},
# endif # endif
# if RUBY_VERSION >= 19
{"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo}, {"rb_errinfo", (RUBY_PROC*)&dll_rb_errinfo},
# else
{"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
# endif
{"ruby_init", (RUBY_PROC*)&dll_ruby_init}, {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath}, {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
# ifdef MSWIN # ifdef MSWIN
# if RUBY_VERSION >= 19
{"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit}, {"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
# else
{"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
# endif
# if RUBY_VERSION >= 18
{"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf}, {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
# endif
# endif # endif
# if RUBY_VERSION >= 31 # if RUBY_VERSION >= 31
{"rb_unexpected_type", (RUBY_PROC*)&dll_rb_unexpected_type}, {"rb_unexpected_type", (RUBY_PROC*)&dll_rb_unexpected_type},
# endif # endif
# if RUBY_VERSION >= 18
{"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr}, {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
# if RUBY_VERSION <= 19 # if RUBY_VERSION >= 20
{"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
# else
{"rb_float_new_in_heap", (RUBY_PROC*)&dll_rb_float_new}, {"rb_float_new_in_heap", (RUBY_PROC*)&dll_rb_float_new},
# endif # else
{"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new}, {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
# ifdef RB_ARY_NEW4_MACRO # endif
{"rb_ary_new_from_values", (RUBY_PROC*)&dll_rb_ary_new4}, {"rb_ary_new", (RUBY_PROC*)&dll_rb_ary_new},
# else # ifdef RB_ARY_NEW4_MACRO
{"rb_ary_new4", (RUBY_PROC*)&dll_rb_ary_new4}, {"rb_ary_new_from_values", (RUBY_PROC*)&dll_rb_ary_new4},
# endif # else
{"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push}, {"rb_ary_new4", (RUBY_PROC*)&dll_rb_ary_new4},
# if RUBY_VERSION >= 26 # endif
{"rb_ary_detransient", (RUBY_PROC*)&dll_rb_ary_detransient}, {"rb_ary_push", (RUBY_PROC*)&dll_rb_ary_push},
# endif # if RUBY_VERSION >= 26
{"rb_ary_detransient", (RUBY_PROC*)&dll_rb_ary_detransient},
# endif # endif
# if RUBY_VERSION >= 19
{"rb_int2big", (RUBY_PROC*)&dll_rb_int2big}, {"rb_int2big", (RUBY_PROC*)&dll_rb_int2big},
{"ruby_script", (RUBY_PROC*)&dll_ruby_script}, {"ruby_script", (RUBY_PROC*)&dll_ruby_script},
{"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index}, {"rb_enc_find_index", (RUBY_PROC*)&dll_rb_enc_find_index},
@@ -808,13 +729,10 @@ static struct
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf}, {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
{"rb_require", (RUBY_PROC*)&dll_rb_require}, {"rb_require", (RUBY_PROC*)&dll_rb_require},
{"ruby_options", (RUBY_PROC*)&dll_ruby_options}, {"ruby_options", (RUBY_PROC*)&dll_ruby_options},
# endif # ifdef __ia64
# if (RUBY_VERSION >= 19) || defined(RUBY_INIT_STACK)
# ifdef __ia64
{"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp}, {"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
# endif
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
# endif # endif
{"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
# if defined(USE_RGENGC) && USE_RGENGC # if defined(USE_RGENGC) && USE_RGENGC
# if RUBY_VERSION == 21 # if RUBY_VERSION == 21
{"rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted}, {"rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted},
@@ -906,7 +824,6 @@ ex_ruby(exarg_T *eap)
static VALUE static VALUE
vim_str2rb_enc_str(const char *s) vim_str2rb_enc_str(const char *s)
{ {
#if RUBY_VERSION >= 19
long lval; long lval;
char_u *sval; char_u *sval;
rb_encoding *enc; rb_encoding *enc;
@@ -918,14 +835,12 @@ vim_str2rb_enc_str(const char *s)
if (enc) if (enc)
return rb_enc_str_new(s, (long)strlen(s), enc); return rb_enc_str_new(s, (long)strlen(s), enc);
} }
#endif
return rb_str_new2(s); return rb_str_new2(s);
} }
static VALUE static VALUE
eval_enc_string_protect(const char *str, int *state) eval_enc_string_protect(const char *str, int *state)
{ {
#if RUBY_VERSION >= 19
long lval; long lval;
char_u *sval; char_u *sval;
rb_encoding *enc; rb_encoding *enc;
@@ -941,7 +856,6 @@ eval_enc_string_protect(const char *str, int *state)
return rb_eval_string_protect(StringValuePtr(v), state); return rb_eval_string_protect(StringValuePtr(v), state);
} }
} }
#endif
return rb_eval_string_protect(str, state); return rb_eval_string_protect(str, state);
} }
@@ -1040,40 +954,30 @@ ensure_ruby_initialized(void)
{ {
#ifdef DYNAMIC_RUBY #ifdef DYNAMIC_RUBY
if (ruby_enabled(TRUE)) if (ruby_enabled(TRUE))
{
#endif #endif
{
#ifdef MSWIN #ifdef MSWIN
// suggested by Ariya Mizutani // suggested by Ariya Mizutani
int argc = 1; int argc = 1;
char *argv[] = {"gvim.exe"}; char *argv[] = {"gvim.exe"};
char **argvp = argv; char **argvp = argv;
# if RUBY_VERSION >= 19
ruby_sysinit(&argc, &argvp); ruby_sysinit(&argc, &argvp);
# else
NtInitialize(&argc, &argvp);
# endif
#endif #endif
{ {
#if (RUBY_VERSION >= 19) || defined(RUBY_INIT_STACK)
ruby_init_stack(ruby_stack_start); ruby_init_stack(ruby_stack_start);
#endif
ruby_init(); ruby_init();
} }
#if RUBY_VERSION >= 19
{ {
int dummy_argc = 2; int dummy_argc = 2;
char *dummy_argv[] = {"vim-ruby", "-e_=0"}; char *dummy_argv[] = {"vim-ruby", "-e_=0"};
ruby_options(dummy_argc, dummy_argv); ruby_options(dummy_argc, dummy_argv);
} }
ruby_script("vim-ruby"); ruby_script("vim-ruby");
#else
ruby_init_loadpath();
#endif
ruby_io_init(); ruby_io_init();
ruby_vim_init(); ruby_vim_init();
ruby_initialized = 1; ruby_initialized = 1;
#ifdef DYNAMIC_RUBY
} }
#ifdef DYNAMIC_RUBY
else else
{ {
emsg(_(e_sorry_this_command_is_disabled_the_ruby_library_could_not_be_loaded)); emsg(_(e_sorry_this_command_is_disabled_the_ruby_library_could_not_be_loaded));
@@ -1087,9 +991,6 @@ ensure_ruby_initialized(void)
static void static void
error_print(int state) error_print(int state)
{ {
#if !defined(DYNAMIC_RUBY) && (RUBY_VERSION <= 18)
RUBYEXTERN VALUE ruby_errinfo;
#endif
VALUE error; VALUE error;
VALUE eclass; VALUE eclass;
VALUE einfo; VALUE einfo;
@@ -1127,11 +1028,7 @@ error_print(int state)
break; break;
case TAG_RAISE: case TAG_RAISE:
case TAG_FATAL: case TAG_FATAL:
#if RUBY_VERSION >= 19
error = rb_errinfo(); error = rb_errinfo();
#else
error = ruby_errinfo;
#endif
eclass = CLASS_OF(error); eclass = CLASS_OF(error);
einfo = rb_obj_as_string(error); einfo = rb_obj_as_string(error);
if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0)

2
src/version.c
View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
546,
/**/ /**/
545, 545,
/**/ /**/