ceedling 1.1.1 → 1.1.2

data/spec/units/preprocess/preprocessinator_file_assembler_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe PreprocessinatorFileAssembler do
   # Use real ParsingParcels for _filter_conditionals and collect_file_contents_fallback tests
   let(:real_parsing_parcels) { ParsingParcels.new }
   let(:real_reconstructor) do
-    PreprocessinatorReconstructor.new({ parsing_parcels: real_parsing_parcels })
+    PreprocessinatorReconstructor.new({ parsing_parcels: real_parsing_parcels, file_wrapper: @file_wrapper })
   end
 
   before :each do
@@ -359,9 +359,12 @@ RSpec.describe PreprocessinatorFileAssembler do
 
     let(:preprocessed_filepath) { '/build/mocks/test_module/module.h' }
 
+    # Binary mode ('wb'): `contents` lines assembled into this file come from
+    # an upstream preprocessed file and must reach disk with their line
+    # endings unaltered, which text mode would not guarantee.
     def stub_file_write(filepath)
       output = StringIO.new
-      allow(@file_wrapper).to receive(:open).with(filepath, 'w').and_yield(output)
+      allow(@file_wrapper).to receive(:open).with(filepath, 'wb').and_yield(output)
       output
     end
 
@@ -413,6 +416,97 @@ RSpec.describe PreprocessinatorFileAssembler do
       expect(output.string).to include('void foo(void);')
     end
 
+    it 'opens its output file in binary mode' do
+      stub_file_write(preprocessed_filepath)
+
+      subject.assemble_preprocessed_header_file(
+        filename:              'module.h',
+        preprocessed_filepath: preprocessed_filepath,
+        contents:              [],
+        extras:                [],
+        includes:              []
+      )
+
+      expect(@file_wrapper).to have_received(:open).with(preprocessed_filepath, 'wb')
+    end
+
+    it "passes content lines through to the output file unchanged, including embedded CRLF" do
+      output = stub_file_write(preprocessed_filepath)
+      content_line_with_crlf = "void foo(void) {\r\n  return;\r\n}"
+
+      subject.assemble_preprocessed_header_file(
+        filename:              'module.h',
+        preprocessed_filepath: preprocessed_filepath,
+        contents:              [content_line_with_crlf],
+        extras:                [],
+        includes:              []
+      )
+
+      expect(output.string).to include(content_line_with_crlf)
+    end
+
+  end
+
+
+  # ===========================================================================
+  describe '#assemble_preprocessed_code_file' do
+  # ===========================================================================
+
+    let(:preprocessed_filepath) { '/build/test/preprocess/module.c' }
+
+    # Binary mode ('wb'): `contents` lines assembled into this file come from
+    # an upstream preprocessed file and must reach disk with their line
+    # endings unaltered, which text mode would not guarantee.
+    def stub_file_write(filepath)
+      output = StringIO.new
+      allow(@file_wrapper).to receive(:open).with(filepath, 'wb').and_yield(output)
+      output
+    end
+
+    it 'writes provided includes and contents to the output file' do
+      output = stub_file_write(preprocessed_filepath)
+
+      subject.assemble_preprocessed_code_file(
+        filename:              'module.c',
+        preprocessed_filepath: preprocessed_filepath,
+        contents:              ['void foo(void) {}'],
+        extras:                [],
+        includes:              ['#include "bar.h"']
+      )
+
+      expect(output.string).to include('#include "bar.h"')
+      expect(output.string).to include('void foo(void) {}')
+    end
+
+    it 'opens its output file in binary mode' do
+      stub_file_write(preprocessed_filepath)
+
+      subject.assemble_preprocessed_code_file(
+        filename:              'module.c',
+        preprocessed_filepath: preprocessed_filepath,
+        contents:              [],
+        extras:                [],
+        includes:              []
+      )
+
+      expect(@file_wrapper).to have_received(:open).with(preprocessed_filepath, 'wb')
+    end
+
+    it "passes content lines through to the output file unchanged, including embedded CRLF" do
+      output = stub_file_write(preprocessed_filepath)
+      content_line_with_crlf = "void foo(void) {\r\n  return;\r\n}"
+
+      subject.assemble_preprocessed_code_file(
+        filename:              'module.c',
+        preprocessed_filepath: preprocessed_filepath,
+        contents:              [content_line_with_crlf],
+        extras:                [],
+        includes:              []
+      )
+
+      expect(output.string).to include(content_line_with_crlf)
+    end
+
   end
 
 end

