From 8fa4baa5e80d26f23733a82f4c53168feddafab2 Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Wed, 25 Apr 2018 14:14:02 -0700
Subject: [PATCH] [flang] Use first() more.

Original-commit: flang-compiler/f18@a2f2fdf869bd9a73a3b900d599f7adca2b02a8cd
Reviewed-on: https://github.com/flang-compiler/f18/pull/73
Tree-same-pre-rewrite: false
---
 flang/lib/parser/grammar.h | 328 ++++++++++++++++++++++-----------------------
 1 file changed, 159 insertions(+), 169 deletions(-)

diff --git a/flang/lib/parser/grammar.h b/flang/lib/parser/grammar.h
index f27c1d3..6a23530 100644
--- a/flang/lib/parser/grammar.h
+++ b/flang/lib/parser/grammar.h
@@ -360,14 +360,14 @@ constexpr auto obsoleteExecutionPartConstruct = recovery(
         errorRecovery));
 
 TYPE_CONTEXT_PARSER("execution part construct"_en_US,
-    recovery(construct<ExecutionPartConstruct>(executableConstruct) ||
-            construct<ExecutionPartConstruct>(
-                statement(indirect(formatStmt))) ||
-            construct<ExecutionPartConstruct>(statement(indirect(entryStmt))) ||
-            construct<ExecutionPartConstruct>(statement(indirect(dataStmt))) ||
+    recovery(
+        first(construct<ExecutionPartConstruct>(executableConstruct),
+            construct<ExecutionPartConstruct>(statement(indirect(formatStmt))),
+            construct<ExecutionPartConstruct>(statement(indirect(entryStmt))),
+            construct<ExecutionPartConstruct>(statement(indirect(dataStmt))),
             extension(construct<ExecutionPartConstruct>(
                           statement(indirect(Parser<NamelistStmt>{}))) ||
-                obsoleteExecutionPartConstruct),
+                obsoleteExecutionPartConstruct)),
         construct<ExecutionPartConstruct>(executionPartErrorRecovery)))
 
 // R509 execution-part -> executable-construct [execution-part-construct]...
@@ -1105,15 +1105,15 @@ TYPE_PARSER(construct<DataStmtRepeat>(intLiteralConstant) ||
 //        null-init | initial-data-target | structure-constructor
 // TODO: Some structure constructors can be misrecognized as array
 // references into constant subobjects.
-TYPE_PARSER(construct<DataStmtConstant>(scalar(Parser<ConstantValue>{})) ||
-    construct<DataStmtConstant>(nullInit) ||
-    construct<DataStmtConstant>(Parser<StructureConstructor>{}) ||
-    construct<DataStmtConstant>(scalar(constantSubobject)) ||
-    construct<DataStmtConstant>(signedRealLiteralConstant) ||
-    construct<DataStmtConstant>(signedIntLiteralConstant) ||
+TYPE_PARSER(first(construct<DataStmtConstant>(scalar(Parser<ConstantValue>{})),
+    construct<DataStmtConstant>(nullInit),
+    construct<DataStmtConstant>(Parser<StructureConstructor>{}),
+    construct<DataStmtConstant>(scalar(constantSubobject)),
+    construct<DataStmtConstant>(signedRealLiteralConstant),
+    construct<DataStmtConstant>(signedIntLiteralConstant),
     extension(
-        construct<DataStmtConstant>(Parser<SignedComplexLiteralConstant>{})) ||
-    construct<DataStmtConstant>(initialDataTarget))
+        construct<DataStmtConstant>(Parser<SignedComplexLiteralConstant>{})),
+    construct<DataStmtConstant>(initialDataTarget)))
 
 // R848 dimension-stmt ->
 //        DIMENSION [::] array-name ( array-spec )
