Out-of-tree builds broke again, fix.
Merge pull request #517 from basvandervlies/quick_fix

rewrote the promiser syntax.
Add promisees to the benchmark test in parsing unit test
fix cscope target
Merge pull request #518 from lpefferkorn/fix_cscope_target

Fix cscope target
Merge pull request #435 from jimis/misc

Out-of-tree builds broke again, fix.
Added constraint id check for promise type + unit test