Merge branch 'fix/logic-parser/assigns-merging' into 'stable/titanium' (83db8b4b) · Commits · Charles Southerland / frama-c · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frama-c
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

83db8b4b

Commit 83db8b4b authored 4 years ago by Virgile Prevosto

Downloads
- Plain Diff

Merge branch 'fix/logic-parser/assigns-merging' into 'stable/titanium'

Fixes assigns merging

See merge request frama-c/frama-c!2936

parents cf01dcb0 b2df74b1

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/kernel_internals/parsing/logic_parser.mly 35 additions, 11 deletions

src/kernel_internals/parsing/logic_parser.mly
src/kernel_services/ast_printing/cil_printer.ml 7 additions, 2 deletions

src/kernel_services/ast_printing/cil_printer.ml
src/kernel_services/plugin_entry_points/kernel.ml 2 additions, 0 deletions

src/kernel_services/plugin_entry_points/kernel.ml
src/kernel_services/plugin_entry_points/kernel.mli 2 additions, 0 deletions

src/kernel_services/plugin_entry_points/kernel.mli
tests/libc/oracle/fc_libc.1.res.oracle 1 addition, 1 deletion

tests/libc/oracle/fc_libc.1.res.oracle
tests/rte/oracle/assign4.res.oracle 2 additions, 4 deletions

tests/rte/oracle/assign4.res.oracle
tests/rte/oracle/assign5.res.oracle 7 additions, 5 deletions

tests/rte/oracle/assign5.res.oracle
tests/syntax/multiple_assigns.i 10 additions, 0 deletions

tests/syntax/multiple_assigns.i
tests/syntax/multiple_froms.i 17 additions, 0 deletions

tests/syntax/multiple_froms.i
tests/syntax/oracle/multiple_assigns.res.oracle 11 additions, 0 deletions

tests/syntax/oracle/multiple_assigns.res.oracle
tests/syntax/oracle/multiple_froms.res.oracle 23 additions, 0 deletions

tests/syntax/oracle/multiple_froms.res.oracle

with 117 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment