ceedling 1.2.1 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/GIT_COMMIT_SHA +1 -1
- data/README.md +11 -9
- data/Rakefile +2 -1
- data/assets/features/ceedling +1 -1
- data/assets/fixtures/test_source_file_duplicate_basenames/test_calc_typo.c +14 -0
- data/assets/fixtures/tests_with_duplicate_test_names/test_foo.c +21 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.c +7 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.h +5 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.c +13 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.h +4 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_private_macro.c +10 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_tally.c +9 -0
- data/bin/actionator.rb +6 -12
- data/bin/app_cfg.rb +14 -1
- data/bin/ceedling +13 -3
- data/bin/cli.rb +25 -6
- data/bin/cli_handler.rb +113 -73
- data/bin/cli_helper.rb +51 -78
- data/bin/installation_selector.rb +81 -0
- data/bin/launchinator.rb +69 -0
- data/bin/mixin_resolvinator.rb +26 -36
- data/bin/objects.yml +13 -0
- data/bin/path_validator.rb +25 -29
- data/bin/versionator.rb +47 -48
- data/ceedling.gemspec +19 -15
- data/docs/BreakingChanges.md +86 -1
- data/docs/Changelog.md +145 -3
- data/docs/KnownIssues.md +179 -6
- data/docs/ReleaseNotes.md +13 -0
- data/examples/wondrous_forest/README.md +29 -1
- data/examples/wondrous_forest/src/ForestUnits.h +23 -0
- data/examples/wondrous_forest/src/RainGauge.c +59 -0
- data/examples/wondrous_forest/src/RainGauge.h +39 -0
- data/examples/wondrous_forest/src/RainTipIsr.c +17 -0
- data/examples/wondrous_forest/src/RainTipIsr.h +14 -0
- data/examples/wondrous_forest/test/TestRainGauge.c +126 -0
- data/lib/ceedling/build_log_writer.rb +33 -0
- data/lib/ceedling/c_extractor/README.md +15 -7
- data/lib/ceedling/c_extractor/c_extractor.rb +25 -14
- data/lib/ceedling/c_extractor/c_extractor_code_text.rb +84 -54
- data/lib/ceedling/c_extractor/c_extractor_constants.rb +18 -7
- data/lib/ceedling/c_extractor/c_extractor_declarations.rb +319 -283
- data/lib/ceedling/c_extractor/c_extractor_declarator.rb +285 -0
- data/lib/ceedling/c_extractor/c_extractor_defined_type.rb +111 -0
- data/lib/ceedling/c_extractor/c_extractor_definitions.rb +174 -121
- data/lib/ceedling/c_extractor/c_extractor_functions.rb +191 -162
- data/lib/ceedling/c_extractor/c_extractor_preprocessing.rb +46 -55
- data/lib/ceedling/c_extractor/c_extractor_statement.rb +30 -0
- data/lib/ceedling/c_extractor/c_extractor_types.rb +63 -41
- data/lib/ceedling/c_extractor/c_module_edits.rb +48 -0
- data/lib/ceedling/c_identifier.rb +21 -0
- data/lib/ceedling/ceedling.h +8 -0
- data/lib/ceedling/config/build_root_policy.rb +70 -0
- data/lib/ceedling/config/configurator.rb +18 -19
- data/lib/ceedling/config/configurator_builder.rb +75 -28
- data/lib/ceedling/config/configurator_paths_validator.rb +179 -0
- data/lib/ceedling/config/configurator_plugins.rb +1 -1
- data/lib/ceedling/config/configurator_setup.rb +44 -33
- data/lib/ceedling/config/configurator_validator.rb +1 -110
- data/lib/ceedling/constants.rb +5 -1
- data/lib/ceedling/defaults.rb +35 -5
- data/lib/ceedling/dependencies/CACHE_SCHEMA.md +118 -0
- data/lib/ceedling/dependencies/README.md +18 -16
- data/lib/ceedling/dependencies/dependency_cache_store.rb +43 -21
- data/lib/ceedling/dependencies/dependency_hasher.rb +35 -1
- data/lib/ceedling/dependencies/dependency_tracker.rb +9 -3
- data/lib/ceedling/dependencies/dependinator.rb +13 -1
- data/lib/ceedling/diagnostics/DOCTOR.md +142 -0
- data/lib/ceedling/diagnostics/README.md +5 -0
- data/lib/ceedling/diagnostics/build_step_doctor.rb +110 -0
- data/lib/ceedling/diagnostics/duplicate_symbol_specialist.rb +108 -0
- data/lib/ceedling/diagnostics/guidance_phrases.rb +30 -0
- data/lib/ceedling/diagnostics/header_collision_guidance.rb +56 -0
- data/lib/ceedling/diagnostics/header_collision_specialist.rb +152 -0
- data/lib/ceedling/diagnostics/include_depth_specialist.rb +132 -0
- data/lib/ceedling/diagnostics/missing_symbol_specialist.rb +111 -0
- data/lib/ceedling/diagnostics/partial_name_specialist.rb +134 -0
- data/lib/ceedling/diagnostics/toolchain_output.rb +44 -0
- data/lib/ceedling/filename_extension.rb +7 -1
- data/lib/ceedling/filesystem/FILE_TREE.md +253 -0
- data/lib/ceedling/filesystem/PATH_HANDLING.md +360 -0
- data/lib/ceedling/filesystem/README.md +46 -0
- data/lib/ceedling/filesystem/build_roots.rb +105 -0
- data/lib/ceedling/filesystem/build_subpath.rb +187 -0
- data/lib/ceedling/filesystem/destination_collision.rb +25 -0
- data/lib/ceedling/{file_finder.rb → filesystem/file_finder.rb} +177 -156
- data/lib/ceedling/filesystem/file_finder_helper.rb +154 -0
- data/lib/ceedling/filesystem/file_path_collection_utils.rb +183 -0
- data/lib/ceedling/{file_path_utils.rb → filesystem/file_path_utils.rb} +200 -167
- data/lib/ceedling/{file_system_wrapper.rb → filesystem/file_system_wrapper.rb} +6 -5
- data/lib/ceedling/filesystem/file_tree.rb +241 -0
- data/lib/ceedling/{file_wrapper.rb → filesystem/file_wrapper.rb} +149 -65
- data/lib/ceedling/filesystem/path_exclusions.rb +30 -0
- data/lib/ceedling/{path_matcher.rb → filesystem/path_matcher.rb} +48 -23
- data/lib/ceedling/{path_mirror.rb → filesystem/path_mirror.rb} +19 -18
- data/lib/ceedling/filesystem/path_spellings.rb +55 -0
- data/lib/ceedling/filesystem/project_paths.rb +184 -0
- data/lib/ceedling/filesystem/test_build_layout.rb +114 -0
- data/lib/ceedling/filesystem/win_long_paths.rb +153 -0
- data/lib/ceedling/filesystem/win_path_limit.rb +83 -0
- data/lib/ceedling/filesystem/win_path_prober.rb +52 -0
- data/lib/ceedling/filesystem/working_dir.rb +40 -0
- data/lib/ceedling/generators/generator.rb +32 -70
- data/lib/ceedling/generators/generator_helper.rb +0 -44
- data/lib/ceedling/generators/generator_mocks.rb +5 -0
- data/lib/ceedling/generators/generator_partials.rb +306 -244
- data/lib/ceedling/generators/generator_test_results_backtrace.rb +7 -7
- data/lib/ceedling/generators/generator_test_runner.rb +5 -8
- data/lib/ceedling/generators/partial_header_writer.rb +95 -0
- data/lib/ceedling/generators/partial_source_writer.rb +137 -0
- data/lib/ceedling/handoff.rb +121 -0
- data/lib/ceedling/includes/header_search.rb +225 -0
- data/lib/ceedling/includes/include_factory.rb +9 -12
- data/lib/ceedling/includes/include_pathinator.rb +112 -33
- data/lib/ceedling/includes/includes.rb +150 -38
- data/lib/ceedling/installation.rb +92 -0
- data/lib/ceedling/library_resolver.rb +99 -0
- data/lib/ceedling/objects.yml +112 -6
- data/lib/ceedling/partials/README.md +110 -16
- data/lib/ceedling/partials/carry_plan.rb +71 -0
- data/lib/ceedling/partials/definition_head.rb +74 -0
- data/lib/ceedling/partials/include_groups.rb +37 -0
- data/lib/ceedling/partials/interface_extras.rb +25 -0
- data/lib/ceedling/partials/partializer.rb +603 -124
- data/lib/ceedling/partials/partializer_config.rb +8 -1
- data/lib/ceedling/partials/partializer_helper.rb +851 -145
- data/lib/ceedling/partials/partializer_reconciler.rb +174 -0
- data/lib/ceedling/partials/partializer_utils.rb +89 -109
- data/lib/ceedling/partials/partials.rb +153 -10
- data/lib/ceedling/partials/type_macros.rb +126 -0
- data/lib/ceedling/plugins/report_log_writer_plugin.rb +3 -5
- data/lib/ceedling/preprocess/README.md +43 -33
- data/lib/ceedling/preprocess/preprocessinator.rb +100 -186
- data/lib/ceedling/preprocess/preprocessinator_code_finder.rb +65 -72
- data/lib/ceedling/preprocess/preprocessinator_file_assembler.rb +32 -76
- data/lib/ceedling/preprocess/preprocessinator_includes_handler.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_line_marker_includes_extractor.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_reconstructor.rb +51 -14
- data/lib/ceedling/rake_app/rakefile_component_resolver.rb +10 -17
- data/lib/ceedling/rakefile.rb +15 -1
- data/lib/ceedling/rakefiles/base/tasks_base.rake +1 -1
- data/lib/ceedling/rakefiles/release/rules_release.rake +4 -7
- data/lib/ceedling/release_invoker/release_build_executor.rb +33 -44
- data/lib/ceedling/release_invoker/release_build_planner.rb +14 -6
- data/lib/ceedling/reportinator.rb +3 -4
- data/lib/ceedling/setupinator.rb +104 -87
- data/lib/ceedling/test_context_extractor.rb +5 -1
- data/lib/ceedling/test_invoker/HEADER_COLLISIONS.md +21 -7
- data/lib/ceedling/test_invoker/PIPELINE.md +62 -19
- data/lib/ceedling/test_invoker/README.md +1 -1
- data/lib/ceedling/test_invoker/derived_search_path_notices.rb +45 -0
- data/lib/ceedling/test_invoker/mock_locator.rb +175 -10
- data/lib/ceedling/test_invoker/partial_files_preprocessinator.rb +181 -0
- data/lib/ceedling/test_invoker/partials_manager.rb +271 -302
- data/lib/ceedling/test_invoker/standin_headerinator.rb +19 -17
- data/lib/ceedling/test_invoker/test_bare_includes_extractinator.rb +26 -3
- data/lib/ceedling/test_invoker/test_build_executor.rb +358 -234
- data/lib/ceedling/test_invoker/test_build_planner.rb +46 -33
- data/lib/ceedling/test_invoker/test_build_setup.rb +43 -18
- data/lib/ceedling/test_invoker/test_build_validations.rb +35 -47
- data/lib/ceedling/test_invoker/test_derived_search_paths.rb +189 -0
- data/lib/ceedling/test_invoker/test_file_preprocessinator.rb +2 -3
- data/lib/ceedling/test_invoker/test_includes_reconcilinator.rb +1 -1
- data/lib/ceedling/test_invoker/test_invoker.rb +6 -1
- data/lib/ceedling/test_invoker/test_invoker_types.rb +28 -20
- data/lib/ceedling/test_invoker/test_pipeline_helpers.rb +6 -4
- data/lib/ceedling/test_invoker/test_pipeline_manager.rb +25 -8
- data/lib/ceedling/test_invoker/test_runner_generatinator.rb +31 -3
- data/lib/ceedling/test_invoker/test_search_paths.rb +30 -8
- data/lib/ceedling/test_invoker/test_source_file_directive_resolver.rb +40 -20
- data/lib/ceedling/test_invoker/test_substitutions.rb +72 -0
- data/lib/ceedling/tools/shell_quoting.rb +45 -0
- data/lib/ceedling/{tool_executor.rb → tools/tool_executor.rb} +9 -3
- data/lib/ceedling/tools/tool_quoting.rb +79 -0
- data/lib/ceedling/{tool_validator.rb → tools/tool_validator.rb} +18 -7
- data/lib/ceedling/yaml_wrapper.rb +3 -2
- data/lib/version.rb +1 -1
- data/plugins/bullseye/bullseye.rake +1 -3
- data/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/plugins/bullseye/lib/bullseye.rb +24 -9
- data/plugins/command_hooks/lib/command_hooks.rb +1 -1
- data/plugins/cppcheck/config/defaults_cppcheck.rb +1 -1
- data/plugins/dependencies/config/defaults.yml +6 -6
- data/plugins/dependencies/dependencies.rake +4 -1
- data/plugins/dependencies/lib/dependencies.rb +18 -8
- data/plugins/dependencies/lib/dependency_spec.rb +17 -5
- data/plugins/fff/lib/fff.rb +79 -46
- data/plugins/fff/lib/fff_mock_generator.rb +12 -9
- data/plugins/fff/spec/fff_cmock_wrapper_spec.rb +262 -0
- data/plugins/fff/spec/fff_mock_header_generator_spec.rb +9 -0
- data/plugins/fff/spec/fff_mock_source_generator_spec.rb +20 -0
- data/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/plugins/gcov/lib/console_reportinator.rb +28 -36
- data/plugins/gcov/lib/gcov.rb +9 -2
- data/plugins/gcov/lib/gcovr_reportinator.rb +8 -40
- data/plugins/gcov/lib/gcovr_thresholds.rb +74 -0
- data/plugins/gcov/lib/reportgenerator_reportinator.rb +3 -2
- data/plugins/module_generator/lib/module_generator.rb +3 -3
- data/plugins/report_tests_teamcity_stdout/lib/report_tests_teamcity_stdout.rb +53 -80
- data/plugins/sanitize/lib/sanitize_records.rb +3 -6
- data/plugins/valgrind/lib/valgrind.rb +14 -7
- data/site-local/404.html +2 -2
- data/site-local/assets/javascripts/{bundle.c21346df.min.js → bundle.a5f9d56c.min.js} +1 -1
- data/site-local/assets/javascripts/{bundle.c21346df.min.js.map → bundle.a5f9d56c.min.js.map} +2 -2
- data/site-local/configuration/environment-vars.html +2 -2
- data/site-local/configuration/global-collections.html +3 -3
- data/site-local/configuration/index.html +2 -2
- data/site-local/configuration/loading.html +2 -2
- data/site-local/configuration/mixins.html +2 -2
- data/site-local/configuration/parallel-builds.html +2 -2
- data/site-local/configuration/project-file.html +2 -2
- data/site-local/configuration/reference/cexception.html +2 -2
- data/site-local/configuration/reference/cmock.html +7 -3
- data/site-local/configuration/reference/defines.html +2 -2
- data/site-local/configuration/reference/environment.html +2 -2
- data/site-local/configuration/reference/extension.html +2 -2
- data/site-local/configuration/reference/files.html +65 -12
- data/site-local/configuration/reference/flags.html +2 -2
- data/site-local/configuration/reference/index.html +2 -2
- data/site-local/configuration/reference/libraries.html +23 -5
- data/site-local/configuration/reference/mixins.html +2 -2
- data/site-local/configuration/reference/partials.html +84 -2
- data/site-local/configuration/reference/paths.html +36 -8
- data/site-local/configuration/reference/plugins.html +2 -2
- data/site-local/configuration/reference/project.html +264 -12
- data/site-local/configuration/reference/release-build.html +4 -2
- data/site-local/configuration/reference/test-build.html +2 -2
- data/site-local/configuration/reference/test-runner.html +2 -2
- data/site-local/configuration/reference/tools.html +58 -4
- data/site-local/configuration/reference/unity.html +2 -2
- data/site-local/configuration/which-ceedling.html +379 -19
- data/site-local/development/index.html +2 -2
- data/site-local/development/plugins/configuration.html +2 -2
- data/site-local/development/plugins/index.html +2 -2
- data/site-local/development/plugins/plugin-subclass.html +5 -4
- data/site-local/development/plugins/rake-tasks.html +2 -2
- data/site-local/development/releases.html +7 -3
- data/site-local/development/workflow.html +50 -45
- data/site-local/getting-started/builds.html +4 -2
- data/site-local/getting-started/command-line.html +58 -6
- data/site-local/getting-started/example-projects/cipher-quest.html +2 -2
- data/site-local/getting-started/example-projects/index.html +2 -2
- data/site-local/getting-started/example-projects/temp-sensor.html +2 -2
- data/site-local/getting-started/example-projects/wondrous-forest.html +10 -2
- data/site-local/getting-started/index.html +2 -2
- data/site-local/getting-started/installation.html +2 -2
- data/site-local/getting-started/quick-start.html +2 -2
- data/site-local/help.html +2 -2
- data/site-local/index.html +2 -2
- data/site-local/overview/build-system.html +2 -2
- data/site-local/overview/index.html +2 -2
- data/site-local/overview/test-environments.html +2 -2
- data/site-local/overview/tools-and-frameworks.html +2 -2
- data/site-local/plugins/beep.html +2 -2
- data/site-local/plugins/bullseye/index.html +45 -38
- data/site-local/plugins/bullseye/licensing.html +2 -2
- data/site-local/plugins/command-hooks.html +4 -4
- data/site-local/plugins/compile-commands-json-db.html +2 -2
- data/site-local/plugins/cppcheck.html +2 -2
- data/site-local/plugins/dependencies.html +8 -5
- data/site-local/plugins/fff.html +58 -13
- data/site-local/plugins/gcov/examples.html +2 -2
- data/site-local/plugins/gcov/gcovr.html +23 -14
- data/site-local/plugins/gcov/index.html +2 -2
- data/site-local/plugins/gcov/overview.html +2 -2
- data/site-local/plugins/gcov/reportgenerator.html +18 -14
- data/site-local/plugins/gcov/reporting.html +2 -2
- data/site-local/plugins/gcov/setup.html +4 -3
- data/site-local/plugins/gcov/tool-versions.html +2 -2
- data/site-local/plugins/gcov/troubleshooting.html +2 -2
- data/site-local/plugins/index.html +2 -2
- data/site-local/plugins/module-generator.html +2 -2
- data/site-local/plugins/report-build-warnings-log.html +2 -2
- data/site-local/plugins/report-tests-gtestlike-stdout.html +2 -2
- data/site-local/plugins/report-tests-ide-stdout.html +2 -2
- data/site-local/plugins/report-tests-log-factory.html +2 -2
- data/site-local/plugins/report-tests-pretty-stdout.html +2 -2
- data/site-local/plugins/report-tests-raw-output-log.html +5 -3
- data/site-local/plugins/report-tests-teamcity-stdout.html +8 -5
- data/site-local/plugins/sanitize.html +9 -8
- data/site-local/plugins/valgrind.html +10 -9
- data/site-local/project/index.html +2 -2
- data/site-local/project/release-history.html +2 -2
- data/site-local/project/sbom.html +2 -2
- data/site-local/project/upgrade.html +5 -2
- data/site-local/reference/build-directives.html +2 -2
- data/site-local/reference/command-line.html +11 -4
- data/site-local/reference/environment-vars.html +2 -2
- data/site-local/reference/gcov-plugin.html +2 -2
- data/site-local/reference/global-collections.html +12 -12
- data/site-local/reference/index.html +2 -2
- data/site-local/reference/partials-macros.html +47 -2
- data/site-local/reference/project-configuration.html +2 -2
- data/site-local/sitemap.xml.gz +0 -0
- data/site-local/snapshot/examples/cipher_quest/index.html +2 -2
- data/site-local/snapshot/examples/temp_sensor/index.html +2 -2
- data/site-local/snapshot/examples/wondrous_forest/index.html +72 -15
- data/site-local/snapshot/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/site-local/snapshot/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/site-local/testing-guide/build-directives.html +2 -2
- data/site-local/testing-guide/conventions.html +113 -15
- data/site-local/testing-guide/frameworks.html +2 -2
- data/site-local/testing-guide/index.html +2 -2
- data/site-local/testing-guide/partials/configuration.html +31 -4
- data/site-local/testing-guide/partials/conventions.html +509 -8
- data/site-local/testing-guide/partials/directives.html +4 -3
- data/site-local/testing-guide/partials/example.html +2 -2
- data/site-local/testing-guide/partials/index.html +2 -2
- data/site-local/testing-guide/partials/overview.html +30 -12
- data/site-local/testing-guide/partials/variables.html +169 -4
- data/site-local/testing-guide/test-cases.html +2 -2
- data/site-local/testing-guide/test-sample.html +2 -2
- data/site-local/testing-guide/test-suite-anatomy.html +2 -2
- data/spec/integration/actionator_file_operations_spec.rb +91 -1
- data/spec/integration/build_step_doctor_spec.rb +270 -0
- data/spec/integration/c_extractor_composition_spec.rb +254 -4
- data/spec/integration/compile_commands_json_db_spec.rb +1 -1
- data/spec/integration/configurator_validation_spec.rb +1 -1
- data/spec/integration/dependencies/dependency_tracker_cache_hardening_spec.rb +26 -0
- data/spec/integration/dependencies/dependency_tracker_core_spec.rb +22 -0
- data/spec/integration/includes_extraction_spec.rb +27 -14
- data/spec/integration/launcher_handoff_spec.rb +297 -0
- data/spec/integration/mixin_loading_spec.rb +1 -1
- data/spec/integration/module_generator_spec.rb +3 -3
- data/spec/integration/nested_test_artifacts_spec.rb +99 -0
- data/spec/integration/partial_files_preprocessing_spec.rb +128 -0
- data/spec/integration/partials_carry_spec.rb +520 -0
- data/spec/integration/partials_declarations_spec.rb +655 -0
- data/spec/integration/partials_fallback_preprocessing_spec.rb +65 -0
- data/spec/integration/partials_function_pointers_spec.rb +277 -0
- data/spec/integration/partials_header_composition_spec.rb +268 -35
- data/spec/integration/partials_macro_decorators_spec.rb +267 -0
- data/spec/integration/partials_module_resolution_spec.rb +33 -23
- data/spec/integration/partials_symbol_linkage_spec.rb +13 -0
- data/spec/integration/path_intake_scenarios_spec.rb +101 -0
- data/spec/integration/path_length_reporting_spec.rb +64 -0
- data/spec/integration/path_scenarios_spec.rb +399 -0
- data/spec/integration/quote_include_isolator_spec.rb +57 -1
- data/spec/integration/report_build_warnings_log_spec.rb +1 -1
- data/spec/integration/report_tests_log_factory_spec.rb +1 -1
- data/spec/integration/test_build_parallel_barrier_spec.rb +1 -1
- data/spec/integration/test_executable_manifest_spec.rb +1 -1
- data/spec/integration/test_includes_extractinator_spec.rb +69 -3
- data/spec/integration/test_naming_spec.rb +201 -0
- data/spec/integration/test_source_file_checks_spec.rb +168 -0
- data/spec/integration/tool_executor_spec.rb +1 -1
- data/spec/integration/tool_validator_spec.rb +3 -3
- data/spec/integration/upgrade_docs_spec.rb +84 -0
- data/spec/integration/vendor_copy_transient_io_retry_spec.rb +74 -5
- data/spec/integration/win_long_paths_probe_spec.rb +46 -0
- data/spec/integration/win_path_limit_spec.rb +53 -0
- data/spec/integration/windows_registry_query_tool_spec.rb +41 -0
- data/spec/support/file_tree_helper.rb +88 -0
- data/spec/support/integration/configurator_integration_helper.rb +14 -9
- data/spec/support/integration/dependency_tracker_integration_helper.rb +1 -1
- data/spec/support/integration/partial_files_harness.rb +181 -0
- data/spec/support/integration/partials_generation_integration_helper.rb +239 -143
- data/spec/support/integration/path_scenario_harness.rb +175 -0
- data/spec/support/integration/spec_integration_helper.rb +9 -4
- data/spec/support/integration/test_includes_harness.rb +69 -37
- data/spec/support/integration/tool_executor_integration_helper.rb +14 -2
- data/spec/support/spec_helper.rb +2 -0
- data/spec/support/system/spec_system_helper.rb +7 -6
- data/spec/support/system/system_context.rb +21 -3
- data/spec/support/working_dir_tracking.rb +49 -0
- data/spec/system/build_output_mirroring_spec.rb +2 -2
- data/spec/system/bullseye_deployment_spec.rb +2 -0
- data/spec/system/conditional_mock_includes_spec.rb +1 -1
- data/spec/system/delta_builds_spec.rb +163 -23
- data/spec/system/encoding_stress_spec.rb +4 -4
- data/spec/system/example_wondrous_forest_spec.rb +2 -2
- data/spec/system/gcov_deployment_spec.rb +3 -0
- data/spec/system/header_include_path_validation_spec.rb +4 -4
- data/spec/system/header_search_paths_spec.rb +1083 -0
- data/spec/system/launcher_handoff_spec.rb +82 -0
- data/spec/system/mock_include_folders_spec.rb +212 -0
- data/spec/system/mockable_header_reassembly_spec.rb +184 -0
- data/spec/system/parent_directory_reference_spec.rb +5 -3
- data/spec/system/partials_carry_spec.rb +581 -0
- data/spec/system/partials_delta_builds_spec.rb +280 -0
- data/spec/system/partials_function_pointers_spec.rb +106 -0
- data/spec/system/partials_macro_decorators_spec.rb +127 -0
- data/spec/system/partials_module_disambiguation_spec.rb +125 -0
- data/spec/system/path_handling_probes_spec.rb +196 -0
- data/spec/system/pinned_thread_count_spec.rb +4 -4
- data/spec/system/preprocessing_fallback_conditionals_spec.rb +1 -1
- data/spec/system/preprocessing_parameterized_tests_spec.rb +1 -1
- data/spec/system/rake_release_task_path_disambiguation_spec.rb +6 -6
- data/spec/system/rake_test_task_path_disambiguation_spec.rb +85 -0
- data/spec/system/short_build_paths_spec.rb +87 -0
- data/spec/system/sibling_header_collision_spec.rb +30 -6
- data/spec/system/special_path_characters_spec.rb +86 -0
- data/spec/system/support/bullseye_common_test_cases.rb +42 -0
- data/spec/system/support/common_test_cases.rb +23 -21
- data/spec/system/support/gcov_common_test_cases.rb +37 -9
- data/spec/system/support/gcov_partials_test_cases.rb +48 -0
- data/spec/system/support/sanitize_common_test_cases.rb +2 -2
- data/spec/system/support/valgrind_common_test_cases.rb +12 -12
- data/spec/system/test_build_layout_spec.rb +209 -0
- data/spec/system/test_pipeline_stop_points_spec.rb +4 -4
- data/spec/system/test_runner_system_include_spec.rb +1 -1
- data/spec/system/test_source_file_directive_spec.rb +64 -5
- data/spec/units/bin/actionator_spec.rb +14 -17
- data/spec/units/bin/app_cfg_spec.rb +37 -0
- data/spec/units/bin/cli_handler_spec.rb +282 -6
- data/spec/units/bin/cli_helper_spec.rb +116 -45
- data/spec/units/bin/installation_selector_spec.rb +114 -0
- data/spec/units/bin/launchinator_spec.rb +171 -0
- data/spec/units/bin/path_validator_spec.rb +10 -0
- data/spec/units/bin/versionator_spec.rb +38 -6
- data/spec/units/build_log_writer_spec.rb +57 -0
- data/spec/units/c_extractor/c_extractor_code_text_spec.rb +67 -10
- data/spec/units/c_extractor/c_extractor_declarations_spec.rb +501 -4
- data/spec/units/c_extractor/c_extractor_declarator_spec.rb +245 -0
- data/spec/units/c_extractor/c_extractor_defined_type_spec.rb +45 -0
- data/spec/units/c_extractor/c_extractor_definitions_spec.rb +163 -3
- data/spec/units/c_extractor/c_extractor_functions_spec.rb +462 -21
- data/spec/units/c_extractor/c_extractor_preprocessing_spec.rb +39 -0
- data/spec/units/c_extractor/c_extractor_spec.rb +4 -4
- data/spec/units/c_extractor/c_extractor_types_spec.rb +163 -0
- data/spec/units/c_identifier_spec.rb +35 -0
- data/spec/units/config/build_root_policy_spec.rb +61 -0
- data/spec/units/config/configurator_builder_spec.rb +61 -6
- data/spec/units/config/configurator_paths_validator_spec.rb +292 -0
- data/spec/units/config/configurator_setup_spec.rb +80 -68
- data/spec/units/config/configurator_spec.rb +54 -6
- data/spec/units/config/configurator_validator_spec.rb +1 -172
- data/spec/units/dependencies/dependency_cache_store_spec.rb +98 -2
- data/spec/units/dependencies/dependency_debug_tree_spec.rb +1 -1
- data/spec/units/dependencies/dependency_hasher_spec.rb +42 -1
- data/spec/units/dependencies/dependency_path_normalizer_spec.rb +1 -1
- data/spec/units/dependencies/dependency_tracker_spec.rb +28 -1
- data/spec/units/dependencies/dependinator_spec.rb +17 -2
- data/spec/units/diagnostics/build_step_doctor_spec.rb +170 -0
- data/spec/units/diagnostics/duplicate_symbol_specialist_spec.rb +117 -0
- data/spec/units/diagnostics/header_collision_specialist_spec.rb +267 -0
- data/spec/units/diagnostics/include_depth_specialist_spec.rb +137 -0
- data/spec/units/diagnostics/missing_symbol_specialist_spec.rb +154 -0
- data/spec/units/diagnostics/partial_name_specialist_spec.rb +129 -0
- data/spec/units/diagnostics/toolchain_output_spec.rb +86 -0
- data/spec/units/encodinator_spec.rb +3 -4
- data/spec/units/filename_extension_spec.rb +11 -0
- data/spec/units/filesystem/build_roots_spec.rb +131 -0
- data/spec/units/filesystem/build_subpath_spec.rb +235 -0
- data/spec/units/filesystem/destination_collision_spec.rb +30 -0
- data/spec/units/{file_finder_helper_spec.rb → filesystem/file_finder_helper_spec.rb} +126 -1
- data/spec/units/filesystem/file_finder_spec.rb +845 -0
- data/spec/units/{file_path_collection_utils_spec.rb → filesystem/file_path_collection_utils_spec.rb} +181 -1
- data/spec/units/{file_path_utils_spec.rb → filesystem/file_path_utils_spec.rb} +435 -185
- data/spec/units/filesystem/file_system_wrapper_spec.rb +33 -0
- data/spec/units/filesystem/file_tree_spec.rb +511 -0
- data/spec/units/filesystem/file_tree_windows_spec.rb +78 -0
- data/spec/units/{file_wrapper_spec.rb → filesystem/file_wrapper_spec.rb} +286 -18
- data/spec/units/{path_matcher_spec.rb → filesystem/path_matcher_spec.rb} +48 -1
- data/spec/units/{path_mirror_spec.rb → filesystem/path_mirror_spec.rb} +32 -4
- data/spec/units/filesystem/project_paths_spec.rb +147 -0
- data/spec/units/filesystem/test_build_layout_spec.rb +216 -0
- data/spec/units/filesystem/win_long_paths_spec.rb +204 -0
- data/spec/units/filesystem/win_path_prober_spec.rb +158 -0
- data/spec/units/filesystem/working_dir_spec.rb +71 -0
- data/spec/units/generators/generator_helper_spec.rb +0 -60
- data/spec/units/generators/generator_mocks_spec.rb +13 -0
- data/spec/units/generators/generator_partials_spec.rb +656 -55
- data/spec/units/generators/generator_spec.rb +38 -6
- data/spec/units/generators/generator_test_results_backtrace_spec.rb +50 -46
- data/spec/units/generators/generator_test_results_spec.rb +1 -1
- data/spec/units/generators/generator_test_runner_spec.rb +9 -5
- data/spec/units/generators/partial_source_writer_spec.rb +129 -0
- data/spec/units/handoff_spec.rb +205 -0
- data/spec/units/includes/header_search_spec.rb +406 -0
- data/spec/units/includes/include_factory_spec.rb +23 -6
- data/spec/units/includes/include_pathinator_spec.rb +118 -8
- data/spec/units/includes/include_spec.rb +14 -0
- data/spec/units/includes/includes_spec.rb +176 -19
- data/spec/units/installation_spec.rb +228 -0
- data/spec/units/library_resolver_spec.rb +157 -0
- data/spec/units/loginator_spec.rb +31 -0
- data/spec/units/mock_locator_spec.rb +275 -6
- data/spec/units/partials/include_groups_spec.rb +42 -0
- data/spec/units/partials/partializer_config_spec.rb +32 -0
- data/spec/units/partials/partializer_helper_carry_spec.rb +661 -0
- data/spec/units/partials/partializer_helper_interface_extras_spec.rb +396 -0
- data/spec/units/partials/partializer_helper_spec.rb +529 -277
- data/spec/units/partials/partializer_reconciler_spec.rb +661 -0
- data/spec/units/partials/partializer_spec.rb +1579 -270
- data/spec/units/partials/partializer_utils_spec.rb +269 -232
- data/spec/units/partials/partials_rename_spec.rb +160 -0
- data/spec/units/partials_manager_spec.rb +561 -251
- data/spec/units/plugins/bullseye_spec.rb +49 -2
- data/spec/units/plugins/console_reportinator_spec.rb +73 -26
- data/spec/units/plugins/dependencies_spec.rb +33 -7
- data/spec/units/plugins/dependency_spec_spec.rb +17 -0
- data/spec/units/plugins/gcov_spec.rb +28 -3
- data/spec/units/plugins/gcovr_reportinator_spec.rb +19 -47
- data/spec/units/plugins/gcovr_thresholds_spec.rb +95 -0
- data/spec/units/plugins/module_generator_spec.rb +5 -5
- data/spec/units/plugins/report_build_warnings_log_spec.rb +3 -3
- data/spec/units/plugins/report_log_writer_plugin_spec.rb +10 -1
- data/spec/units/plugins/report_tests_raw_output_log_spec.rb +13 -2
- data/spec/units/plugins/report_tests_teamcity_stdout_spec.rb +77 -3
- data/spec/units/plugins/reportgenerator_reportinator_spec.rb +52 -4
- data/spec/units/plugins/sanitize_records_spec.rb +3 -1
- data/spec/units/plugins/sanitize_spec.rb +1 -1
- data/spec/units/plugins/valgrind_spec.rb +23 -8
- data/spec/units/preprocess/preprocessinator_code_finder_spec.rb +73 -10
- data/spec/units/preprocess/preprocessinator_comment_stripper_spec.rb +1 -1
- data/spec/units/preprocess/preprocessinator_file_assembler_spec.rb +125 -37
- data/spec/units/preprocess/preprocessinator_includes_handler_spec.rb +15 -0
- data/spec/units/preprocess/preprocessinator_reconstructor_spec.rb +197 -0
- data/spec/units/preprocess/preprocessinator_spec.rb +153 -95
- data/spec/units/rake_app/rakefile_component_resolver_spec.rb +21 -0
- data/spec/units/release_build_executor_spec.rb +53 -14
- data/spec/units/release_build_planner_spec.rb +15 -3
- data/spec/units/reportinator_spec.rb +5 -5
- data/spec/units/setupinator_spec.rb +51 -0
- data/spec/units/standin_headerinator_spec.rb +55 -9
- data/spec/units/test_build_executor_spec.rb +842 -166
- data/spec/units/test_build_planner_spec.rb +205 -15
- data/spec/units/test_build_setup_spec.rb +179 -30
- data/spec/units/test_context_extractor_spec.rb +36 -2
- data/spec/units/test_derived_search_paths_spec.rb +259 -0
- data/spec/units/test_file_preprocessinator_spec.rb +17 -1
- data/spec/units/test_includes_extractinator_spec.rb +61 -9
- data/spec/units/test_invoker/objects_wiring_spec.rb +24 -4
- data/spec/units/test_invoker/partial_files_preprocessinator_spec.rb +264 -0
- data/spec/units/test_invoker/test_substitutions_spec.rb +122 -0
- data/spec/units/test_invoker_spec.rb +14 -1
- data/spec/units/test_invoker_types_spec.rb +8 -7
- data/spec/units/test_pipeline_manager_spec.rb +54 -13
- data/spec/units/test_runner_generatinator_spec.rb +93 -1
- data/spec/units/test_search_paths_spec.rb +73 -5
- data/spec/units/test_source_file_directive_resolver_spec.rb +38 -7
- data/spec/units/tools/default_tools_quoting_spec.rb +117 -0
- data/spec/units/tools/shell_quoting_spec.rb +76 -0
- data/spec/units/{tool_executor_helper_spec.rb → tools/tool_executor_helper_spec.rb} +1 -1
- data/spec/units/{tool_executor_spec.rb → tools/tool_executor_spec.rb} +27 -1
- data/spec/units/{tool_validator_spec.rb → tools/tool_validator_spec.rb} +110 -1
- data/spec/units/windows_registry_query_tool_spec.rb +53 -0
- data/spec/units/yaml_wrapper_spec.rb +11 -0
- metadata +265 -36
- data/lib/ceedling/file_finder_helper.rb +0 -127
- data/lib/ceedling/file_path_collection_utils.rb +0 -164
- data/spec/units/file_finder_spec.rb +0 -495
- /data/lib/ceedling/{tool_executor_helper.rb → tools/tool_executor_helper.rb} +0 -0
data/docs/ReleaseNotes.md
CHANGED
|
@@ -8,6 +8,19 @@ These release notes are complemented by three other documents:
|
|
|
8
8
|
|
|
9
9
|
---
|
|
10
10
|
|
|
11
|
+
# 1.2.2 — October 31, 2026
|
|
12
|
+
|
|
13
|
+
## ⚠️ Breaking changes in a patch release
|
|
14
|
+
|
|
15
|
+
1.2.2 is a patch release, yet [Breaking Changes](BreakingChanges.md) lists several entries for 1.2.2. Each entry is a bug fix that changes a behavior that a project might rely on and is, therefore, technically a breaking change. Despite this, we decided to maintain 1.2.2 as only a patch version for a few reasons:
|
|
16
|
+
|
|
17
|
+
1. **Core builds are unaffected.** A correctly configured project builds and tests as before. The first test build after upgrading rebuilds everything once via a full delta build because of changes to how ephemeral build directory output is organized.
|
|
18
|
+
1. **Plugin changes are limited to artifact paths.** Plugins that write per-test logs and reports, such as Valgrind, Sanitize, and Raw Output Log, write them to new paths because of build directory output fixes (see [1]). In a Ceedling build, every plugin is optional, and these changes do not impact test suites or release builds.
|
|
19
|
+
1. **The fixes resolve latent bugs.** Nobody reported these bugs and some persisted across several versions: complete diambiguation of same-named tests, `TEST_SOURCE_FILE()` checking, [Which Ceedling](https://docs.throwtheswitch.org/Ceedling/1.2.0/configuration/which-ceedling/), CLI `--local` vendoring, `ceedling upgrade`, and `ceedling version`. With the fixes, these features now do what they were meant to do.
|
|
20
|
+
1. **Path configuration changes reach only unusual layouts.** A `-:` `:paths` entry now also removes the directories below the one it names. A build root that is the project directory or a directory above it is now refused, because `clobber` could delete the project’s own files. A `:paths` or `:files` entry within the build root now logs a warning, and no entry collects from the directories Ceedling creates there. See [Breaking Changes](BreakingChanges.md).
|
|
21
|
+
|
|
22
|
+
---
|
|
23
|
+
|
|
11
24
|
# 1.2.0 — October 21, 2026
|
|
12
25
|
|
|
13
26
|
## 👀 Highlights
|
|
@@ -11,6 +11,8 @@ This example project illustrates:
|
|
|
11
11
|
and `static` variables that are normally inaccessible to the linker
|
|
12
12
|
- **Every major Partials pattern** across a range of sensor and system modules
|
|
13
13
|
- **Partials and mocks used together** in the same test suite
|
|
14
|
+
- **Carrying** — a Partial bringing along the helpers, prototypes, and
|
|
15
|
+
variables its selected functions rely on
|
|
14
16
|
|
|
15
17
|
This project is test-suite only (no release build).
|
|
16
18
|
|
|
@@ -33,6 +35,9 @@ wondrous_forest/
|
|
|
33
35
|
│ ├── ForestMonitor.c/.h
|
|
34
36
|
│ ├── SensorHal.c/.h
|
|
35
37
|
│ ├── UartDriver.c/.h
|
|
38
|
+
│ ├── RainGauge.c/.h
|
|
39
|
+
│ ├── RainTipIsr.c/.h # Defines the tip counter RainGauge.h declares extern
|
|
40
|
+
│ ├── ForestUnits.h # C99 inline functions, no source file of its own
|
|
36
41
|
│ ├── sensors/soil/Calibration.c/.h # Same module name as the one below
|
|
37
42
|
│ ├── sensors/light/Calibration.c/.h # Told apart by directory
|
|
38
43
|
│ └── Types.h
|
|
@@ -45,7 +50,9 @@ wondrous_forest/
|
|
|
45
50
|
├── TestEventQueue.c
|
|
46
51
|
├── TestForestMonitor.c
|
|
47
52
|
├── TestSensorHal.c
|
|
48
|
-
|
|
53
|
+
├── TestUartDriver.c
|
|
54
|
+
├── TestRainGauge.c
|
|
55
|
+
└── TestCalibration.c
|
|
49
56
|
```
|
|
50
57
|
|
|
51
58
|
---
|
|
@@ -64,6 +71,27 @@ wondrous_forest/
|
|
|
64
71
|
| TestSensorHal.c | Traditional — HAL has no private statics |
|
|
65
72
|
| TestUartDriver.c | Traditional — UART driver has no private statics |
|
|
66
73
|
| TestCalibration.c | `TEST_PARTIAL_PRIVATE_MODULE_AT` — two same-named modules |
|
|
74
|
+
| TestRainGauge.c | `TEST_PARTIAL_PUBLIC_MODULE` + a subtracted, stubbed function |
|
|
75
|
+
|
|
76
|
+
---
|
|
77
|
+
|
|
78
|
+
## What a Partial Carries
|
|
79
|
+
|
|
80
|
+
A Partial brings along what its selected functions rely on. `TestRainGauge.c`
|
|
81
|
+
selects RainGauge's public functions and subtracts one of them. Those
|
|
82
|
+
functions rely on code the test does not select, so the Partial carries it.
|
|
83
|
+
Run the test with `--verbosity=debug` to see each carried item and why.
|
|
84
|
+
|
|
85
|
+
| Carried item | Why the Partial needs it |
|
|
86
|
+
|---|---|
|
|
87
|
+
| `RainGauge_TipsToMicrometers()` | `RainGauge.h` defines this `static inline` helper, and `RainGauge_Update()` calls it |
|
|
88
|
+
| `extern inline` prototype of `ForestUnits_MicrometersToTenthsMm()` | `ForestUnits.h` defines the function C99 `inline`. The prototype makes the Partial hold its external definition |
|
|
89
|
+
| Prototype of `RainGauge_ReportStorm()` | The test subtracts this function and defines a stub. `RainGauge_Update()` calls the stub |
|
|
90
|
+
| Weak definition of `g_rain_tip_count` | `RainGauge.h` declares the counter `extern`. Its real definition in `RainTipIsr.c`, which the test links, takes precedence |
|
|
91
|
+
|
|
92
|
+
Each carried item keeps its original spelling. A `#line` directive ahead of
|
|
93
|
+
each points back to its original file and line. Coverage of the carried
|
|
94
|
+
helper therefore counts toward `RainGauge.h`.
|
|
67
95
|
|
|
68
96
|
---
|
|
69
97
|
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
#ifndef FOREST_UNITS_H
|
|
9
|
+
#define FOREST_UNITS_H
|
|
10
|
+
|
|
11
|
+
#include "Types.h"
|
|
12
|
+
|
|
13
|
+
/* Unit conversions shared across the station, written as C99 inline functions.
|
|
14
|
+
* Every caller sees the body and may inline it. An unoptimized call links to an
|
|
15
|
+
* external definition instead. C99 places that definition in the one source file
|
|
16
|
+
* that declares the function `extern inline`. This header has no source file of
|
|
17
|
+
* its own, so RainGauge.c holds the definition. */
|
|
18
|
+
inline uint32 ForestUnits_MicrometersToTenthsMm(uint32 micrometers)
|
|
19
|
+
{
|
|
20
|
+
return micrometers / 100u;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
#endif /* FOREST_UNITS_H */
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
#include "Types.h"
|
|
9
|
+
#include "RainGauge.h"
|
|
10
|
+
#include "ForestUnits.h"
|
|
11
|
+
#include "UartDriver.h"
|
|
12
|
+
|
|
13
|
+
/* Makes this file hold the external definition of a ForestUnits.h inline function */
|
|
14
|
+
extern inline uint32 ForestUnits_MicrometersToTenthsMm(uint32 micrometers);
|
|
15
|
+
|
|
16
|
+
static uint32 s_tips_at_update;
|
|
17
|
+
static uint32 s_rainfall_um;
|
|
18
|
+
static bool s_storm;
|
|
19
|
+
|
|
20
|
+
void RainGauge_Init(void)
|
|
21
|
+
{
|
|
22
|
+
s_tips_at_update = g_rain_tip_count;
|
|
23
|
+
s_rainfall_um = 0u;
|
|
24
|
+
s_storm = false;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/* Adds the rain since the last update and reports a storm once, as it begins */
|
|
28
|
+
void RainGauge_Update(void)
|
|
29
|
+
{
|
|
30
|
+
uint32 tips = g_rain_tip_count;
|
|
31
|
+
uint32 minute_um = RainGauge_TipsToMicrometers(tips - s_tips_at_update);
|
|
32
|
+
bool storm = (minute_um * RAIN_GAUGE_UPDATES_PER_HOUR) >= RAIN_GAUGE_STORM_UM_PER_HOUR;
|
|
33
|
+
|
|
34
|
+
s_tips_at_update = tips;
|
|
35
|
+
s_rainfall_um += minute_um;
|
|
36
|
+
|
|
37
|
+
if (storm && !s_storm) { RainGauge_ReportStorm(); }
|
|
38
|
+
s_storm = storm;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
uint32 RainGauge_GetRainfallUm(void)
|
|
42
|
+
{
|
|
43
|
+
return s_rainfall_um;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
uint32 RainGauge_GetRainfallTenthsMm(void)
|
|
47
|
+
{
|
|
48
|
+
return ForestUnits_MicrometersToTenthsMm(s_rainfall_um);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
bool RainGauge_IsStorm(void)
|
|
52
|
+
{
|
|
53
|
+
return s_storm;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
void RainGauge_ReportStorm(void)
|
|
57
|
+
{
|
|
58
|
+
UartDriver_SendString("STORM\r\n");
|
|
59
|
+
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
#ifndef RAIN_GAUGE_H
|
|
9
|
+
#define RAIN_GAUGE_H
|
|
10
|
+
|
|
11
|
+
#include "Types.h"
|
|
12
|
+
|
|
13
|
+
/* A tipping-bucket gauge. The bucket tips once for each 0.2 mm of rain. */
|
|
14
|
+
#define RAIN_GAUGE_UM_PER_TIP (200u)
|
|
15
|
+
|
|
16
|
+
/* Rain falling at 20 mm per hour or more is a storm */
|
|
17
|
+
#define RAIN_GAUGE_STORM_UM_PER_HOUR (20000u)
|
|
18
|
+
|
|
19
|
+
/* The station updates the gauge once a minute */
|
|
20
|
+
#define RAIN_GAUGE_UPDATES_PER_HOUR (60u)
|
|
21
|
+
|
|
22
|
+
/* Bucket tips since power-up. The tip interrupt in RainTipIsr.c defines and
|
|
23
|
+
* counts it. */
|
|
24
|
+
extern uint32 g_rain_tip_count;
|
|
25
|
+
|
|
26
|
+
/* Shared with the station's display code, which shows rainfall between updates */
|
|
27
|
+
static inline uint32 RainGauge_TipsToMicrometers(uint32 tips)
|
|
28
|
+
{
|
|
29
|
+
return tips * RAIN_GAUGE_UM_PER_TIP;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
void RainGauge_Init(void);
|
|
33
|
+
void RainGauge_Update(void);
|
|
34
|
+
uint32 RainGauge_GetRainfallUm(void);
|
|
35
|
+
uint32 RainGauge_GetRainfallTenthsMm(void);
|
|
36
|
+
bool RainGauge_IsStorm(void);
|
|
37
|
+
void RainGauge_ReportStorm(void);
|
|
38
|
+
|
|
39
|
+
#endif /* RAIN_GAUGE_H */
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
#include "Types.h"
|
|
9
|
+
#include "RainTipIsr.h"
|
|
10
|
+
#include "RainGauge.h"
|
|
11
|
+
|
|
12
|
+
uint32 g_rain_tip_count = 0u;
|
|
13
|
+
|
|
14
|
+
void RainTipIsr_Handler(void)
|
|
15
|
+
{
|
|
16
|
+
g_rain_tip_count++;
|
|
17
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
#ifndef RAIN_TIP_ISR_H
|
|
9
|
+
#define RAIN_TIP_ISR_H
|
|
10
|
+
|
|
11
|
+
/* The rain gauge's bucket-tip interrupt handler */
|
|
12
|
+
void RainTipIsr_Handler(void);
|
|
13
|
+
|
|
14
|
+
#endif /* RAIN_TIP_ISR_H */
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/* =========================================================================
|
|
2
|
+
Ceedling - Test-Centered Build System for C
|
|
3
|
+
ThrowTheSwitch.org
|
|
4
|
+
Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
SPDX-License-Identifier: MIT
|
|
6
|
+
========================================================================= */
|
|
7
|
+
|
|
8
|
+
/* Partials pattern: TEST_PARTIAL_PUBLIC_MODULE + TEST_PARTIAL_CONFIG subtraction
|
|
9
|
+
* Tests RainGauge's public functions. The Partial carries what they rely on
|
|
10
|
+
* beyond the functions this test selects:
|
|
11
|
+
* - RainGauge_TipsToMicrometers(), a static inline helper RainGauge.h defines.
|
|
12
|
+
* - The extern inline prototype that makes RainGauge.c hold the external
|
|
13
|
+
* definition of ForestUnits_MicrometersToTenthsMm().
|
|
14
|
+
* - The prototype of RainGauge_ReportStorm(), which this test subtracts and
|
|
15
|
+
* stubs below.
|
|
16
|
+
* RainGauge.h declares g_rain_tip_count extern. RainTipIsr.c defines it, and
|
|
17
|
+
* this test links RainTipIsr.c to simulate bucket tips. The Partial's weak
|
|
18
|
+
* definition of the counter gives way to that real one.
|
|
19
|
+
* Run with --verbosity=debug to see what the Partial carries and why. */
|
|
20
|
+
|
|
21
|
+
#include "unity.h"
|
|
22
|
+
#include "ceedling.h"
|
|
23
|
+
#include "RainTipIsr.h"
|
|
24
|
+
|
|
25
|
+
#include TEST_PARTIAL_PUBLIC_MODULE(RainGauge)
|
|
26
|
+
TEST_PARTIAL_CONFIG(RainGauge, -RainGauge_ReportStorm)
|
|
27
|
+
|
|
28
|
+
#include "Types.h"
|
|
29
|
+
|
|
30
|
+
static uint8 s_storm_reports;
|
|
31
|
+
|
|
32
|
+
/* Stands in for the subtracted RainGauge_ReportStorm(). The carried prototype
|
|
33
|
+
* lets RainGauge_Update() call it. */
|
|
34
|
+
void RainGauge_ReportStorm(void)
|
|
35
|
+
{
|
|
36
|
+
s_storm_reports++;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
static void TipBucket(uint32 times)
|
|
40
|
+
{
|
|
41
|
+
while (times-- > 0u) { RainTipIsr_Handler(); }
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
void setUp(void)
|
|
45
|
+
{
|
|
46
|
+
g_rain_tip_count = 0u;
|
|
47
|
+
s_storm_reports = 0u;
|
|
48
|
+
RainGauge_Init();
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
void tearDown(void)
|
|
52
|
+
{
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
void test_Rainfall_StartsAtZero(void)
|
|
56
|
+
{
|
|
57
|
+
TEST_ASSERT_EQUAL_UINT32(0u, RainGauge_GetRainfallUm());
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
void test_Init_IgnoresTipsBeforeIt(void)
|
|
61
|
+
{
|
|
62
|
+
TipBucket(4u);
|
|
63
|
+
RainGauge_Init();
|
|
64
|
+
RainGauge_Update();
|
|
65
|
+
TEST_ASSERT_EQUAL_UINT32(0u, RainGauge_GetRainfallUm());
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
void test_Update_AddsTwoTenthsOfAMillimeterPerTip(void)
|
|
69
|
+
{
|
|
70
|
+
TipBucket(3u);
|
|
71
|
+
RainGauge_Update();
|
|
72
|
+
TEST_ASSERT_EQUAL_UINT32(600u, RainGauge_GetRainfallUm());
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
void test_Update_AccumulatesRainfallAcrossUpdates(void)
|
|
76
|
+
{
|
|
77
|
+
TipBucket(1u);
|
|
78
|
+
RainGauge_Update();
|
|
79
|
+
TipBucket(1u);
|
|
80
|
+
RainGauge_Update();
|
|
81
|
+
TEST_ASSERT_EQUAL_UINT32(400u, RainGauge_GetRainfallUm());
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
void test_GetRainfallTenthsMm_ConvertsMicrometers(void)
|
|
85
|
+
{
|
|
86
|
+
/* 5 tips = 1000 um = 1.0 mm */
|
|
87
|
+
TipBucket(5u);
|
|
88
|
+
RainGauge_Update();
|
|
89
|
+
TEST_ASSERT_EQUAL_UINT32(10u, RainGauge_GetRainfallTenthsMm());
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
void test_Update_OneTipAMinuteIsNotAStorm(void)
|
|
93
|
+
{
|
|
94
|
+
/* 200 um in a minute = 12 mm per hour */
|
|
95
|
+
TipBucket(1u);
|
|
96
|
+
RainGauge_Update();
|
|
97
|
+
TEST_ASSERT_FALSE(RainGauge_IsStorm());
|
|
98
|
+
TEST_ASSERT_EQUAL_UINT8(0u, s_storm_reports);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
void test_Update_TwoTipsAMinuteReportAStorm(void)
|
|
102
|
+
{
|
|
103
|
+
/* 400 um in a minute = 24 mm per hour */
|
|
104
|
+
TipBucket(2u);
|
|
105
|
+
RainGauge_Update();
|
|
106
|
+
TEST_ASSERT_TRUE(RainGauge_IsStorm());
|
|
107
|
+
TEST_ASSERT_EQUAL_UINT8(1u, s_storm_reports);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
void test_Update_ReportsAContinuingStormOnce(void)
|
|
111
|
+
{
|
|
112
|
+
TipBucket(2u);
|
|
113
|
+
RainGauge_Update();
|
|
114
|
+
TipBucket(3u);
|
|
115
|
+
RainGauge_Update();
|
|
116
|
+
TEST_ASSERT_TRUE(RainGauge_IsStorm());
|
|
117
|
+
TEST_ASSERT_EQUAL_UINT8(1u, s_storm_reports);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
void test_Update_EndsTheStormWhenRainEases(void)
|
|
121
|
+
{
|
|
122
|
+
TipBucket(2u);
|
|
123
|
+
RainGauge_Update();
|
|
124
|
+
RainGauge_Update();
|
|
125
|
+
TEST_ASSERT_FALSE(RainGauge_IsStorm());
|
|
126
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# =========================================================================
|
|
2
|
+
# Ceedling - Test-Centered Build System for C
|
|
3
|
+
# ThrowTheSwitch.org
|
|
4
|
+
# Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
# SPDX-License-Identifier: MIT
|
|
6
|
+
# =========================================================================
|
|
7
|
+
|
|
8
|
+
# Writes logs that hold only the current build's entries, such as gdb crash backtraces and
|
|
9
|
+
# sanitizer findings. A build's first write to a log replaces whatever an earlier build left
|
|
10
|
+
# there, and its later writes append. Build threads share one writer, so deciding first or
|
|
11
|
+
# later and writing happen together under one lock, and an append never lands before the
|
|
12
|
+
# write that replaces the file.
|
|
13
|
+
class BuildLogWriter
|
|
14
|
+
|
|
15
|
+
constructor :file_wrapper
|
|
16
|
+
|
|
17
|
+
def setup
|
|
18
|
+
@written = []
|
|
19
|
+
@mutex = Mutex.new
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
# `separator` goes between entries appended to one log
|
|
23
|
+
def write(filepath, text, separator: '')
|
|
24
|
+
@mutex.synchronize do
|
|
25
|
+
first = !@written.include?( filepath )
|
|
26
|
+
@written << filepath if first
|
|
27
|
+
|
|
28
|
+
@file_wrapper.mkdir_for( filepath )
|
|
29
|
+
@file_wrapper.write( filepath, first ? text : separator + text, first ? 'w' : 'a' )
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
end
|
|
@@ -22,15 +22,15 @@ Together these calls let the c_extractor classes behave like a small hand-writte
|
|
|
22
22
|
|
|
23
23
|
The most important method is `collect_balanced`. It is given an open character and a matching close character, such as `{` and `}`. The scanner must already be sitting on the open character. `collect_balanced` walks forward, counting how deep it is inside nested pairs. It stops the moment the count returns to zero, at the matching close character. Along the way it treats anything inside a string or character literal as inert text, so a stray `}` inside a quoted string can never be mistaken for the end of the group. It also replaces any comment it passes through with a single space, so a brace hiding inside a comment cannot confuse the count either. This one method is what lets the subsystem find the true end of a function body, no matter how deeply that body nests loops, conditionals, or braced initializers.
|
|
24
24
|
|
|
25
|
-
Other methods in this toolkit skip a string or character literal safely, honoring backslash escapes so an escaped quote does not end the literal early. Others skip whitespace and comments, skip runs of stray semicolons, and strip away compiler-specific syntax such as `__attribute__((...))` or `__declspec(...)`. These extensions are stripped because they can otherwise be mistaken for part of a function's parameter list or a variable's declaration.
|
|
25
|
+
Other methods in this toolkit skip a string or character literal safely, honoring backslash escapes so an escaped quote does not end the literal early. Others skip whitespace and comments, skip runs of stray semicolons, and strip away compiler-specific syntax such as `__attribute__((...))` or `__declspec(...)`. These extensions are stripped because they can otherwise be mistaken for part of a function's parameter list or a variable's declaration. Type keywords and specifiers, such as `_Atomic` and `typeof(...)`, stay.
|
|
26
26
|
|
|
27
27
|
## Recognizing Functions
|
|
28
28
|
|
|
29
29
|
`CExtractorFunctions` finds function declarations and function definitions. A declaration is a bare prototype ending in a semicolon. A definition carries a full body in braces.
|
|
30
30
|
|
|
31
|
-
The extractor walks forward from a candidate starting point, tracking how deep it is inside parentheses. It also watches for a few signs that what it is looking at is not actually a function. A
|
|
31
|
+
The extractor walks forward from a candidate starting point, tracking how deep it is inside parentheses. It also watches for a few signs that what it is looking at is not actually a function. A name inside parentheses, as in `int (*hook)(int)`, declares a function only when a parameter list follows it, as in `int (*get(void))(int)`. Otherwise it signals a variable, such as a function pointer. A pointer inside the parameter list only declares a parameter. A `[` appearing before any `(` signals an array variable. An `=` appearing outside any parentheses signals a variable with an initializer. An asm label, as in `int g asm("sym");`, ends a declaration with a `)` of its own, so the extractor passes over it. Unexpanded macros may sit around a label, so a labeled declaration is a function's when it holds a group that opens like a parameter list. A parameter list is empty or opens with a word, and a macro's argument such as `(4)` doesn't. Once these possibilities are ruled out, the extractor knows it has found a genuine function signature.
|
|
32
32
|
|
|
33
|
-
For a definition, the extractor calls on `collect_balanced` to pull the complete function body, including every nested brace inside it. For a declaration, it confirms the signature is immediately followed by a semicolon. Either way, the function's name is pulled out with a small regex,
|
|
33
|
+
For a definition, the extractor calls on `collect_balanced` to pull the complete function body, including every nested brace inside it. For a declaration, it confirms the signature is immediately followed by a semicolon. Either way, the function's name is pulled out with a small regex. A specifier that takes parentheses, as in `typeof(int) f(void)`, names no function, so it is passed over with its argument. Any storage-class or inline keyword before the name, such as `static`, `extern` or `inline`, is split off separately, so a caller can ask about visibility without re-parsing the signature. Every other word keeps its place, `const` and `_Noreturn` included.
|
|
34
34
|
|
|
35
35
|
## Recognizing Variables
|
|
36
36
|
|
|
@@ -38,19 +38,27 @@ For a definition, the extractor calls on `collect_balanced` to pull the complete
|
|
|
38
38
|
|
|
39
39
|
The extractor tracks three independent counts at the same time: parentheses, square brackets, and braces. Parentheses matter for function-pointer variables. Square brackets matter for arrays. Braces matter for initializer lists, such as `int values[] = {1, 2, 3};`. The extractor only considers the declaration finished when all three counts return to zero at a semicolon.
|
|
40
40
|
|
|
41
|
-
|
|
41
|
+
Fallback preprocessing leaves comments in the text. Before a declaration is checked, split, and read, each comment in it becomes a single space. String and character literals stay whole, so `"//"` survives. A record's `original` text keeps its comments, because promotion finds the statement in a function body by that text.
|
|
42
|
+
|
|
43
|
+
Once the declaration text is captured, it is split at every top-level comma into one record per variable. A comma inside parentheses, brackets, braces, or a literal separates nothing. The first declarator gives the base type, which is its text ahead of its first star, or else ahead of its name, without its initializer. Each later declarator takes that base type. Each variable's name, base type, array suffix, and any decorating keywords are then pulled out of the now-isolated text. A name may hold `$`, as GCC and Clang allow.
|
|
44
|
+
|
|
45
|
+
Compiler extensions such as attributes are stripped before a name and type are read. A C23 attribute in double brackets strips too, wherever it sits. Only an attribute opens with two brackets, so an array size never strips. The record's text keeps the attribute, and a leading one stays at the front, where C requires it. The function extractor passes over one whole, so its brackets never read as an array's. Type keywords such as `_Atomic`, `_Bool`, and `_Thread_local` stay, as does a type a specifier spells, such as `typeof(int)`. A generated extern repeats the type, and it must agree with the definition.
|
|
46
|
+
|
|
47
|
+
An asm label, as in `int g __asm__("sym") = 1;`, names the variable's symbol. A compiler applies it to the declarations it sees, so a test's own extern must carry it too. `CExtractorDeclarator::AsmLabel` finds a label outside brackets and ahead of any initializer. The record keeps it in `asm_label`, and its name, type, and declarator are read without it.
|
|
48
|
+
|
|
49
|
+
A function pointer or a pointer to an array names its variable inside parentheses, past any stars and qualifiers. `CExtractorDeclarator` reads that group for the function and variable extractors alike. A variable keeps the group as its `declarator`, so generated code can declare it whole, as in `extern int (*hook)(int);`.
|
|
42
50
|
|
|
43
51
|
## Recognizing Types and Directives
|
|
44
52
|
|
|
45
|
-
`CExtractorDefinitions` finds two kinds of type-level content. The first is a `typedef` statement, tracked from the `typedef` keyword through to its closing semicolon, watching only for balanced braces since a struct or union body can sit inside it. The second is a standalone `struct`, `enum`, or `union` definition, such as `struct Foo { ... };`.
|
|
53
|
+
`CExtractorDefinitions` finds two kinds of type-level content. The first is a `typedef` statement, tracked from the `typedef` keyword through to its closing semicolon, watching only for balanced braces since a struct or union body can sit inside it. The second is a standalone `struct`, `enum`, or `union` definition, such as `struct Foo { ... };`. The same keywords lead variables and functions too, and each of those can have a braced body. The extractor reads two places to tell them apart. Ahead of the brace, it rules out what no type's head holds. A top-level `=` makes an initialized variable. A top-level `*`, or a head ending in `(void)` or a pointer group, makes a function. An attribute's own parentheses don't count. After the closing brace, it passes over attributes such as `__attribute__((packed))` and looks for a semicolon. If a variable name appears instead, as in `struct Foo { ... } var;`, the extractor backs off entirely and lets the variable extractor handle it.
|
|
46
54
|
|
|
47
|
-
`CExtractorPreprocessing` finds preprocessor directives such as `#define`, correctly following a backslash-newline so a directive spanning several physical lines is still read as one logical line. It also finds C11 and C23 `static_assert` statements. Separately, and outside the main scanning loop described below, it offers the ability to find every call to a specific named macro anywhere in a body of text and to parse out that call's arguments. This capability is used directly by Ceedling's Partials feature to read its own configuration macros (documented in `partials/`).
|
|
55
|
+
`CExtractorPreprocessing` finds preprocessor directives such as `#define`, correctly following a backslash-newline so a directive spanning several physical lines is still read as one logical line. It also finds C11 and C23 `static_assert` statements and bare macro invocations at the top level. A bare invocation, such as an x-macro call, ends without a semicolon. An attribute or a specifier such as `typeof` has the same shape where it leads a declaration, so the detector leaves those for the other recognizers. Separately, and outside the main scanning loop described below, it offers the ability to find every call to a specific named macro anywhere in a body of text and to parse out that call's arguments. This capability is used directly by Ceedling's Partials feature to read its own configuration macros (documented in `partials/`).
|
|
48
56
|
|
|
49
57
|
## Assembling One Module's Worth of Content
|
|
50
58
|
|
|
51
59
|
`CExtractor` is the class other code actually calls. It reads a file, or an in-memory string, and produces one combined result describing everything of interest inside it.
|
|
52
60
|
|
|
53
|
-
Internally it works through the source from beginning to end. At each position, it tries each of the recognizers described above, in a fixed order: preprocessor directives, typedefs, static assertions, aggregate type definitions, function definitions, function declarations, and finally plain variable declarations. The first recognizer that succeeds wins, and the recognizers are ordered by the uniqueness of the features they extract. This helps ensure that features that could be confused for one another are kept distinct. Scanning for
|
|
61
|
+
Internally it works through the source from beginning to end. At each position, it tries each of the recognizers described above, in a fixed order: preprocessor directives, typedefs, static assertions, aggregate type definitions, bare macro invocations, function definitions, function declarations, and finally plain variable declarations. The first recognizer that succeeds wins, and the recognizers are ordered by the uniqueness of the features they extract. This helps ensure that features that could be confused for one another are kept distinct. Scanning for the next feature resumes at the position immediately following the previous one. If nothing recognizes the text at a given position, scanning stops there, and whatever has been gathered so far is returned.
|
|
54
62
|
|
|
55
63
|
Rather than reading an entire file into memory at once, `CExtractor` reads in modest chunks, growing its working buffer only as needed until a recognizer succeeds or the end of the file is reached. This keeps memory use reasonable even for a very large source file. A safety ceiling on how large that buffer is allowed to grow guards against a genuinely malformed or unbounded input.
|
|
56
64
|
|
|
@@ -11,6 +11,7 @@ require 'ceedling/exceptions'
|
|
|
11
11
|
require 'ceedling/c_extractor/c_extractor_constants'
|
|
12
12
|
require 'ceedling/c_extractor/c_extractor_preprocessing'
|
|
13
13
|
require 'ceedling/c_extractor/c_extractor_definitions'
|
|
14
|
+
require 'ceedling/c_extractor/c_extractor_defined_type'
|
|
14
15
|
require 'ceedling/c_extractor/c_extractor_types'
|
|
15
16
|
|
|
16
17
|
class CExtractor
|
|
@@ -146,7 +147,7 @@ class CExtractor
|
|
|
146
147
|
if typedef_def
|
|
147
148
|
line_num, cumulative_newlines =
|
|
148
149
|
_compute_line_info(io, call_start, td_start, cumulative_newlines)
|
|
149
|
-
stmt = CStatement.new(text: typedef_def, line_num: line_num)
|
|
150
|
+
stmt = CStatement.new(text: typedef_def, line_num: line_num, **CExtractorDefinedType.names( typedef_def ))
|
|
150
151
|
type_definitions << stmt
|
|
151
152
|
sequence << stmt
|
|
152
153
|
next
|
|
@@ -176,7 +177,7 @@ class CExtractor
|
|
|
176
177
|
if agg_def
|
|
177
178
|
line_num, cumulative_newlines =
|
|
178
179
|
_compute_line_info(io, call_start, agg_start, cumulative_newlines)
|
|
179
|
-
stmt = CStatement.new(text: agg_def, line_num: line_num)
|
|
180
|
+
stmt = CStatement.new(text: agg_def, line_num: line_num, **CExtractorDefinedType.names( agg_def ))
|
|
180
181
|
aggregate_definitions << stmt
|
|
181
182
|
sequence << stmt
|
|
182
183
|
next
|
|
@@ -184,16 +185,17 @@ class CExtractor
|
|
|
184
185
|
|
|
185
186
|
# A bare, top-level, semicolon-less macro invocation (e.g. an x-macro call that
|
|
186
187
|
# expands to a full function definition once the macro itself is applied) has no
|
|
187
|
-
# leading '#'
|
|
188
|
-
# preprocessing never expands it, so it reaches every
|
|
189
|
-
# unexpanded text. Tried here, before the
|
|
190
|
-
# those scan forward for their own
|
|
191
|
-
#
|
|
192
|
-
#
|
|
193
|
-
# will happily treat that construct's
|
|
194
|
-
#
|
|
195
|
-
# invocation here, before any of that can
|
|
196
|
-
# can follow it, not only variable
|
|
188
|
+
# leading '#' and none of what CExtractorPreprocessing::NOT_AFTER_INVOCATION names
|
|
189
|
+
# after it. Directives-only preprocessing never expands it, so it reaches every
|
|
190
|
+
# extractor below as literal, unexpanded text. Tried here, before the
|
|
191
|
+
# signature-scanning extractors, because those scan forward for their own
|
|
192
|
+
# terminating '{'/';' with no check that what they started scanning actually
|
|
193
|
+
# looks like a signature -- given this shape immediately followed by an unrelated
|
|
194
|
+
# typedef, aggregate, or real function, they will happily treat that construct's
|
|
195
|
+
# own opening brace as if it belonged to this invocation, silently discarding the
|
|
196
|
+
# real content it swallows. Catching the invocation here, before any of that can
|
|
197
|
+
# happen, protects every construct that can follow it, not only variable
|
|
198
|
+
# declarations (the narrower, original shape).
|
|
197
199
|
invocation, invocation_start = extract_next_feature(
|
|
198
200
|
io: io,
|
|
199
201
|
max_length: @max_buffer_length,
|
|
@@ -253,6 +255,14 @@ class CExtractor
|
|
|
253
255
|
line_num, cumulative_newlines =
|
|
254
256
|
_compute_line_info(io, call_start, vars_start, cumulative_newlines)
|
|
255
257
|
vars.each { |v| v.line_num = line_num }
|
|
258
|
+
# A declaration defining its type, as `static struct { int n; } s;` does, defines it
|
|
259
|
+
# ahead of its variables, which share it
|
|
260
|
+
defined = vars.first.defined_type
|
|
261
|
+
if defined
|
|
262
|
+
defined.line_num = line_num
|
|
263
|
+
aggregate_definitions << defined
|
|
264
|
+
sequence << defined
|
|
265
|
+
end
|
|
256
266
|
variable_declarations.concat(vars)
|
|
257
267
|
sequence.concat(vars)
|
|
258
268
|
next
|
|
@@ -341,8 +351,9 @@ class CExtractor
|
|
|
341
351
|
# Create a new scanner for the current buffer
|
|
342
352
|
scanner = StringScanner.new(buffer)
|
|
343
353
|
|
|
344
|
-
# Skip any deadspace
|
|
345
|
-
|
|
354
|
+
# Skip any deadspace, a stray ';' included. When a feature ends at the buffer's last byte,
|
|
355
|
+
# skip_semicolons below can't see the ';' after it, so that ';' arrives here.
|
|
356
|
+
@code_text.skip_deadspace(scanner, semicolons: true)
|
|
346
357
|
|
|
347
358
|
# If reached end of string having found no feature -- restart loop to containing loop to grow buffer
|
|
348
359
|
next if scanner.eos?
|