Commit Graph

200 Commits

Author SHA1 Message Date
pantor d6cfbd0f07 undo cmake version 2018-08-29 19:40:50 +02:00
pantor 65cc971e21 Merge branch 'master' of https://github.com/pantor/inja 2018-08-29 19:31:55 +02:00
pantor a496ec9585 update to json 3.2 and catch 2.3, clean cmake 2018-08-29 19:31:37 +02:00
pantor 6afdf700cb Fix division by zero warning (#61) 2018-08-09 12:41:56 +02:00
Tian Jin 4eaeb2b182 Update CMakeLists.txt (#59) 2018-07-27 13:35:47 +02:00
Tian Jin a06207b64b Update CMakeLists.txt (#58) 2018-07-25 07:44:54 +02:00
Erik Partridge 360228eabf Fix the std::transform bug (#56)
https://stackoverflow.com/questions/16792456/no-matching-function-for-call-to-transform

This is a fix for using toupper and tolower with std::transform
2018-06-26 09:40:12 +02:00
Maxime Pinard 32ca238c23 Made unmodified variables const (#55)
* Removed intermediate variable

* Made some unmodified variables const
2018-05-23 07:45:05 +02:00
pantor 0898b1c302 use loop object for loop variables 2018-05-22 22:52:55 +02:00
Maxime Pinard 1dc3267c02 Typo corrections (#51) 2018-05-22 22:29:51 +02:00
pantor 4ccc2e62ec Merge pull request #48 from pantor/include-json-in-inja 2018-05-15 21:55:14 +02:00
pantor 3c8823a3fa Merge branch 'master' into in-memory-includes 2018-05-15 20:25:58 +02:00
pantor 71cfb21e61 include nlohmann/json in inja directly 2018-05-15 20:23:09 +02:00
pantor 0029a130ab clean meson file 2018-05-15 20:03:15 +02:00
pantor 394610b002 order includes 2018-05-15 19:52:41 +02:00
pantor c8d3d720c8 add in-memory includes via include_template (#47) 2018-05-14 20:48:28 +02:00
pantor cb18e2cd0c add in-memory includes via include_template 2018-05-14 20:21:29 +02:00
pantor 95e3712aaf add vcpkg integration 2018-05-06 09:03:46 +02:00
pantor 29d0ddcf09 Add Conan integration to readme 2018-04-18 16:48:45 +02:00
Samuel Leweke 1cb6b15cca Add exists() function that checks existence of key (#38)
* Add exists() function that checks existence of key

Adds an exists() function that checks whether a given key exists in the
data. If only one argument is provided to exists(), the global data is
queried for the item. If two arguments are given, the first argument
specifies the object to query for the key given as second argument.

Also adds corresponding unit tests and updates README for
documentation.

* Split exists() into exists() and existsIn()

Splits the exists() function, which previously took both one or two
arguments, into an exists() function accepting one and an existsIn()
function accepting two arguments.
2018-04-02 15:54:00 +02:00
pantor 138e0da339 add STL containers support for Templates (issue #42) 2018-04-02 15:49:59 +02:00
pantor 8d21a9dae9 multiple render optimizations 2018-04-02 15:43:32 +02:00
pantor e339da7e2b Use references 2018-03-20 17:00:33 +01:00
pantor 73a40cf1b1 fix mac os x callback without parent bug 2018-03-20 16:36:11 +01:00
pantor cfa0e5cbfe fix old xcode tests 2018-03-19 18:34:35 +01:00
pantor e38df0931f Fix line statements 2018-03-19 12:20:12 +01:00
pantor 561f8cf59e Catch some errors for conditional parsing 2018-03-19 11:43:19 +01:00
pantor 1766793fd5 Allow index in nested loops 2018-03-19 11:09:23 +01:00
pantor 776af96b0b Use callbacks without parameters either with or without parenthesis 2018-03-19 10:46:49 +01:00
pantor b68f745866 added is_last == false test 2018-03-19 10:37:55 +01:00
pantor cd43573c0e add not is_last test 2018-03-19 10:33:37 +01:00
pantor 44f7461a8a allow empty lists for loops 2018-03-19 10:30:26 +01:00
pantor b458ed576d pass json data as reference 2018-03-16 10:24:27 +01:00
Ludek Vodicka f67767a6b2 Fixed warning in 64-bit windows build (#24)
* Fixed passing callback arguments as reference

* Another passing as const reference instead of new instance

* Implemented variable number of parameters
-  extended function "function_regex" to pass minimum and maximum parameters. if minimum=maximum, all params are required, if minimum = 0, all params are optional.....
- for single parameter there is different regex (created by the same function_regex function) to allo read sort([1,2,3]) as one parameter
- extended Match to test if group is valid, so only valid params are filled to params vector
- new function arguments_count to test number of arguments passed to callback

* unit tests for updated callbacks with variable number of params

* merge with last version

* Optimized passing arguments as const reference

* Fixed warning on 64-bit windows (conversion from 'size_t' to 'int', possible loss of data)
v0.1.0 v1.0.0
2018-03-09 14:43:56 +01:00
pantor 6da37615ef fix global path test 2018-03-07 16:54:23 +01:00
pantor 98506f355a add meson build for testing 2018-03-07 15:24:58 +01:00
pantor 904074c9a8 fix test for loop error message 2018-03-01 14:47:20 +01:00
pantor 99d3cd1ddf better loop error message 2018-03-01 14:36:09 +01:00
pantor 6f7fad983d add float and int string conversion 2018-03-01 11:29:56 +01:00
Ludek Vodicka 6e5167d68b Another optimization of passing arguments as reference (#23)
* Fixed passing callback arguments as reference

* Another passing as const reference instead of new instance

* Implemented variable number of parameters
-  extended function "function_regex" to pass minimum and maximum parameters. if minimum=maximum, all params are required, if minimum = 0, all params are optional.....
- for single parameter there is different regex (created by the same function_regex function) to allo read sort([1,2,3]) as one parameter
- extended Match to test if group is valid, so only valid params are filled to params vector
- new function arguments_count to test number of arguments passed to callback

* unit tests for updated callbacks with variable number of params

* merge with last version

* Optimized passing arguments as const reference
2018-03-01 11:19:21 +01:00
pantor 097ebf1f90 fix search_closed_on_level if nothing was found 2018-02-28 12:42:39 +01:00
pantor 07b49af6a4 add readme plural line statements 2018-02-28 12:01:14 +01:00
lbersch 92241617c2 Merge pull request #21 from ludekvodicka/patch-2
Fixed set_* methods
2018-02-28 11:36:03 +01:00
lbersch e90e849a5e Merge branch 'master' into patch-2 2018-02-28 11:35:51 +01:00
lbersch 833a7226fe Merge pull request #20 from ludekvodicka/patch-1
Fixed typo
2018-02-28 11:35:01 +01:00
Ludek Vodicka 08b1245f5b Fixed set_* methods 2018-02-26 13:04:36 +01:00
Ludek Vodicka aafd86b80c Fixed typo
set_line_statements vs set_line_statement
2018-02-26 12:43:51 +01:00
pantor f7e0fa1c68 fix throw test 2018-02-24 17:45:29 +01:00
pantor 7e32e8bcfe use central throw function 2018-02-24 14:50:38 +01:00
pantor 86f310038d code cleaning 2018-02-24 12:48:26 +01:00