@@ -1202,17 +1202,17 @@ TYPE_CONTEXT_PARSER("IMPLICIT statement"_en_US,
 // type specs, DOUBLE PRECISION, and DOUBLE COMPLEX need not be considered.
 constexpr auto noKindSelector = construct<std::optional<KindSelector>>();
 constexpr auto implicitSpecDeclarationTypeSpecRetry =
-    construct<DeclarationTypeSpec>(
+    construct<DeclarationTypeSpec>(first(
         construct<IntrinsicTypeSpec>(
-            construct<IntegerTypeSpec>("INTEGER" >> noKindSelector)) ||
+            construct<IntegerTypeSpec>("INTEGER" >> noKindSelector)),
         construct<IntrinsicTypeSpec>(
-            construct<IntrinsicTypeSpec::Real>("REAL" >> noKindSelector)) ||
-        construct<IntrinsicTypeSpec>(construct<IntrinsicTypeSpec::Complex>(
-            "COMPLEX" >> noKindSelector)) ||
+            construct<IntrinsicTypeSpec::Real>("REAL" >> noKindSelector)),
+        construct<IntrinsicTypeSpec>(
+            construct<IntrinsicTypeSpec::Complex>("COMPLEX" >> noKindSelector)),
         construct<IntrinsicTypeSpec>(construct<IntrinsicTypeSpec::Character>(
-            "CHARACTER" >> construct<std::optional<CharSelector>>())) ||
+            "CHARACTER" >> construct<std::optional<CharSelector>>())),
         construct<IntrinsicTypeSpec>(construct<IntrinsicTypeSpec::Logical>(
-            "LOGICAL" >> noKindSelector)));
+            "LOGICAL" >> noKindSelector))));
 
 TYPE_PARSER(construct<ImplicitSpec>(declarationTypeSpec,
                 parenthesized(nonemptyList(Parser<LetterSpec>{}))) ||
@@ -1486,27 +1486,27 @@ TYPE_PARSER(construct<StatOrErrmsg>("STAT =" >> statVariable) ||
 //         structure-constructor | function-reference | type-param-inquiry |
 //         type-param-name | ( expr )
 constexpr auto primary = instrumented("primary"_en_US,
-    construct<Expr>(indirect(Parser<CharLiteralConstantSubstring>{})) ||
-        construct<Expr>(literalConstant) ||
-        construct<Expr>(construct<Expr::Parentheses>(parenthesized(expr))) ||
-        construct<Expr>(indirect(functionReference) / !"("_tok) ||
-        construct<Expr>(designator / !"("_tok) ||
-        construct<Expr>(Parser<StructureConstructor>{}) ||
-        construct<Expr>(Parser<ArrayConstructor>{}) ||
-        construct<Expr>(indirect(Parser<TypeParamInquiry>{})) ||  // occulted
+    first(construct<Expr>(indirect(Parser<CharLiteralConstantSubstring>{})),
+        construct<Expr>(literalConstant),
+        construct<Expr>(construct<Expr::Parentheses>(parenthesized(expr))),
+        construct<Expr>(indirect(functionReference) / !"("_tok),
+        construct<Expr>(designator / !"("_tok),
+        construct<Expr>(Parser<StructureConstructor>{}),
+        construct<Expr>(Parser<ArrayConstructor>{}),
+        construct<Expr>(indirect(Parser<TypeParamInquiry>{})),  // occulted
         // PGI/XLF extension: COMPLEX constructor (x,y)
         extension(construct<Expr>(parenthesized(
-            construct<Expr::ComplexConstructor>(expr, "," >> expr)))) ||
+            construct<Expr::ComplexConstructor>(expr, "," >> expr)))),
         extension(construct<Expr>("%LOC" >>
-            parenthesized(construct<Expr::PercentLoc>(indirect(variable))))));
+            parenthesized(construct<Expr::PercentLoc>(indirect(variable)))))));
 
 // R1002 level-1-expr -> [defined-unary-op] primary
 // TODO: Reasonable extension: permit multiple defined-unary-ops
-constexpr auto level1Expr =
-    construct<Expr>(construct<Expr::DefinedUnary>(definedOpName, primary)) ||
-    primary ||
-    extension(construct<Expr>(construct<Expr::UnaryPlus>("+" >> primary))) ||
-    extension(construct<Expr>(construct<Expr::Negate>("-" >> primary)));
+constexpr auto level1Expr = first(
+    construct<Expr>(construct<Expr::DefinedUnary>(definedOpName, primary)),
+    primary,
+    extension(construct<Expr>(construct<Expr::UnaryPlus>("+" >> primary))),
+    extension(construct<Expr>(construct<Expr::Negate>("-" >> primary))));
 
 // R1004 mult-operand -> level-1-expr [power-op mult-operand]
 // R1007 power-op -> **
