Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow merging of data structures #17

Merged
merged 2 commits into from
Sep 20, 2020
Merged

Allow merging of data structures #17

merged 2 commits into from
Sep 20, 2020

Conversation

awvwgk
Copy link
Member

@awvwgk awvwgk commented Sep 20, 2020

Merge policy:

  • copy key-value pair in case it is not present in table
  • drop key-value pair in case it is present in table
  • copy subtable in case it is not present in table
  • merge subtable in case it is present in table, using same merge policy
  • copy array in case it is not present in table
  • append array in case it is present in table

@codecov
Copy link

codecov bot commented Sep 20, 2020

Codecov Report

Merging #17 into master will increase coverage by 2.63%.
The diff coverage is 93.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #17      +/-   ##
==========================================
+ Coverage   82.05%   84.68%   +2.63%     
==========================================
  Files          35       39       +4     
  Lines        2285     2841     +556     
==========================================
+ Hits         1875     2406     +531     
- Misses        410      435      +25     
Impacted Files Coverage Δ
src/tomlf/build/merge.f90 85.29% <85.29%> (ø)
test/tftest/build.f90 100.00% <100.00%> (ø)
src/tomlf/type/array.f90 88.00% <0.00%> (-4.31%) ⬇️
src/tomlf/structure/vector.f90 92.14% <0.00%> (-1.20%) ⬇️
test/json2toml.f90 44.82% <0.00%> (ø)
test/json_de.f90 79.62% <0.00%> (ø)
test/json_ser.f90 94.73% <0.00%> (ø)
src/tomlf/utils/convert.f90 93.79% <0.00%> (+0.72%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46db655...33ff740. Read the comment docs.

@awvwgk awvwgk merged commit cb04d91 into toml-f:master Sep 20, 2020
@awvwgk awvwgk deleted the merge branch September 20, 2020 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant