Rename ormatch to boolean

And expressions and or expressions will be in a single
compliance test.
Add support for '(' expression ')'