fix merge conflict
fix a bug (t/generator/* were not listed on test-core)
fix an incomplete merge
follow changes introduced in a refactoring commit related to function expression
add function statement transformer