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

Mos 1769: The core project does not build the correct differential tree for some very similar trees #30

Merged
merged 9 commits into from
Nov 2, 2024

Conversation

kniazkov
Copy link
Member

@kniazkov kniazkov commented Nov 2, 2024

Let's consider 2 trees:

A(B1,B2,B3,B4(C1,C2(X(R),D1,D2(E1,E2<'aaa'>,E3)),C3),B5)
A(B1,B2,B3,B4(C1,C2(X(Q1,Q2,Q3),X(R),D2,D2(E1,E2<'bbb'>,E3)),C3),B5)

Expected diff: 1 insertion X(Q1,Q2,Q3) and 1 replacement E2<'aaa'> -> E2<'bbb'>
Actual diff: 3 insertions and 3 replacement

This is because a node is added before a node with the same type
It's a very common occurrence. For example, adding an import before another import or declaring a variable before another variable.

@kniazkov kniazkov requested a review from pollyvolk November 2, 2024 11:18
Copy link

codecov bot commented Nov 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (2e341d4) to head (abb55a7).
Report is 9 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##              master       #30    +/-   ##
============================================
  Coverage     100.00%   100.00%            
- Complexity       607       628    +21     
============================================
  Files             62        64     +2     
  Lines           1870      1970   +100     
  Branches         276       292    +16     
============================================
+ Hits            1870      1970   +100     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kniazkov
Copy link
Member Author

kniazkov commented Nov 2, 2024

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Nov 2, 2024

@rultor merge

@kniazkov OK, I'll try to merge now. You can check the progress of the merge here.

@rultor rultor merged commit abb55a7 into cqfn:master Nov 2, 2024
3 checks passed
@rultor
Copy link
Collaborator

rultor commented Nov 2, 2024

@rultor merge

@kniazkov Done! FYI, the full log is here (took me 8min).

@kniazkov
Copy link
Member Author

kniazkov commented Nov 2, 2024

@rultor release, tag is 1.2.1

@rultor
Copy link
Collaborator

rultor commented Nov 2, 2024

@rultor release, tag is 1.2.1

@kniazkov OK, I will release it now. Please check the progress here.

@rultor
Copy link
Collaborator

rultor commented Nov 2, 2024

@rultor release, tag is 1.2.1

@kniazkov Done! FYI, the full log is here (took me 10min).

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.

2 participants