Improved the php expression parser