Code cleanup to increase cpplint-cleanliness #376

tautschnig · 2016-12-23T14:48:20Z

This patch series should go together with #333 as that one also helps cleanliness.

peterschrammel · 2017-01-10T18:18:50Z

src/solvers/flattening/boolbv.cpp

@@ -143,7 +143,7 @@ const bvt& boolbvt::convert_bv(const exprt &expr)
    bv_cache.insert(std::make_pair(expr, bvt()));
  if(!cache_result.second)
  {
-    //std::cerr << "Cache hit on " << expr << "\n";
+    // std::cerr << "Cache hit on " << expr << "\n";


Shouldn't this be guarded by #ifdef DEBUG? (several instances ahead)

peterschrammel · 2017-01-10T18:20:22Z

src/util/ieee_float.cpp

  set_sign(old_sign);

-  //mp_integer new_exp = exponent;
-  //mp_integer new_frac = fraction + dir;
+  // mp_integer new_exp = exponent;


code commented out? -> use #if 0 or remove

tautschnig · 2017-01-16T18:36:06Z

I have updated the changes to address the comments by @peterschrammel.

tautschnig · 2017-01-19T01:22:10Z

It seems that the status of #451 should be clarified before merging (or attempting to rebase) this one.

tautschnig · 2017-01-29T09:40:43Z

At this point I would declare the code base lint clean for practical purposes, with the exception of src/cegis, which I haven't heavily touched. See
all-issues.txt for any remaining ones. This file was generated using scripts/cpplint.py $(find src -name "*.h" -o -name "*.cpp") 2> all-issues.txt.

I will now work toward cleaning this commit series and do hope to find people to review it.

tautschnig · 2017-01-29T10:29:46Z

Commit series cleanup done. As reviewing at a diffstat of 717 files changed, 17618 insertions(+), 12827 deletions(-) is rather impractical, please do take a look at the commit summaries and let me know which ones raise the most interest. I'll then factor these out into separate pull requests, unless you want to cherry-pick them (which may or may not work well). - probably @peterschrammel, @kroening

tautschnig · 2017-02-02T13:13:46Z

So finally all checks are passing on this one.

peterschrammel · 2017-02-02T21:23:32Z

@tautschnig, this is on my list, but i will take a bit.

tautschnig · 2017-02-03T09:18:07Z

@peterschrammel Thanks a lot, much appreciated. Please, as said, do take the liberty to just browse the list of commit summaries and point at ones that you'd like to pick up first. I'll then happily prepare independent (and thus much easier to review) pull requests.

Using both of them is unnecessary. In cases where all virtual members are marked final, "protected" is no longer useful, thus use "private" instead.

Using "virtual" in those cases is redundant.

…ic output

Recommended by linter

tautschnig · 2017-02-14T19:01:46Z

I believe I've now addressed all comments and have also fixed any issues that have crept into the codebase in the meantime.

- No static std::string - No stack-allocated variable-length arrays - Use new/delete instead of malloc/free - Take the address before doing the cast

rjmunro · 2017-02-17T12:57:04Z

@kroening Can this be merged?

67c80fc Merge pull request diffblue#394 from diffblue/jeannie/LinkedHashMapIterators 6667484 Tests that the iteration order is correct. 38301ea Tests other methods and constructor in LinkedHashMap f795b3d Models other methods in LinkedHashMap. 25773a6 Tests entrySet(), keySet() and values() in LinkedHashMap ee8cfad Models keySet(), entrySet() and values() in LinkedHashMap. 02c8271 Merge pull request diffblue#393 from diffblue/jeannie/UpdateReadMeForSpec 81460d3 Update readme.md to include new style for specs 9efcce3 Merge pull request diffblue#396 from diffblue/antonia/clean-up-for-TG-1081 c902c03 Merge pull request diffblue#397 from diffblue/jeannie/ForgotAppendObjectDocs 772a977 Merge pull request diffblue#390 from diffblue/antonia/enable-fixed-tests 5bef2ff Merge pull request diffblue#398 from diffblue/antonia/ticket-references-bugfix ed1dca2 Merge pull request diffblue#395 from diffblue/allredj/disable-tests-failing-on-tg2717 c07841d Add more tests for String.getBytes(Charset) d568e47 Fix array index bug in String.getBytesUTF_16 2218407 Model String.getBytes(Charset) 9c3a8bc Clarify difference of String.getBytes from JDK cf1c23b Merge the two active scenarios in String.spec dd5d2d9 Remove support_v1 tag from String specs 5f9a7e1 Split String tests into Level 0 and Level 1+ f2877b9 Enable Class test that was blocked by TG-1081 034f3e0 Remove reference to TG-1081 from File model 43afde7 Force static initialiser for File model d95ff9e Remove reference to fixed bug from Date model 0807806 Remove references to fixed bugs from Arrays model cde4085 Remove references to fixed bugs from HashMap model d85fe5b Update RaceTimes references to TG-1404 and TG-1523 0e925e5 Update ticket number in HashMap.spec 03a5186 Enable TG-1404 tests fa051dd Delete ArrayList CustomType test file b0e853b Enable HashMap test previously blocked by TG-1877 44bfe0a Merge pull request diffblue#392 from diffblue/lajw/TG-2389-enable-tests 595dd5d Changes CProver helped methods in HashMap to protected. c52771c Merge pull request diffblue#385 from diffblue/jeannie/UpdateTestRunner de0abdc Enable tests fixed by recent test-gen fixes b64357a Remove ticket numbers from resolved bugfix tests 53eca00 Documents StringBuilder and StringBuffer append(Object) baec23f Merge pull request diffblue#389 from diffblue/antonia/enable-TG-2666-test b2f0258 Enable LinkedList test that was blocked by TG-2666 57e79e5 Add knownbug tests for TG-2717 80fa433 Merge pull request diffblue#387 from diffblue/forejtv/unsupportedcharsetexception 990129c Merge pull request diffblue#391 from diffblue/allredj/disable-html-report 97f32f6 Don't write to the Html report 4cb5996 Merge pull request diffblue#382 from diffblue/antonia/address-ArrayList-todos 6749702 Merge pull request diffblue#386 from diffblue/antonia/gauge-telemetry-off 546dfdc Move legacy style tests into main Gauge step 5be886f Mark UnsupportedCharsetException as untested 1c17838 Add regression test for side effects 8c836ab Add tests for ArrayLists w. (non-default) capacity 34a141d Address bugfix TODOs in ArrayList 563b631 Correct bug description in comment 3e7603d Merge pull request diffblue#383 from diffblue/antonia/reformat-HashSet-tests 5d4e013 [TG-2751] Added UnsupportedCharsetException 11b28fb Reformat HashSet.spec f77c3c4 Rename HashSet_L2.spec to HashSet_L0.spec a16a1e7 Move all HashSet Maven tests into HashSet.spec f21a2da Merge pull request diffblue#376 from diffblue/jeannie/LinkedHashMap 820c5f7 Merge pull request diffblue#380 from diffblue/jeannie/AppendObject af65f4d Tests java.lang.StringBuffer append(Object) a554517 Reformat tests in java.util.StringBuilder dd6d3f6 Models append(Object) for StringBuilder and StringBuffer. 8920399 Tests toString() methods on existing models where possible 647f4fe Tests toString() methods on existing models where possible 978273b Documents and implements toString() methods in existing models. 78020ee Documents java.util.LinkedHashMap fb0cf92 Tests java.util.LinkedHashMap 7a9df4e Models java.util.LinkedHashMap 5a8af60 Marks all methods as notModelled() for java.util.LinkedHashMap 8d6b149 Initial commit for java.util.LinkedHashMap 34b7c54 Merge pull request diffblue#359 from diffblue/forejtv/throwable-no-static e2230de Cleanup of unused (mostly static) variables 255013e Merge pull request diffblue#384 from diffblue/jeannie/DisableBoundedGenericHashMap f374d5f Merge pull request diffblue#381 from diffblue/justin/TG2600-Correction ce6328b Turn off Gauge telemetry on Travis 6ab2864 Updates TestRunner.java to mimic platform parameters. 8ee75a4 Disables a HashMap test that depends on bounded generic type. 3677c3a [TG-2600] correct a mistake in the L1RemoveLast test 4511813 Merge pull request diffblue#378 from diffblue/antonia/LinkedList-first-model 6bda7ea Add tests for LinkedList b5d4cbe Model LinkedList methods specified in TG-2600 aa6e90a Empty models for new classes 3c25555 Copy LinkedList and related classes from jdk 5e4d410 Merge pull request diffblue#373 from diffblue/romain/tests/activate-arrays-hashset-test#TG-1404 a0d9289 Activate some Arrays test 27d06b4 Activate tests for Hashset fixed by TG-1404 224962a Merge pull request diffblue#371 from diffblue/romain/tests/activate-after-fix-1404 ed26b28 Activate level 2 tests fixed by TG-1404 b59c1e9 Relabel known-bug for Level2 HashMap test 5c0041b Activate tests for HashMap.values fixed by TG-1404 2777872 Activate tests for HashMap.entrySet 50d3f2c Activate tests for HashMap.keySet fixed by TG-1404 6146215 Activate ArrayList test fixed by TG-1404 bc09fd7 Merge pull request diffblue#365 from diffblue/jeannie/getTimeZone 29cf7e0 Merge pull request diffblue#372 from diffblue/forejtv/bump-up-gauge-v bdd500a Change Gauge Java Maven Plugin to 0.6.6 190aa18 Tests java.util.TimeZone 170a992 Documents java.util.TimeZone in javadocs 9e52664 Models java.util.TimeZone constructor, getID, setID and getTimeZone. eac578e Tests sun.util.calendar.ZoneInfo b4be728 Documents sun.util.calendar.ZoneInfo in javadocs e5ffa98 Models the sun.util.calendar.ZoneInfo constructor and getTimeZone() 6d704ad Marks methods as notModelled() for sun.util.calendar.ZoneInfo d249adb Marks methods as notModelled() for java.util.TimeZone 7f71d8d Initial commit for sun.util.calendar.ZoneInfo. b53d9c1 Initial commit for java.util.TimeZone 056aad2 Merge pull request diffblue#368 from diffblue/allredj/fix-hashtable-spec 8848414 Merge pull request diffblue#370 from diffblue/allredj/stringbuffer-spec-small-correction 1d947e5 Small correction to StringBuffer spec file 42f1a93 Fix typo in hashtable spec file git-subtree-dir: benchmarks/LIBRARIES/models git-subtree-split: 67c80fcdcf82418b5e7099ae63dec3360b153f90

Allowing RHS null objects to be exported

kroening self-assigned this Jan 1, 2017

kroening added the enhancement label Jan 1, 2017

tautschnig force-pushed the lint-cleanup branch 2 times, most recently from 9a7c701 to 035c80c Compare January 8, 2017 19:38

peterschrammel requested changes Jan 10, 2017

View reviewed changes

tautschnig force-pushed the lint-cleanup branch 2 times, most recently from 539b533 to 8a619e5 Compare January 16, 2017 18:27

tautschnig force-pushed the lint-cleanup branch from 8a619e5 to 8b56c7f Compare January 25, 2017 21:30

peterschrammel added cleanup and removed enhancement labels Jan 26, 2017

tautschnig force-pushed the lint-cleanup branch 6 times, most recently from d06f90e to d0d6efe Compare January 28, 2017 03:01

tautschnig force-pushed the lint-cleanup branch 2 times, most recently from 58b2b3d to fb0f614 Compare January 29, 2017 10:26

tautschnig force-pushed the lint-cleanup branch 3 times, most recently from 52715fb to b0ea4e4 Compare January 31, 2017 19:34

tautschnig assigned peterschrammel Feb 1, 2017

tautschnig force-pushed the lint-cleanup branch from b0ea4e4 to 0d8515b Compare February 2, 2017 07:09

tautschnig and others added 16 commits February 14, 2017 18:59

"final" implies all the checks of "override"

6ef3410

Using both of them is unnecessary. In cases where all virtual members are marked final, "protected" is no longer useful, thus use "private" instead.

"override" implies a check for "virtual"

e573ba6

Using "virtual" in those cases is redundant.

fixup! Use pretty() instead of to_string() or operator<< for diagnost…

ac469c0

…ic output

Loop acceleration: Copyright headers

237e51a

Move loop accelaration regression test handler to suitable place

27d8c44

Storage-class specifier at beginning of declaration

0f9121f

Recommended by linter

Remove empty and unused file

2fdbe19

No ; after }