@@ -2302,76 +2302,70 @@ constexpr auto fileNameExpr = scalarDefaultCharExpr;
 constexpr auto statusExpr = construct<StatusExpr>(scalarDefaultCharExpr);
 constexpr auto errLabel = construct<ErrLabel>(label);
 
-TYPE_PARSER(construct<ConnectSpec>(maybe("UNIT ="_tok) >> fileUnitNumber) ||
+TYPE_PARSER(first(construct<ConnectSpec>(maybe("UNIT ="_tok) >> fileUnitNumber),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "ACCESS =" >> pure(ConnectSpec::CharExpr::Kind::Access),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "ACTION =" >> pure(ConnectSpec::CharExpr::Kind::Action),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "ASYNCHRONOUS =" >> pure(ConnectSpec::CharExpr::Kind::Asynchronous),
-        scalarDefaultCharExpr)) ||
-
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "BLANK =" >> pure(ConnectSpec::CharExpr::Kind::Blank),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "DECIMAL =" >> pure(ConnectSpec::CharExpr::Kind::Decimal),
-        scalarDefaultCharExpr)) ||
-
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "DELIM =" >> pure(ConnectSpec::CharExpr::Kind::Delim),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "ENCODING =" >> pure(ConnectSpec::CharExpr::Kind::Encoding),
-        scalarDefaultCharExpr)) ||
-    construct<ConnectSpec>("ERR =" >> errLabel) ||
-    construct<ConnectSpec>("FILE =" >> fileNameExpr) ||
-    extension(construct<ConnectSpec>("NAME =" >> fileNameExpr)) ||
-
+        scalarDefaultCharExpr)),
+    construct<ConnectSpec>("ERR =" >> errLabel),
+    construct<ConnectSpec>("FILE =" >> fileNameExpr),
+    extension(construct<ConnectSpec>("NAME =" >> fileNameExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "FORM =" >> pure(ConnectSpec::CharExpr::Kind::Form),
-        scalarDefaultCharExpr)) ||
-    construct<ConnectSpec>("IOMSG =" >> msgVariable) ||
-    construct<ConnectSpec>("IOSTAT =" >> statVariable) ||
+        scalarDefaultCharExpr)),
+    construct<ConnectSpec>("IOMSG =" >> msgVariable),
+    construct<ConnectSpec>("IOSTAT =" >> statVariable),
     construct<ConnectSpec>(construct<ConnectSpec::Newunit>(
-        "NEWUNIT =" >> scalar(integer(variable)))) ||
-
+        "NEWUNIT =" >> scalar(integer(variable)))),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "PAD =" >> pure(ConnectSpec::CharExpr::Kind::Pad),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "POSITION =" >> pure(ConnectSpec::CharExpr::Kind::Position),
-        scalarDefaultCharExpr)) ||
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(
-        construct<ConnectSpec::Recl>("RECL =" >> scalarIntExpr)) ||
-
+        construct<ConnectSpec::Recl>("RECL =" >> scalarIntExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "ROUND =" >> pure(ConnectSpec::CharExpr::Kind::Round),
-        scalarDefaultCharExpr)) ||
-
+        scalarDefaultCharExpr)),
     construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
         "SIGN =" >> pure(ConnectSpec::CharExpr::Kind::Sign),
-        scalarDefaultCharExpr)) ||
-    construct<ConnectSpec>("STATUS =" >> statusExpr) ||
+        scalarDefaultCharExpr)),
+    construct<ConnectSpec>("STATUS =" >> statusExpr),
     extension(construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
                   "CONVERT =" >> pure(ConnectSpec::CharExpr::Kind::Convert),
                   scalarDefaultCharExpr)) ||
         construct<ConnectSpec>(construct<ConnectSpec::CharExpr>(
             "DISPOSE =" >> pure(ConnectSpec::CharExpr::Kind::Dispose),
-            scalarDefaultCharExpr))))
+            scalarDefaultCharExpr)))))
 
 // R1209 close-spec ->
 //         [UNIT =] file-unit-number | IOSTAT = scalar-int-variable |
 //         IOMSG = iomsg-variable | ERR = label |
 //         STATUS = scalar-default-char-expr
