Commit 133a6f4

authored

Merge pull request #4613 from xbauch/feature/json-conflict-resolution

Simple conflict-resolution for JSON symbol tables

2 parents f541d64 + 16e2a14 commit 133a6f4Copy full SHA for 133a6f4

11 files changed

+5707

-8

lines changed

regression/cbmc/link_json_symtabs
src
- goto-programs
- json-symtab-language
  - json_symtab_language.cpp
  - module_dependencies.txt
unit/goto-programs
- goto_program_validate.cpp

11 files changed

+5707

-8

lines changed

`‎regression/cbmc/link_json_symtabs/one.adb`

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +procedure One (X : in out Integer) is
 +begin
 +   X := X + 1;
 +end One;

Comments

(0)