modified include.h and parser.y in the section of expression
Merge branch 'shining' of https://github.com/wqfish/avl into shining

Conflicts:
	src/include.h
	src/parser.y
Merge branch 'shining' of https://github.com/wqfish/avl into shining