add support for "match x,y with" in the generation and use it to write diff

this changes the syntax for match, so adjust all the other files.

also, get started on size_diff conversion.