add grammar for q-expressions