merge type_expr and type_expr_with_type (fixed issue #896)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5830 f16182fa-f095-11de-8f43-4547254af6c6
Merge branch 'haxe/master'