[Chapel Merge] next: Fix parser conflicts for bracket loops by re

Notifications Commits
1

Branch: refs/heads/master
Revision: 7bb0e8c
Author: dlongnecke-cray
Log Message:

Merge pull request #17831 from dlongnecke-cray/next-fix-parser-conflict

next: Fix parser conflicts for bracket loops by reverting nonterminal

This is for compiler/next.

In #17822 I adjusted several of the bracket loop statement productions
to use expr instead of expr_ls. This introduced shift/reduce
conflicts that I didn't notice (there were warnings for deprecation
statements that I ignored, due to be fixed by #17826).

Revert to using expr_ls. The helpers to build bracket loops become
a bit more complicated as a result.

Reviewed by @mppf. Thanks!

TESTING:

  • [x] All compiler/next tests pass
  • [x] Shift/reduce conflicts gone

Signed-off-by: David Longnecker dlongnecke-cray@users.noreply.github.com

Modified Files:
M compiler/next/lib/frontend/Parser/ParserContext.h

M compiler/next/lib/frontend/Parser/ParserContextImpl.h
M compiler/next/lib/frontend/Parser/chapel.ypp

Compare: https://github.com/chapel-lang/chapel/compare/02405c513e36...7bb0e8cffd77