-constexpr auto closeSpec =
-    construct<CloseStmt::CloseSpec>(maybe("UNIT ="_tok) >> fileUnitNumber) ||
-    construct<CloseStmt::CloseSpec>("IOSTAT =" >> statVariable) ||
-    construct<CloseStmt::CloseSpec>("IOMSG =" >> msgVariable) ||
-    construct<CloseStmt::CloseSpec>("ERR =" >> errLabel) ||
-    construct<CloseStmt::CloseSpec>("STATUS =" >> statusExpr);
+constexpr auto closeSpec = first(
+    construct<CloseStmt::CloseSpec>(maybe("UNIT ="_tok) >> fileUnitNumber),
+    construct<CloseStmt::CloseSpec>("IOSTAT =" >> statVariable),
+    construct<CloseStmt::CloseSpec>("IOMSG =" >> msgVariable),
+    construct<CloseStmt::CloseSpec>("ERR =" >> errLabel),
+    construct<CloseStmt::CloseSpec>("STATUS =" >> statusExpr));
 
 // R1208 close-stmt -> CLOSE ( close-spec-list )
 TYPE_CONTEXT_PARSER("CLOSE statement"_en_US,
@@ -2418,50 +2412,46 @@ constexpr auto idVariable = construct<IdVariable>(scalarIntVariable);
 //         SIZE = scalar-int-variable
 constexpr auto endLabel = construct<EndLabel>(label);
 constexpr auto eorLabel = construct<EorLabel>(label);
-TYPE_PARSER(construct<IoControlSpec>("UNIT =" >> ioUnit) ||
-    construct<IoControlSpec>("FMT =" >> format) ||
-    construct<IoControlSpec>("NML =" >> name) ||
+TYPE_PARSER(first(construct<IoControlSpec>("UNIT =" >> ioUnit),
+    construct<IoControlSpec>("FMT =" >> format),
+    construct<IoControlSpec>("NML =" >> name),
     construct<IoControlSpec>(
         "ADVANCE =" >> construct<IoControlSpec::CharExpr>(
                            pure(IoControlSpec::CharExpr::Kind::Advance),
-                           scalarDefaultCharExpr)) ||
+                           scalarDefaultCharExpr)),
     construct<IoControlSpec>(construct<IoControlSpec::Asynchronous>(
-        "ASYNCHRONOUS =" >> scalarDefaultCharConstantExpr)) ||
-    construct<IoControlSpec>(
-        "BLANK =" >> construct<IoControlSpec::CharExpr>(
-                         pure(IoControlSpec::CharExpr::Kind::Blank),
-                         scalarDefaultCharExpr)) ||
+        "ASYNCHRONOUS =" >> scalarDefaultCharConstantExpr)),
+    construct<IoControlSpec>("BLANK =" >>
+        construct<IoControlSpec::CharExpr>(
+            pure(IoControlSpec::CharExpr::Kind::Blank), scalarDefaultCharExpr)),
     construct<IoControlSpec>(
         "DECIMAL =" >> construct<IoControlSpec::CharExpr>(
                            pure(IoControlSpec::CharExpr::Kind::Decimal),
-                           scalarDefaultCharExpr)) ||
-    construct<IoControlSpec>(
-        "DELIM =" >> construct<IoControlSpec::CharExpr>(
-                         pure(IoControlSpec::CharExpr::Kind::Delim),
-                         scalarDefaultCharExpr)) ||
-    construct<IoControlSpec>("END =" >> endLabel) ||
-    construct<IoControlSpec>("EOR =" >> eorLabel) ||
-    construct<IoControlSpec>("ERR =" >> errLabel) ||
-    construct<IoControlSpec>("ID =" >> idVariable) ||
-    construct<IoControlSpec>("IOMSG = " >> msgVariable) ||
-    construct<IoControlSpec>("IOSTAT = " >> statVariable) ||
+                           scalarDefaultCharExpr)),
+    construct<IoControlSpec>("DELIM =" >>
+        construct<IoControlSpec::CharExpr>(
+            pure(IoControlSpec::CharExpr::Kind::Delim), scalarDefaultCharExpr)),
+    construct<IoControlSpec>("END =" >> endLabel),
+    construct<IoControlSpec>("EOR =" >> eorLabel),
+    construct<IoControlSpec>("ERR =" >> errLabel),
+    construct<IoControlSpec>("ID =" >> idVariable),
+    construct<IoControlSpec>("IOMSG = " >> msgVariable),
+    construct<IoControlSpec>("IOSTAT = " >> statVariable),
     construct<IoControlSpec>("PAD =" >>
         construct<IoControlSpec::CharExpr>(
-            pure(IoControlSpec::CharExpr::Kind::Pad), scalarDefaultCharExpr)) ||
-    construct<IoControlSpec>(
-        "POS =" >> construct<IoControlSpec::Pos>(scalarIntExpr)) ||
-    construct<IoControlSpec>(
-        "REC =" >> construct<IoControlSpec::Rec>(scalarIntExpr)) ||
+            pure(IoControlSpec::CharExpr::Kind::Pad), scalarDefaultCharExpr)),
     construct<IoControlSpec>(
-        "ROUND =" >> construct<IoControlSpec::CharExpr>(
-                         pure(IoControlSpec::CharExpr::Kind::Round),
-                         scalarDefaultCharExpr)) ||
+        "POS =" >> construct<IoControlSpec::Pos>(scalarIntExpr)),
     construct<IoControlSpec>(
-        "SIGN =" >> construct<IoControlSpec::CharExpr>(
-                        pure(IoControlSpec::CharExpr::Kind::Sign),
-                        scalarDefaultCharExpr)) ||
+        "REC =" >> construct<IoControlSpec::Rec>(scalarIntExpr)),
+    construct<IoControlSpec>("ROUND =" >>
+        construct<IoControlSpec::CharExpr>(
+            pure(IoControlSpec::CharExpr::Kind::Round), scalarDefaultCharExpr)),
+    construct<IoControlSpec>("SIGN =" >>
+        construct<IoControlSpec::CharExpr>(
+            pure(IoControlSpec::CharExpr::Kind::Sign), scalarDefaultCharExpr)),
     construct<IoControlSpec>(
-        "SIZE =" >> construct<IoControlSpec::Size>(scalarIntVariable)))
+        "SIZE =" >> construct<IoControlSpec::Size>(scalarIntVariable))))
 
 // R1211 write-stmt -> WRITE ( io-control-spec-list ) [output-item-list]
 constexpr auto outputItemList =
