From d1fff7536d914f296e79e669a4d7fc03ba6a3ecd Mon Sep 17 00:00:00 2001
From: Jordan Sissel <jls@semicomplete.com>
Date: Tue, 18 Jun 2013 18:39:11 -0700
Subject: [PATCH] - permit comments to have no content following them.

---
 lib/logstash/config/grammar.rb      | 7 +------
 lib/logstash/config/grammar.treetop | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/logstash/config/grammar.rb b/lib/logstash/config/grammar.rb
index bb4750eb1..1ac2ed6eb 100644
--- a/lib/logstash/config/grammar.rb
+++ b/lib/logstash/config/grammar.rb
@@ -152,12 +152,7 @@ module LogStashConfig
               break
             end
           end
-          if s5.empty?
-            @index = i5
-            r5 = nil
-          else
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          end
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
           s1 << r5
           if r5
             if has_terminal?("\r", false, index)
diff --git a/lib/logstash/config/grammar.treetop b/lib/logstash/config/grammar.treetop
index d113f9998..a47c10558 100644
--- a/lib/logstash/config/grammar.treetop
+++ b/lib/logstash/config/grammar.treetop
@@ -7,7 +7,7 @@ grammar LogStashConfig
   end
 
   rule comment
-    (whitespace? "#" [^\r\n]+ "\r"? "\n")+ <LogStash::Config::AST::Comment>
+    (whitespace? "#" [^\r\n]* "\r"? "\n")+ <LogStash::Config::AST::Comment>
   end
 
   rule _