Cache regular expression objects in lexer
Re-enabled tests
No parent in ASTNode
Added If-statement
Merge branch 'master' into martyn82