@@ -2525,13 +2515,13 @@ TYPE_CONTEXT_PARSER("WAIT statement"_en_US,
 //         IOSTAT = scalar-int-variable
 constexpr auto idExpr = construct<IdExpr>(scalarIntExpr);
 
-TYPE_PARSER(construct<WaitSpec>(maybe("UNIT ="_tok) >> fileUnitNumber) ||
-    construct<WaitSpec>("END =" >> endLabel) ||
-    construct<WaitSpec>("EOR =" >> eorLabel) ||
-    construct<WaitSpec>("ERR =" >> errLabel) ||
-    construct<WaitSpec>("ID =" >> idExpr) ||
-    construct<WaitSpec>("IOMSG =" >> msgVariable) ||
-    construct<WaitSpec>("IOSTAT =" >> statVariable))
+TYPE_PARSER(first(construct<WaitSpec>(maybe("UNIT ="_tok) >> fileUnitNumber),
+    construct<WaitSpec>("END =" >> endLabel),
+    construct<WaitSpec>("EOR =" >> eorLabel),
+    construct<WaitSpec>("ERR =" >> errLabel),
+    construct<WaitSpec>("ID =" >> idExpr),
+    construct<WaitSpec>("IOMSG =" >> msgVariable),
+    construct<WaitSpec>("IOSTAT =" >> statVariable)))
 
 template<typename A> std::list<A> singletonList(A &&x) {
   std::list<A> result;
@@ -2604,122 +2594,122 @@ TYPE_CONTEXT_PARSER("FLUSH statement"_en_US,
 //         STREAM = scalar-default-char-variable |
 //         STATUS = scalar-default-char-variable |
 //         WRITE = scalar-default-char-variable
-TYPE_PARSER(construct<InquireSpec>(maybe("UNIT ="_tok) >> fileUnitNumber) ||
-    construct<InquireSpec>("FILE =" >> fileNameExpr) ||
+TYPE_PARSER(first(construct<InquireSpec>(maybe("UNIT ="_tok) >> fileUnitNumber),
+    construct<InquireSpec>("FILE =" >> fileNameExpr),
     construct<InquireSpec>(
         "ACCESS =" >> construct<InquireSpec::CharVar>(
                           pure(InquireSpec::CharVar::Kind::Access),
-                          scalarDefaultCharVariable)) ||
+                          scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "ACTION =" >> construct<InquireSpec::CharVar>(
                           pure(InquireSpec::CharVar::Kind::Action),
-                          scalarDefaultCharVariable)) ||
+                          scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "ASYNCHRONOUS =" >> construct<InquireSpec::CharVar>(
                                 pure(InquireSpec::CharVar::Kind::Asynchronous),
-                                scalarDefaultCharVariable)) ||
+                                scalarDefaultCharVariable)),
     construct<InquireSpec>("BLANK =" >>
         construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Blank),
-            scalarDefaultCharVariable)) ||
+            scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "DECIMAL =" >> construct<InquireSpec::CharVar>(
                            pure(InquireSpec::CharVar::Kind::Decimal),
-                           scalarDefaultCharVariable)) ||
+                           scalarDefaultCharVariable)),
     construct<InquireSpec>("DELIM =" >>
         construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Delim),
