mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7b5fb62bee
commit
1102fd2f3e
4 changed files with 11 additions and 11 deletions
|
@ -53,7 +53,7 @@ target_cpu=x64
|
||||||
|
|
||||||
AC_DEFUN([RUBY_NACL],
|
AC_DEFUN([RUBY_NACL],
|
||||||
[
|
[
|
||||||
AS_CASE(["${host_os}"],
|
AS_CASE(["${host_os}"],
|
||||||
[nacl], [
|
[nacl], [
|
||||||
ac_cv_exeext=.nexe
|
ac_cv_exeext=.nexe
|
||||||
host_vendor=chromium
|
host_vendor=chromium
|
||||||
|
@ -2462,7 +2462,7 @@ if test x"$cross_compiling" = xyes; then
|
||||||
XRUBY='$(MINIRUBY)'
|
XRUBY='$(MINIRUBY)'
|
||||||
TEST_RUNNABLE=no
|
TEST_RUNNABLE=no
|
||||||
|
|
||||||
if test "$host_os" = "nacl"; then
|
if test "$host_os" = "nacl"; then
|
||||||
if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then
|
if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then
|
||||||
nacl_cv_sel_ldr='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb sel_ldr`'
|
nacl_cv_sel_ldr='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb sel_ldr`'
|
||||||
nacl_cv_irt_core='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb irt_core`'
|
nacl_cv_irt_core='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb irt_core`'
|
||||||
|
|
12
encoding.c
12
encoding.c
|
@ -1792,15 +1792,15 @@ rb_enc_aliases(VALUE klass)
|
||||||
* output to ISO-8859-1 encoding, then read back in and transcoded to UTF-8:
|
* output to ISO-8859-1 encoding, then read back in and transcoded to UTF-8:
|
||||||
*
|
*
|
||||||
* string = "R\u00E9sum\u00E9"
|
* string = "R\u00E9sum\u00E9"
|
||||||
*
|
*
|
||||||
* open("transcoded.txt", "w:ISO-8859-1") do |io|
|
* open("transcoded.txt", "w:ISO-8859-1") do |io|
|
||||||
* io.write(string)
|
* io.write(string)
|
||||||
* end
|
* end
|
||||||
*
|
*
|
||||||
* puts "raw text:"
|
* puts "raw text:"
|
||||||
* p File.binread("transcoded.txt")
|
* p File.binread("transcoded.txt")
|
||||||
* puts
|
* puts
|
||||||
*
|
*
|
||||||
* open("transcoded.txt", "r:ISO-8859-1:UTF-8") do |io|
|
* open("transcoded.txt", "r:ISO-8859-1:UTF-8") do |io|
|
||||||
* puts "transcoded text:"
|
* puts "transcoded text:"
|
||||||
* p io.read
|
* p io.read
|
||||||
|
@ -1809,14 +1809,14 @@ rb_enc_aliases(VALUE klass)
|
||||||
* While writing the file, the internal encoding is not specified as it is
|
* While writing the file, the internal encoding is not specified as it is
|
||||||
* only necessary for reading. While reading the file both the internal and
|
* only necessary for reading. While reading the file both the internal and
|
||||||
* external encoding must be specified to obtain the correct result.
|
* external encoding must be specified to obtain the correct result.
|
||||||
*
|
*
|
||||||
* $ ruby t.rb
|
* $ ruby t.rb
|
||||||
* raw text:
|
* raw text:
|
||||||
* "R\xE9sum\xE9"
|
* "R\xE9sum\xE9"
|
||||||
*
|
*
|
||||||
* transcoded text:
|
* transcoded text:
|
||||||
* "R\u00E9sum\u00E9"
|
* "R\u00E9sum\u00E9"
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -2630,7 +2630,7 @@ rb_exec(const struct rb_exec_arg *e)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
fprintf(stderr, "%s:%d: command not found: %s\n",
|
fprintf(stderr, "%s:%d: command not found: %s\n",
|
||||||
rb_sourcefile(), rb_sourceline(),
|
rb_sourcefile(), rb_sourceline(),
|
||||||
RSTRING_PTR(e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name));
|
RSTRING_PTR(e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -2784,7 +2784,7 @@ rb_fork_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALU
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* rb_protect() is required not only for non-NULL status
|
/* rb_protect() is required not only for non-NULL status
|
||||||
* but also for non-NULL chfunc because
|
* but also for non-NULL chfunc because
|
||||||
* ep[0] and ep[1] should be closed on exceptions.
|
* ep[0] and ep[1] should be closed on exceptions.
|
||||||
* If status is NULL, the catched exception is re-raised
|
* If status is NULL, the catched exception is re-raised
|
||||||
* by rb_jump_tag() below, after closing them. */
|
* by rb_jump_tag() below, after closing them. */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
|
||||||
vm_backtrace.c -
|
vm_backtrace.c -
|
||||||
|
|
||||||
$Author: ko1 $
|
$Author: ko1 $
|
||||||
created at: Sun Jun 03 00:14:20 2012
|
created at: Sun Jun 03 00:14:20 2012
|
||||||
|
|
Loading…
Reference in a new issue