[flang] merge and reformat
authorpeter klausler <pklausler@nvidia.com>
Wed, 11 Jul 2018 17:22:05 +0000 (10:22 -0700)
committerpeter klausler <pklausler@nvidia.com>
Wed, 11 Jul 2018 17:22:05 +0000 (10:22 -0700)
commit148b7d1f4a8691675f9f8fe60bc425ad47ba344a
tree0e3993f4351a45b5b6c40b7f23671c6797bd9fde
parenta85fc58b93a2b74563782910b5563e23709b97ff
[flang] merge and reformat

Original-commit: flang-compiler/f18@2e3d67aa79e1e7e0af58e1d21bb500a987338c03
Reviewed-on: https://github.com/flang-compiler/f18/pull/119
Tree-same-pre-rewrite: false
flang/lib/parser/grammar.h