In refaktorisierter Lexer-Version Positionsangaben zu Token-Typ und Positionszustand zu Lexer hinzugefügt. Momentan sind die ausgegebenen Zeilen- und Spaltennummern nur teilweise korrekt.
Merge branch 'lexer_refactoring' into lexer_tokenpositions

Conflicts:
	lexer/lexer.cpp
	lexer/lexer.hpp
Merge branch 'lexer_refactoring' into lexer_tokenpositions

Conflicts:
	lexer/lexer.cpp
	lexer/lexer.hpp
Merge branch 'lexer_tokenpositions' of https://github.com/djrieger/mjplusplus into lexer_tokenpositions

Conflicts:
	lexer/lexer.hpp
Fixed comment error in transition table.
Merge branch 'dev' into lexer_tokenpositions

Conflicts:
	lexer/lexer.cpp
	lexer/lexer.hpp
	lexer/stateomat.cpp
	lexer/token.cpp
	lexer/token.hpp
trying to fix token positions, seems to work
Merge branch 'master' into lexer_tokenpositions
merged latest dev branch including parser
parser prints token position in addition to the token lexval
moved precedences into parser
Merge branch 'lexer_tokenpositions' into dev

Conflicts:
	parser/parser.cpp
fixing things; mostly the parser, sometimes a test