data/spec/units/preprocess/preprocessinator_reconstructor_spec.rb

@@ -12,9 +12,11 @@ require 'ceedling/parsing_parcels'
 describe PreprocessinatorReconstructor do
   before(:each) do
     @parsing_parcels = ParsingParcels.new()
+    @file_wrapper    = double( "FileWrapper" )
     @extractor = described_class.new(
       {
-        :parsing_parcels => @parsing_parcels
+        :parsing_parcels => @parsing_parcels,
+        :file_wrapper    => @file_wrapper,
       }
     )
   end
@@ -75,6 +77,105 @@ describe PreprocessinatorReconstructor do
       expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
     end
 
+    it "should preserve a run of multiple consecutive blank lines rather than collapsing to one" do
+      filepath = "this/path/MY_FILE.C"
+
+      file_contents = [
+        '# 1 "./this/path/MY_FILE.C" 99999',
+        'void some_function(void) {',
+        '',
+        '',
+        '',
+        '  return 0;',
+        '}'
+      ]
+
+      # All three blank lines must survive -- e.g. a stripped multi-line comment
+      # or literal blank lines in the source, either way nothing gets dropped.
+      expected = [
+        'void some_function(void) {',
+        '',
+        '',
+        '',
+        '  return 0;',
+        '}'
+      ]
+
+      input = StringIO.new( file_contents.join( "\n" ) )
+
+      expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
+    end
+
+    it "should preserve independent runs of differing blank-line counts between separate code lines" do
+      filepath = "path/multi.c"
+
+      file_contents = [
+        '# 1 "path/multi.c" 1',
+        'int a;',
+        '',
+        '',
+        'int b;',
+        '',
+        'int c;',
+        '',
+        '',
+        '',
+        'int d;'
+      ]
+
+      # Each run's count must stay attached to its own gap -- not merged with a
+      # neighboring run, not truncated to a shared count.
+      expected = [
+        'int a;',
+        '',
+        '',
+        'int b;',
+        '',
+        'int c;',
+        '',
+        '',
+        '',
+        'int d;'
+      ]
+
+      input = StringIO.new( file_contents.join( "\n" ) )
+
+      expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
+    end
+
+    it "should preserve a following blank-line run after a marker-continuation (dangling semicolon) fragment" do
+      filepath = "sys/types_wrapper.c"
+
+      file_contents = [
+        '# 1 "sys/types_wrapper.c" 1',
+        'typedef unsigned long uint32_t',    # System typedef expansion, unterminated
+        '# 1 "sys/types_wrapper.c" 2',       # GCC re-marks the SAME source line...
+        ';',                                  # ...to attach a dangling ';' as a continuation, not a new line
+        '',
+        '',
+        'void some_function(void) {',
+        '  return;',
+        '}',
+        '# 1 "some/useless/file.c"'
+      ]
+
+      # The typedef and its dangling ';' must aggregate onto a single output
+      # line (existing behavior), and the two blank lines that follow -- e.g.
+      # from a stripped comment after the typedef -- must both still survive.
+      expected = [
+        'typedef unsigned long uint32_t;',
+        '',
+        '',
+        'void some_function(void) {',
+        '  return;',
+        '}'
+      ]
+
+      input = StringIO.new( file_contents.join( "\n" ) )
+
+      expect( @extractor.extract_file_as_array_from_expansion( input, filepath ) ).to eq expected
+    end
+
     it "should extract text of original file from preprocessed expansion with complex preprocessor line marker sequence" do
       filepath = "dir/our_file.c"
       
@@ -207,6 +308,8 @@ describe PreprocessinatorReconstructor do
         '',
         'static _Bool ecs_foo__init_structure(void);',
         '',
+        '',
+        '',
         'void ecs_foo_init(void) {',
         '    var1 = ecs_foo__init_structure();',
         '}',
@@ -697,4 +800,51 @@ describe PreprocessinatorReconstructor do
 
   end
 
