From 2bb6fcb6fd216cb32c4997f0a5793e51e75360bd Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Sep 2011 14:42:44 +0000
Subject: [PATCH] * lib/rexml/parsers/baseparser.rb,
 test/rexml/test_comment.rb:   allow a single hyphen in comment. [Bug 5278]  
 Reported by Thomas Fritzsche. Thanks!!!

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       |  6 ++++++
 lib/rexml/parsers/baseparser.rb |  2 +-
 test/rexml/test_comment.rb      | 25 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/rexml/test_comment.rb

diff --git a/ChangeLog b/ChangeLog
index 5a1e4c0849..85fe7fb362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep  7 23:41:24 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb, test/rexml/test_comment.rb:
+	  allow a single hyphen in comment. [Bug 5278]
+	  Reported by Thomas Fritzsche. Thanks!!!
+
 Wed Sep  7 17:27:18 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index 0f1480b07d..6cddf6fc2c 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -346,7 +346,7 @@ module REXML
                 md = @source.match( COMMENT_PATTERN, true )
 
                 case md[1]
-                when /--/, /-$/
+                when /--/, /-\z/
                   raise REXML::ParseException.new("Malformed comment", @source)
                 end
 
diff --git a/test/rexml/test_comment.rb b/test/rexml/test_comment.rb
new file mode 100644
index 0000000000..ebe3eead8d
--- /dev/null
+++ b/test/rexml/test_comment.rb
@@ -0,0 +1,25 @@
+require "test/unit/testcase"
+
+require 'rexml/document'
+
+module REXMLTest
+  class CommentTester < Test::Unit::TestCase
+    # Bug #5278
+    def test_hyphen_end_line_in_doctype
+      xml = <<-XML
+<?xml version="1.0"?>
+<!DOCTYPE root [
+<!-- comment end with hyphen -
+     here -->
+]>
+<root/>
+      XML
+      document = REXML::Document.new(xml)
+      comments = document.doctype.children.find_all do |child|
+        child.is_a?(REXML::Comment)
+      end
+      assert_equal([" comment end with hyphen -\n     here "],
+                   comments.collect(&:to_s))
+    end
+  end
+end