Ok. Let's go this way. I'll try to prepare PRs for uctags with the two missing features. If/When they are merged, we can sync the Pascal parser.
Cool, I was going to prepare the PR myself - you were too fast :-)
I just reverted the parser back to the original one (if desired, I can squash it with the previous commits).