+  context "#compact_file_from_expansion" do
+    it "should open its input in binary mode and its output in binary mode" do
+      # Binary mode on both ends: this content is read again downstream by code
+      # that depends on its line count being exact, so nothing here should be
+      # subject to platform-specific line ending translation.
+      input_handle  = StringIO.new( '# 1 "WANT.c" 5' + "\n" + 'text_we_want();' + "\n" )
+      output_handle = StringIO.new
+
+      expect(@file_wrapper).to receive(:open).with( 'input.c', 'rb' ).and_yield( input_handle )
+      expect(@file_wrapper).to receive(:open).with( 'output.c', 'wb' ).and_yield( output_handle )
+
+      @extractor.compact_file_from_expansion(
+        input_filepath:  'input.c',
+        source_filepath: 'WANT.c',
+        output_filepath: 'output.c'
+      )
+    end
+
+    it "should extract the same content from CRLF-terminated input as from LF-terminated input" do
+      # GCC's preprocessor output on Windows is CRLF-terminated. Extraction must
+      # produce identical results regardless of the input's line endings, since
+      # the exact line count of what's extracted matters to code downstream.
+      lf_input = StringIO.new(
+        '# 1 "WANT.c" 5' + "\n" + "line_one();\n" + "\n" + "line_two();\n"
+      )
+      crlf_input = StringIO.new(
+        '# 1 "WANT.c" 5' + "\r\n" + "line_one();\r\n" + "\r\n" + "line_two();\r\n"
+      )
+      lf_output   = StringIO.new
+      crlf_output = StringIO.new
+
+      allow(@file_wrapper).to receive(:open).with( 'lf.c', 'rb' ).and_yield( lf_input )
+      allow(@file_wrapper).to receive(:open).with( 'lf_out.c', 'wb' ).and_yield( lf_output )
+      allow(@file_wrapper).to receive(:open).with( 'crlf.c', 'rb' ).and_yield( crlf_input )
+      allow(@file_wrapper).to receive(:open).with( 'crlf_out.c', 'wb' ).and_yield( crlf_output )
+
+      @extractor.compact_file_from_expansion(
+        input_filepath: 'lf.c', source_filepath: 'WANT.c', output_filepath: 'lf_out.c'
+      )
+      @extractor.compact_file_from_expansion(
+        input_filepath: 'crlf.c', source_filepath: 'WANT.c', output_filepath: 'crlf_out.c'
+      )
+
+      expect( crlf_output.string ).to eq( lf_output.string )
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ceedling
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mark VanderVoord
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-23 00:00:00.000000000 Z
+date: 2026-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,6 +167,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- assets/broken_uncovered_file.c
 - assets/ceedling
 - assets/ceedling.cmd
 - assets/default_gitignore
@@ -179,6 +180,7 @@ files:
 - assets/example_file_with_stdio.h
 - assets/project.yml
 - assets/test_example_file.c
+- assets/test_example_file_2.c
 - assets/test_example_file_boom.c
 - assets/test_example_file_crash_assert.c
 - assets/test_example_file_crash_sigsegv.c
@@ -203,6 +205,15 @@ files:
 - assets/tests_with_fallback_conditionals/src/conditional_module.h
 - assets/tests_with_fallback_conditionals/src/optional_dep.h
 - assets/tests_with_fallback_conditionals/test/test_conditionals.c
+- assets/tests_with_partials_coverage/src/blanks.c
+- assets/tests_with_partials_coverage/src/blanks.h
+- assets/tests_with_partials_coverage/src/counter.c
+- assets/tests_with_partials_coverage/src/counter.h
+- assets/tests_with_partials_coverage/src/decorators.c
+- assets/tests_with_partials_coverage/src/decorators.h
+- assets/tests_with_partials_coverage/test/test_blanks.c
+- assets/tests_with_partials_coverage/test/test_counter.c
+- assets/tests_with_partials_coverage/test/test_decorators.c
 - assets/tests_with_preprocessing/src/adc_hardwareA.c
 - assets/tests_with_preprocessing/src/adc_hardwareA.h
 - assets/tests_with_preprocessing/src/adc_hardwareB.c
@@ -917,6 +928,7 @@ files:
 - spec/system/support/cppcheck_helpers.rb
 - spec/system/support/gcov_common_test_cases.rb
 - spec/system/support/gcov_helpers.rb
+- spec/system/support/gcov_partials_test_cases.rb
 - spec/system/support/valgrind_common_test_cases.rb
 - spec/system/support/valgrind_helpers.rb
 - spec/system/upgrade_as_vendor_spec.rb
@@ -1762,6 +1774,7 @@ test_files:
 - spec/system/support/cppcheck_helpers.rb
 - spec/system/support/gcov_common_test_cases.rb
 - spec/system/support/gcov_helpers.rb
+- spec/system/support/gcov_partials_test_cases.rb
 - spec/system/support/valgrind_common_test_cases.rb
 - spec/system/support/valgrind_helpers.rb
 - spec/system/upgrade_as_vendor_spec.rb