-            scalarDefaultCharVariable)) ||
+            scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "DIRECT =" >> construct<InquireSpec::CharVar>(
                           pure(InquireSpec::CharVar::Kind::Direct),
-                          scalarDefaultCharVariable)) ||
+                          scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "ENCODING =" >> construct<InquireSpec::CharVar>(
                             pure(InquireSpec::CharVar::Kind::Encoding),
-                            scalarDefaultCharVariable)) ||
-    construct<InquireSpec>("ERR =" >> errLabel) ||
+                            scalarDefaultCharVariable)),
+    construct<InquireSpec>("ERR =" >> errLabel),
     construct<InquireSpec>("EXIST =" >>
         construct<InquireSpec::LogVar>(
-            pure(InquireSpec::LogVar::Kind::Exist), scalarLogicalVariable)) ||
+            pure(InquireSpec::LogVar::Kind::Exist), scalarLogicalVariable)),
     construct<InquireSpec>("FORM =" >>
-        construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Form),
-            scalarDefaultCharVariable)) ||
+        construct<InquireSpec::CharVar>(
+            pure(InquireSpec::CharVar::Kind::Form), scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "FORMATTED =" >> construct<InquireSpec::CharVar>(
                              pure(InquireSpec::CharVar::Kind::Formatted),
-                             scalarDefaultCharVariable)) ||
-    construct<InquireSpec>("ID =" >> idExpr) ||
+                             scalarDefaultCharVariable)),
+    construct<InquireSpec>("ID =" >> idExpr),
     construct<InquireSpec>("IOMSG =" >>
         construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Iomsg),
