From fffc133db1c5d6b4309f80ed28e7e7364ac90801 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 23 Jul 2017 07:50:10 +0000
Subject: [PATCH] merge revision(s) 57530: [Backport #13191]

	sample/pty/shl.rb: update sample

	* Specify frozen_string_literal: true.
	* Fix TypeError of raise.
	* Use a character literal instead of Integer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 sample/pty/shl.rb | 7 ++++---
 version.h         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sample/pty/shl.rb b/sample/pty/shl.rb
index 7bddf7c1ac..980748e8f5 100644
--- a/sample/pty/shl.rb
+++ b/sample/pty/shl.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 #  old-fashioned 'shl' like program
 #  by A. Ito
@@ -22,15 +23,15 @@ def writer
   begin
     while true
       c = STDIN.getc
-      if c == 26 then # C-z
-        $reader.raise(nil)
+      if c == ?\C-z then
+        $reader.raise('Suspend')
         return 'Suspend'
       end
       $w_pty.print c.chr
       $w_pty.flush
     end
   rescue
-    $reader.raise(nil)
+    $reader.raise('Exit')
     return 'Exit'
   ensure
     STDIN.cooked!
diff --git a/version.h b/version.h
index 9a6a4d884e..6068ea2dd8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-07-23"
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 7