8ecf57a

Use std::pair directly when template arguments cannot be deduced

6bf2ebb

Avoid "using namespace"

a52f99c

Fix missing whitespace after ,

4f79919

Do not use anonymous namespaces

ed8cbae

Replace all empty ";"-only bodies by {} or alternative implementation

8cc0d53

Consistent formatting for thrown strings

73a058f

Linter overrides for MiniSat class names

4d057f9

Format multi-line string linter friendly

ee24aa9

tautschnig force-pushed the lint-cleanup branch from e86e092 to 89c5349 Compare February 14, 2017 19:01

tautschnig added 4 commits February 15, 2017 08:01

Follow the linter's advice on memory safety

9dda7a9

- No static std::string - No stack-allocated variable-length arrays - Use new/delete instead of malloc/free - Take the address before doing the cast

Whitespace and line breaks to match coding guidelines (part 2)

cd9d007

Do not silently ignore mod over floats - fail instead

959f618

Remove space following reference-to (&)

e501a05

tautschnig force-pushed the lint-cleanup branch from 89c5349 to e501a05 Compare February 15, 2017 08:02

tautschnig mentioned this pull request Feb 15, 2017

Java exception handling #506

Merged

peterschrammel mentioned this pull request Feb 16, 2017

cpplint fixes #554