-            scalarDefaultCharVariable)) ||
+            scalarDefaultCharVariable)),
     construct<InquireSpec>("IOSTAT =" >>
         construct<InquireSpec::IntVar>(pure(InquireSpec::IntVar::Kind::Iostat),
-            scalar(integer(variable)))) ||
+            scalar(integer(variable)))),
     construct<InquireSpec>("NAME =" >>
-        construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Name),
-            scalarDefaultCharVariable)) ||
+        construct<InquireSpec::CharVar>(
+            pure(InquireSpec::CharVar::Kind::Name), scalarDefaultCharVariable)),
     construct<InquireSpec>("NAMED =" >>
         construct<InquireSpec::LogVar>(
-            pure(InquireSpec::LogVar::Kind::Named), scalarLogicalVariable)) ||
+            pure(InquireSpec::LogVar::Kind::Named), scalarLogicalVariable)),
     construct<InquireSpec>("NEXTREC =" >>
         construct<InquireSpec::IntVar>(pure(InquireSpec::IntVar::Kind::Nextrec),
-            scalar(integer(variable)))) ||
+            scalar(integer(variable)))),
     construct<InquireSpec>("NUMBER =" >>
         construct<InquireSpec::IntVar>(pure(InquireSpec::IntVar::Kind::Number),
-            scalar(integer(variable)))) ||
+            scalar(integer(variable)))),
     construct<InquireSpec>("OPENED =" >>
         construct<InquireSpec::LogVar>(
-            pure(InquireSpec::LogVar::Kind::Opened), scalarLogicalVariable)) ||
+            pure(InquireSpec::LogVar::Kind::Opened), scalarLogicalVariable)),
     construct<InquireSpec>("PAD =" >>
-        construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Pad),
-            scalarDefaultCharVariable)) ||
+        construct<InquireSpec::CharVar>(
+            pure(InquireSpec::CharVar::Kind::Pad), scalarDefaultCharVariable)),
     construct<InquireSpec>("PENDING =" >>
         construct<InquireSpec::LogVar>(
-            pure(InquireSpec::LogVar::Kind::Pending), scalarLogicalVariable)) ||
+            pure(InquireSpec::LogVar::Kind::Pending), scalarLogicalVariable)),
     construct<InquireSpec>("POS =" >>
         construct<InquireSpec::IntVar>(
-            pure(InquireSpec::IntVar::Kind::Pos), scalar(integer(variable)))) ||
+            pure(InquireSpec::IntVar::Kind::Pos), scalar(integer(variable)))),
     construct<InquireSpec>(
         "POSITION =" >> construct<InquireSpec::CharVar>(
                             pure(InquireSpec::CharVar::Kind::Position),
-                            scalarDefaultCharVariable)) ||
+                            scalarDefaultCharVariable)),
     construct<InquireSpec>("READ =" >>
-        construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Read),
-            scalarDefaultCharVariable)) ||
+        construct<InquireSpec::CharVar>(
+            pure(InquireSpec::CharVar::Kind::Read), scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "READWRITE =" >> construct<InquireSpec::CharVar>(
                              pure(InquireSpec::CharVar::Kind::Readwrite),
-                             scalarDefaultCharVariable)) ||
+                             scalarDefaultCharVariable)),
     construct<InquireSpec>("RECL =" >>
-        construct<InquireSpec::IntVar>(pure(InquireSpec::IntVar::Kind::Recl),
-            scalar(integer(variable)))) ||
+        construct<InquireSpec::IntVar>(
+            pure(InquireSpec::IntVar::Kind::Recl), scalar(integer(variable)))),
     construct<InquireSpec>("ROUND =" >>
         construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Round),
-            scalarDefaultCharVariable)) ||
+            scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "SEQUENTIAL =" >> construct<InquireSpec::CharVar>(
                               pure(InquireSpec::CharVar::Kind::Sequential),
-                              scalarDefaultCharVariable)) ||
+                              scalarDefaultCharVariable)),
     construct<InquireSpec>("SIGN =" >>
-        construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Sign),
-            scalarDefaultCharVariable)) ||
+        construct<InquireSpec::CharVar>(
+            pure(InquireSpec::CharVar::Kind::Sign), scalarDefaultCharVariable)),
     construct<InquireSpec>("SIZE =" >>
-        construct<InquireSpec::IntVar>(pure(InquireSpec::IntVar::Kind::Size),
-            scalar(integer(variable)))) ||
+        construct<InquireSpec::IntVar>(
+            pure(InquireSpec::IntVar::Kind::Size), scalar(integer(variable)))),
     construct<InquireSpec>(
         "STREAM =" >> construct<InquireSpec::CharVar>(
                           pure(InquireSpec::CharVar::Kind::Stream),
-                          scalarDefaultCharVariable)) ||
+                          scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "STATUS =" >> construct<InquireSpec::CharVar>(
                           pure(InquireSpec::CharVar::Kind::Status),
-                          scalarDefaultCharVariable)) ||
+                          scalarDefaultCharVariable)),
     construct<InquireSpec>(
         "UNFORMATTED =" >> construct<InquireSpec::CharVar>(
                                pure(InquireSpec::CharVar::Kind::Unformatted),
-                               scalarDefaultCharVariable)) ||
+                               scalarDefaultCharVariable)),
     construct<InquireSpec>("WRITE =" >>
         construct<InquireSpec::CharVar>(pure(InquireSpec::CharVar::Kind::Write),
-            scalarDefaultCharVariable)))
+            scalarDefaultCharVariable))))
 
 // R1230 inquire-stmt ->
 //         INQUIRE ( inquire-spec-list ) |
