[macruby-changes] [2110] MacRuby/branches/experimental
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 29 01:59:10 PDT 2009
Revision: 2110
http://trac.macosforge.org/projects/ruby/changeset/2110
Author: mattaimonetti at gmail.com
Date: 2009-07-29 01:59:10 -0700 (Wed, 29 Jul 2009)
Log Message:
-----------
fixed stringscanner specs for 1.9 and highlighted issues with the current encoding implementation
Modified Paths:
--------------
MacRuby/branches/experimental/lib/strscan.rb
MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb
MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/eucjp.rb
MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb
Modified: MacRuby/branches/experimental/lib/strscan.rb
===================================================================
--- MacRuby/branches/experimental/lib/strscan.rb 2009-07-29 05:45:17 UTC (rev 2109)
+++ MacRuby/branches/experimental/lib/strscan.rb 2009-07-29 08:59:10 UTC (rev 2110)
@@ -224,6 +224,8 @@
# s.get_byte # => nil
#
def get_byte
+ # temp hack
+ # TODO replace by a solution that will work with UTF-8
scan(/./mn)
end
@@ -636,6 +638,6 @@
end
getstr ? m : m.size
- end
+ end
end
\ No newline at end of file
Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb 2009-07-29 05:45:17 UTC (rev 2109)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb 2009-07-29 08:59:10 UTC (rev 2110)
@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
require File.dirname(__FILE__) + '/../../spec_helper'
require File.dirname(__FILE__) + '/shared/eucjp'
require 'strscan'
Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/eucjp.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/eucjp.rb 2009-07-29 05:45:17 UTC (rev 2109)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/eucjp.rb 2009-07-29 08:59:10 UTC (rev 2110)
@@ -3,4 +3,10 @@
def self.eucjp
@eucjp_str = "\244\242" # Japanese hira-kana "A"
end
+ def self.first_char
+ "\244"
+ end
+ def self.second_char
+ "\242"
+ end
end
\ No newline at end of file
Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb 2009-07-29 05:45:17 UTC (rev 2109)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb 2009-07-29 08:59:10 UTC (rev 2110)
@@ -1,3 +1,4 @@
+# encoding: UTF-8
require 'spec/frozen/library/stringscanner/shared/eucjp'
describe :strscan_get_byte, :shared => true do
@@ -11,18 +12,19 @@
end
it "is not multi-byte character sensitive" do
- s = StringScanner.new("\244\242")
- s.send(@method).should == "\244"
- s.send(@method).should == "\242"
+ s = StringScanner.new("あ")
+ s.send(@method).should == "\xE3"
+ s.send(@method).should == "\x81"
+ s.send(@method).should == "\x82"
s.send(@method).should == nil
end
it "is not multi-byte character sensitive and can handle encodings" do
s = StringScanner.new(TestStrings.eucjp)
- s.send(@method).should == "\244"
- s.send(@method).should == "\242"
+ s.send(@method).should == TestStrings.first_char
+ s.send(@method).should == TestStrings.second_char
s.send(@method).should == nil
- end
+ end
it "returns nil at the end of the string" do
# empty string case
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090729/df3d2fc7/attachment.html>
More information about the macruby-changes
mailing list