remove eval
fix macro order
Merge branch 'master' of github.com:taptap/ripple