fix mk_str
merge
Merge branch 'lab2' of github.com:alantian/pcat-compiler into lab2

Conflicts:
	src/pcat.y