Merged

kroening merged commit 0e2f389 into diffblue:master Feb 17, 2017

tautschnig deleted the lint-cleanup branch February 20, 2017 10:20

smowton pushed a commit to smowton/cbmc that referenced this pull request May 9, 2018

Merge pull request diffblue#376 from diffblue/bug/LVSA_export_rhs_null

a7f834a

Allowing RHS null objects to be exported

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Code cleanup to increase cpplint-cleanliness #376

Code cleanup to increase cpplint-cleanliness #376

tautschnig commented Dec 23, 2016

peterschrammel Jan 10, 2017

peterschrammel Jan 10, 2017

tautschnig commented Jan 16, 2017

tautschnig commented Jan 19, 2017

tautschnig commented Jan 29, 2017 •

edited

Loading

tautschnig commented Jan 29, 2017

tautschnig commented Feb 2, 2017

peterschrammel commented Feb 2, 2017

tautschnig commented Feb 3, 2017

tautschnig commented Feb 14, 2017

rjmunro commented Feb 17, 2017

Code cleanup to increase cpplint-cleanliness #376

Code cleanup to increase cpplint-cleanliness #376

Conversation

tautschnig commented Dec 23, 2016

peterschrammel Jan 10, 2017

Choose a reason for hiding this comment

peterschrammel Jan 10, 2017

Choose a reason for hiding this comment

tautschnig commented Jan 16, 2017

tautschnig commented Jan 19, 2017

tautschnig commented Jan 29, 2017 • edited Loading

tautschnig commented Jan 29, 2017

tautschnig commented Feb 2, 2017

peterschrammel commented Feb 2, 2017

tautschnig commented Feb 3, 2017

tautschnig commented Feb 14, 2017

rjmunro commented Feb 17, 2017

tautschnig commented Jan 29, 2017 •

edited

Loading