allowed operators that contain whitespaces to have more than one whitespace
allowed tests to be made of 1 or 2 words
failing test

the error filename is incorrect when an exception is thrown from an
included file
fixed error filename/line when an error occurs in an included file

To be able to cover all cases, we need to catch the exception when we
know the execution context (the block being rendered). The only
possibility is to actually try/catch exceptions in the displayBlock()
method directly.
refactored some tests
bug #1248 allowed operators that contain whitespaces to have more than one whitespace (fabpot)

This PR was merged into the master branch.

Discussion
----------

allowed operators that contain whitespaces to have more than one whitespace

Commits
-------

724dc61 allowed operators that contain whitespaces to have more than one whitespace
feature #1208 allowed tests to be made of 1 or 2 words (fabpot)

This PR was merged into the master branch.

Discussion
----------

allowed tests to be made of 1 or 2 words

Commits
-------

52c952c allowed tests to be made of 1 or 2 words
bug #1249 fixed error filename/line when an error occurs in an included file (fabpot)

This PR was merged into the master branch.

Discussion
----------

fixed error filename/line when an error occurs in an included file

fixed #1141

Commits
-------

ba0bf63 refactored some tests
1cdc913 fixed error filename/line when an error occurs in an included file
de985a8 failing test
added missing @throws