From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1371346agb; Fri, 1 Jan 2010 12:47:12 -0800 (PST) Received: by 10.224.107.210 with SMTP id c18mr9864373qap.137.1262378831263; Fri, 01 Jan 2010 12:47:11 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 11si16427066qyk.78.2010.01.01.12.47.11; Fri, 01 Jan 2010 12:47:11 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id C5C0718582D0; Fri, 1 Jan 2010 15:47:10 -0500 (EST) Received: from magnesium.club.cc.cmu.edu (MAGNESIUM.CLUB.CC.cmu.edu [128.237.157.15]) by rubyforge.org (Postfix) with ESMTP id 7FC2A1858291 for ; Fri, 1 Jan 2010 15:47:01 -0500 (EST) Received: (qmail 642 invoked from network); 1 Jan 2010 20:47:01 -0000 Received: from pion.club.cc.cmu.edu (HELO localhost.localdomain) (128.237.157.88) by magnesium.club.cc.cmu.edu with SMTP; 1 Jan 2010 20:47:01 -0000 From: Rich Lane To: sup-devel@rubyforge.org Date: Fri, 1 Jan 2010 12:47:07 -0800 Message-Id: <1262378827-16722-1-git-send-email-rlane@club.cc.cmu.edu> X-Mailer: git-send-email 1.6.3.3 Subject: [sup-devel] [PATCH] ruby 1.9: use String#ord in ask_getch and ask_yes_or_no X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org In Ruby 1.9, character literals and the return value from string index accesses are now themselves strings and need to be converted to integers with String#ord. This was breaking ask_getch. Integer#ord is defined on Ruby 1.8 so this won't cause problems there. --- lib/sup/buffer.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb index 4498b08..c826ab9 100644 --- a/lib/sup/buffer.rb +++ b/lib/sup/buffer.rb @@ -611,7 +611,7 @@ EOS def ask_getch question, accept=nil raise "impossible!" if @asking - accept = accept.split(//).map { |x| x[0] } if accept + accept = accept.split(//).map { |x| x.ord } if accept status, title = get_status_and_title @focus_buf Ncurses.sync do @@ -647,7 +647,7 @@ EOS ## returns true (y), false (n), or nil (ctrl-g / cancel) def ask_yes_or_no question case(r = ask_getch question, "ynYN") - when ?y, ?Y + when ?y.ord, ?Y.ord true when nil nil -- 1.6.3.3 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel