code generation for calc tree
Merge branch 'master' into HEAD