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

template version with re2c scanner #36

Merged
merged 105 commits into from
Feb 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
befd90d
cleanup
nlohmann Jan 31, 2015
0870100
adjustments to coverall
nlohmann Jan 31, 2015
d8f58b2
coveralls adjustment
nlohmann Jan 31, 2015
9dff05d
exclude more files from coveralls
nlohmann Jan 31, 2015
385865c
remove checks in iterator
nlohmann Jan 31, 2015
5ec4336
more test cases
nlohmann Jan 31, 2015
a5188b0
strings are escaped
nlohmann Feb 4, 2015
16fa85e
Zwischenstand
nlohmann Feb 5, 2015
ac274de
Zwischenstand
nlohmann Feb 5, 2015
cf498ca
added more features from master branch
nlohmann Feb 7, 2015
c1c3e72
include main source file for coveralls
nlohmann Feb 7, 2015
cc274f8
small changes with default values
nlohmann Feb 7, 2015
87c250d
another commit to trigger coverage
nlohmann Feb 7, 2015
caf82be
added reverse iterators
nlohmann Feb 8, 2015
5877bb9
systematic unit tests
nlohmann Feb 8, 2015
f442b0d
more test cases
nlohmann Feb 8, 2015
43ec647
more test cases
nlohmann Feb 8, 2015
7cd9067
more test cases
nlohmann Feb 8, 2015
d0df796
more test cases
nlohmann Feb 8, 2015
16b91d4
more test cases
nlohmann Feb 8, 2015
8ed9eaa
more test cases
nlohmann Feb 8, 2015
441a6f2
more test cases
nlohmann Feb 8, 2015
d385967
more test cases
nlohmann Feb 8, 2015
323764a
more test cases
nlohmann Feb 8, 2015
5722326
more test cases
nlohmann Feb 8, 2015
d6f5471
hello coveralls...
nlohmann Feb 8, 2015
a35d93e
try with GCC 4.9
nlohmann Feb 8, 2015
27eab94
more test cases
nlohmann Feb 8, 2015
4a0ce18
more test cases
nlohmann Feb 8, 2015
5b4dcfd
more test cases
nlohmann Feb 8, 2015
4c59ccd
a fix for Travis
nlohmann Feb 8, 2015
330ffd9
removed reverse_iterators and fixed some bugs
nlohmann Feb 8, 2015
fe64ed5
another fix for travis
nlohmann Feb 8, 2015
48392cf
some bug fixing
nlohmann Feb 9, 2015
e53e84e
more test cases
nlohmann Feb 9, 2015
0df642d
more test cases
nlohmann Feb 9, 2015
0cfd0f5
added test cases and fixed some warnings
nlohmann Feb 9, 2015
2ec0c79
test cases and clean up
nlohmann Feb 9, 2015
d760ff5
tests for comparison operators
nlohmann Feb 10, 2015
29a8d43
fixed tests for copy assignment
nlohmann Feb 10, 2015
4cd341d
more unit tests
nlohmann Feb 10, 2015
8c6bb04
added width feature / more test cases
nlohmann Feb 10, 2015
3589837
more test cases
nlohmann Feb 10, 2015
963ec13
testing the parser
nlohmann Feb 10, 2015
cd89a88
fix build error
nlohmann Feb 10, 2015
1bbde45
more test cases
nlohmann Feb 10, 2015
6232c78
possible fix
nlohmann Feb 10, 2015
1aebb6e
removing failing (?) test cases
nlohmann Feb 10, 2015
f9797f8
try
nlohmann Feb 10, 2015
0433e71
rename member variables; add whitespace tests
nlohmann Feb 10, 2015
f6f7fcc
another test case
nlohmann Feb 10, 2015
a201bc9
more test cases
nlohmann Feb 10, 2015
e845cd1
still errors...
nlohmann Feb 10, 2015
8a4e127
+ moved lexer to class
nlohmann Feb 11, 2015
5d28014
fixes
nlohmann Feb 11, 2015
d609790
added whitespace handling
nlohmann Feb 11, 2015
c816fd1
cleanup
nlohmann Feb 11, 2015
4b9bd96
re-added old (failing) test cases
nlohmann Feb 11, 2015
463c38d
fix test case
nlohmann Feb 11, 2015
f1bd206
number test cases
nlohmann Feb 11, 2015
3f46fe7
more test cases
nlohmann Feb 11, 2015
c1bf002
more test cases (objects, floats)
nlohmann Feb 11, 2015
cb96e30
try to understand re2c
nlohmann Feb 11, 2015
1d177f8
more test cases (0e1)
nlohmann Feb 11, 2015
032bcf6
more test cases (unexpected ends)
nlohmann Feb 11, 2015
7b7a54a
fixed a bug
nlohmann Feb 11, 2015
4d23c49
another test case
nlohmann Feb 11, 2015
53c9564
bug fix and test cases
nlohmann Feb 11, 2015
3f8dc63
test cases for iterator classes
nlohmann Feb 11, 2015
89a1b02
fixed a major bug in the parser
nlohmann Feb 11, 2015
583d20a
more test cases
nlohmann Feb 11, 2015
4361c4d
more test cases
nlohmann Feb 12, 2015
40a0773
more test cases
nlohmann Feb 13, 2015
334b7f2
more systematic test cases
nlohmann Feb 13, 2015
c864ea2
systematic test case for \uxxxx sequences
nlohmann Feb 13, 2015
e346011
more test cases for numbers
nlohmann Feb 13, 2015
3391e69
six more test cases for numbers
nlohmann Feb 13, 2015
36e36bf
two more test cases for numbers
nlohmann Feb 13, 2015
005a5c2
some fixes and cleanup
nlohmann Feb 13, 2015
d87e770
forgot Makefile
nlohmann Feb 13, 2015
cc4a831
reverse iterators
nlohmann Feb 14, 2015
6ef3cb5
some reorganization
nlohmann Feb 14, 2015
bb558d8
added Unicode support
nlohmann Feb 15, 2015
b21bf95
fixed test case coverage
nlohmann Feb 15, 2015
2fc8235
clean up
nlohmann Feb 15, 2015
2d8b362
further cleanup
nlohmann Feb 15, 2015
b80ca37
added some missing features from 2.0 version
nlohmann Feb 15, 2015
af568b9
test cases for new features
nlohmann Feb 15, 2015
3e885c8
added missing test case
nlohmann Feb 15, 2015
f1f7240
some unicode magic
nlohmann Feb 15, 2015
9f87fd4
fixed Valgrind error
nlohmann Feb 15, 2015
d31d1ca
fix of the fix
nlohmann Feb 15, 2015
b1be1b4
minor change
nlohmann Feb 15, 2015
568d759
experiment with user-defined allocator
nlohmann Feb 15, 2015
b387761
forgot to destroy object
nlohmann Feb 15, 2015
429d209
more allocators
nlohmann Feb 15, 2015
db91140
clean up
nlohmann Feb 15, 2015
5ca8405
removed unused code and fixed includes
nlohmann Feb 16, 2015
a3f52a5
minor change to make code more portable
nlohmann Feb 16, 2015
432a54e
some type fixes
nlohmann Feb 16, 2015
e2dff46
further type adjustments
nlohmann Feb 16, 2015
9e7941b
more type adjustments
nlohmann Feb 16, 2015
ca98127
added another test case
nlohmann Feb 16, 2015
afd02ee
fixed [] operator; added README
nlohmann Feb 18, 2015
c8c49da
fixed coverage
nlohmann Feb 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 1 addition & 49 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,50 +1,2 @@
.DS_Store
src/.DS_Store

aclocal.m4

autom4te.cache/*

config.log

config.status

configure

depcomp

html

*.o

*.Po

install-sh

json_unit

Makefile

missing

.dirstamp

test-driver

Makefile.in

*.plist

json_parser

CMakeCache.txt

*.cmake

CMakeFiles

libjson.a

Testing

.idea
html
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,19 @@ compiler:
before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
- if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.9; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- sudo pip install cpp-coveralls pyyaml
- sudo apt-get install valgrind

before_script:
- autoreconf -iv
- ./configure

script:
- make
- ./json_unit
- valgrind --error-exitcode=1 --leak-check=full ./json_unit

after_success:
- make clean
- make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage"
- touch src/json.hpp
- make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage -std=c++11"
- ./json_unit
- coveralls --exclude benchmark --exclude test --exclude header_only --gcov-options '\-lp' --gcov 'gcov-4.8'
- coveralls --exclude test/catch.hpp --exclude test/unit.cpp --include src/json.hpp --gcov-options '\-lp' --gcov 'gcov-4.9'
61 changes: 0 additions & 61 deletions CMakeLists.txt

This file was deleted.

116 changes: 0 additions & 116 deletions CMakeModules/CodeCoverage.cmake

This file was deleted.

Loading