@@ -3048,19 +3038,19 @@ TYPE_PARSER(construct<ProcedureStmt>("MODULE PROCEDURE"_sptok >>
 // R1509 defined-io-generic-spec ->
 //         READ ( FORMATTED ) | READ ( UNFORMATTED ) |
 //         WRITE ( FORMATTED ) | WRITE ( UNFORMATTED )
-TYPE_PARSER(construct<GenericSpec>(
-                "OPERATOR" >> parenthesized(Parser<DefinedOperator>{})) ||
+TYPE_PARSER(first(construct<GenericSpec>(
+                      "OPERATOR" >> parenthesized(Parser<DefinedOperator>{})),
+    construct<GenericSpec>(
+        construct<GenericSpec::Assignment>("ASSIGNMENT ( = )"_tok)),
     construct<GenericSpec>(
-        construct<GenericSpec::Assignment>("ASSIGNMENT ( = )"_tok)) ||
+        construct<GenericSpec::ReadFormatted>("READ ( FORMATTED )"_tok)),
     construct<GenericSpec>(
-        construct<GenericSpec::ReadFormatted>("READ ( FORMATTED )"_tok)) ||
+        construct<GenericSpec::ReadUnformatted>("READ ( UNFORMATTED )"_tok)),
     construct<GenericSpec>(
-        construct<GenericSpec::ReadUnformatted>("READ ( UNFORMATTED )"_tok)) ||
+        construct<GenericSpec::WriteFormatted>("WRITE ( FORMATTED )"_tok)),
     construct<GenericSpec>(
-        construct<GenericSpec::WriteFormatted>("WRITE ( FORMATTED )"_tok)) ||
-    construct<GenericSpec>(construct<GenericSpec::WriteUnformatted>(
-        "WRITE ( UNFORMATTED )"_tok)) ||
-    construct<GenericSpec>(name))
+        construct<GenericSpec::WriteUnformatted>("WRITE ( UNFORMATTED )"_tok)),
+    construct<GenericSpec>(name)))
 
 // R1510 generic-stmt ->
 //         GENERIC [, access-spec] :: generic-spec => specific-procedure-list
@@ -3143,14 +3133,14 @@ TYPE_PARSER(construct<AltReturnSpec>(star >> label))
 // R1527 prefix-spec ->
 //         declaration-type-spec | ELEMENTAL | IMPURE | MODULE |
 //         NON_RECURSIVE | PURE | RECURSIVE
-TYPE_PARSER(construct<PrefixSpec>(declarationTypeSpec) ||
-    construct<PrefixSpec>(construct<PrefixSpec::Elemental>("ELEMENTAL"_tok)) ||
-    construct<PrefixSpec>(construct<PrefixSpec::Impure>("IMPURE"_tok)) ||
-    construct<PrefixSpec>(construct<PrefixSpec::Module>("MODULE"_tok)) ||
+TYPE_PARSER(first(construct<PrefixSpec>(declarationTypeSpec),
+    construct<PrefixSpec>(construct<PrefixSpec::Elemental>("ELEMENTAL"_tok)),
+    construct<PrefixSpec>(construct<PrefixSpec::Impure>("IMPURE"_tok)),
+    construct<PrefixSpec>(construct<PrefixSpec::Module>("MODULE"_tok)),
     construct<PrefixSpec>(
-        construct<PrefixSpec::Non_Recursive>("NON_RECURSIVE"_tok)) ||
-    construct<PrefixSpec>(construct<PrefixSpec::Pure>("PURE"_tok)) ||
-    construct<PrefixSpec>(construct<PrefixSpec::Recursive>("RECURSIVE"_tok)))
+        construct<PrefixSpec::Non_Recursive>("NON_RECURSIVE"_tok)),
+    construct<PrefixSpec>(construct<PrefixSpec::Pure>("PURE"_tok)),
+    construct<PrefixSpec>(construct<PrefixSpec::Recursive>("RECURSIVE"_tok))))
 
 // R1529 function-subprogram ->
 //         function-stmt [specification-part] [execution-part]
-- 
2.7.4