Grammar expanded

* !-> for not-impl
* !<- for not-if
Merged