Restore CParser hack.

lsegal · Oct 25, 2019 · 7bb63be · 7bb63be
1 parent dd550e7
commit 7bb63be
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/yard/parser/c/c_parser.rb b/lib/yard/parser/c/c_parser.rb
@@ -97,7 +97,14 @@ def consume_body_statements
           stmts = []
           brace_level = 1
           loop do
-            strip_non_statement_data
+            # Need to include the @! directive tags for them to be processed
+            # along with the body statement content.
+            # (At least the @!group directive.)
+            directive_tags = capture_directive_tags_hack do
+              strip_non_statement_data
+            end
+            stmts.concat(directive_tags)
+
             start = @index
             line = @line
             consume_until(/[{};]/)
@@ -115,6 +122,15 @@ def consume_body_statements
           stmts
         end
 
+        def capture_directive_tags_hack
+          temp = @statements.dup
+          yield if block_given?
+          stmts = (@statements - temp)
+          stmts.select do |stmt|
+            stmt.is_a?(Comment) && stmt.source.start_with?('@!')
+          end
+        end
+
         def strip_non_statement_data
           start = @index
           loop do

diff --git a/spec/parser/c_parser_spec.rb b/spec/parser/c_parser_spec.rb
@@ -130,7 +130,7 @@ def parse(contents)
         parse <<-eof
           void Init_Mask(void)
           {
-              rb_cExample  = rb_define_class("Example", rb_cObject);
+              rb_cExample = rb_define_class("Example", rb_cObject);
 
               // @!group Foos