Merge branch 'update_syntax' into next

diff --cc lib/standard/collection/abstract_collection.nit
Simple merge

diff --cc src/parser/lexer.nit
Simple merge

diff --cc src/parser/parser.nit
Simple merge

diff --cc src/parser/xss/lexer.xss
Simple merge

diff --cc src/parser/xss/parser.xss
Simple merge