merge revision(s) r44042,44045:

	* test/ruby/test_struct.rb: Add regression test for question marks and
	  bangs in struct members. [Closes GH-468]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ad4799073..aee5139145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 15 23:42:04 2014  Richo Healy  <richo@psych0tik.net>
+
+	* test/ruby/test_struct.rb: Add regression test for question marks and
+	  bangs in struct members. [Closes GH-468]
+
 Sat Feb 15 23:26:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* struct.c (new_struct): fix warning message, class name and encoding.
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index 404e1a2545..19e6056c82 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -314,6 +314,18 @@ module TestStruct
     assert_include(klass.new.methods.inspect, ':a?', bug9248)
   end
 
+  def test_question_mark_in_member
+    klass = @Struct.new(:a, :b?)
+    o = klass.new("test", true)
+    assert_predicate(o, :b?)
+  end
+
+  def test_bang_mark_in_member
+    klass = @Struct.new(:a, :b!)
+    o = klass.new("test", true)
+    assert_predicate(o, :b!)
+  end
+
   class TopStruct < Test::Unit::TestCase
     include TestStruct
 
diff --git a/version.h b/version.h
index d27c3fcf42..4cc90d7483 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-02-15"
-#define RUBY_PATCHLEVEL 407
+#define RUBY_PATCHLEVEL 408
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2