Merge branch 'c-version-modified' into c-version

Conflicts:
	lexer
	main.cc
	pcat.lex
	pcat.yy.c
	tests/test01.pcat
	tests/test02.pcat
	tests/test05.pcat