Revert "fix function parameter parsing"

woops; only seemed to fix it because it removed the other case

This reverts commit 1e4c58eaf2287fe156f41dc69d578a0b3559728c.
add wip grammar tests