Merge branch 'users/kparzysz/spr/m02-selectors' into users/kparzysz/spr/m03-meta-simple

Author: kparzysz

flang/include/flang/Parser/parse-tree.h

@@ -3489,12 +3489,14 @@ inline namespace traits {
 // trait-property-name ->
 //    identifier | string-literal
 struct OmpTraitPropertyName {
+  CharBlock source;
   WRAPPER_CLASS_BOILERPLATE(OmpTraitPropertyName, std::string);
 };
 
 // trait-score ->
 //    SCORE(non-negative-const-integer-expression)
 struct OmpTraitScore {
+  CharBlock source;
   WRAPPER_CLASS_BOILERPLATE(OmpTraitScore, ScalarIntExpr);
 };
 
@@ -3519,8 +3521,10 @@ struct OmpTraitScore {
 //      constant integer expression  <- conflict with (b)
 //
 struct OmpTraitPropertyExtension {
+  CharBlock source;
   TUPLE_CLASS_BOILERPLATE(OmpTraitPropertyExtension);
   struct ExtensionValue {
+    CharBlock source;
     UNION_CLASS_BOILERPLATE(ExtensionValue);
     std::variant<OmpTraitPropertyName, ScalarExpr,
         common::Indirection<OmpTraitPropertyExtension>>
@@ -3541,6 +3545,7 @@ struct OmpTraitPropertyExtension {
 // will happen if the scalar integer expression sees a logical expresion.
 // To avoid this, parse all expressions as scalar expressions.
 struct OmpTraitProperty {
+  CharBlock source;
   UNION_CLASS_BOILERPLATE(OmpTraitProperty);
   std::variant<OmpTraitPropertyName, common::Indirection<OmpClause>,
       ScalarExpr, // trait-property-expresion
@@ -3566,6 +3571,7 @@ struct OmpTraitProperty {
 // Trait-set-selectors:
 //    [D]evice, [T]arget_device, [C]onstruct, [I]mplementation, [U]ser.
 struct OmpTraitSelectorName {
+  CharBlock source;
   UNION_CLASS_BOILERPLATE(OmpTraitSelectorName);
   ENUM_CLASS(Value, Arch, Atomic_Default_Mem_Order, Condition, Device_Num,
       Extension, Isa, Kind, Requires, Simd, Uid, Vendor)
@@ -3576,6 +3582,7 @@ struct OmpTraitSelectorName {
 //    trait-selector-name |
 //    trait-selector-name ([trait-score:] trait-property, ...)
 struct OmpTraitSelector {
+  CharBlock source;
   TUPLE_CLASS_BOILERPLATE(OmpTraitSelector);
   struct Properties {
     TUPLE_CLASS_BOILERPLATE(Properties);
@@ -3588,20 +3595,23 @@ struct OmpTraitSelector {
 //    CONSTRUCT | DEVICE | IMPLEMENTATION | USER |  // since 5.0
 //    TARGET_DEVICE                                 // since 5.1
 struct OmpTraitSetSelectorName {
+  CharBlock source;
   ENUM_CLASS(Value, Construct, Device, Implementation, Target_Device, User)
   WRAPPER_CLASS_BOILERPLATE(OmpTraitSetSelectorName, Value);
 };
 
 // trait-set-selector ->
 //    trait-set-selector-name = {trait-selector, ...}
 struct OmpTraitSetSelector {
+  CharBlock source;
   TUPLE_CLASS_BOILERPLATE(OmpTraitSetSelector);
   std::tuple<OmpTraitSetSelectorName, std::list<OmpTraitSelector>> t;
 };
 
 // context-selector-specification ->
 //    trait-set-selector, ...
 struct OmpContextSelectorSpecification { // Modifier
+  CharBlock source;
   WRAPPER_CLASS_BOILERPLATE(
       OmpContextSelectorSpecification, std::list<OmpTraitSetSelector>);
 };

flang/lib/Parser/openmp-parsers.cpp

@@ -158,32 +158,32 @@ TYPE_PARSER(sourced(construct<OmpDirectiveSpecification>(
 
 // --- Parsers for context traits -------------------------------------
 
-TYPE_PARSER(construct<OmpTraitPropertyName>( //
+TYPE_PARSER(sourced(construct<OmpTraitPropertyName>( //
     (space >> charLiteralConstantWithoutKind) ||
-    applyMem(&Name::ToString, Parser<Name>{})))
+    applyMem(&Name::ToString, Parser<Name>{}))))
 
-TYPE_PARSER(construct<OmpTraitScore>( //
-    "SCORE" >> parenthesized(scalarIntExpr)))
+TYPE_PARSER(sourced(construct<OmpTraitScore>( //
+    "SCORE" >> parenthesized(scalarIntExpr))))
 
-TYPE_PARSER(construct<OmpTraitPropertyExtension::ExtensionValue>(
+TYPE_PARSER(sourced(construct<OmpTraitPropertyExtension::ExtensionValue>(
     // Parse nested extension first.
     construct<OmpTraitPropertyExtension::ExtensionValue>(
         indirect(Parser<OmpTraitPropertyExtension>{})) ||
     construct<OmpTraitPropertyExtension::ExtensionValue>(
         Parser<OmpTraitPropertyName>{}) ||
-    construct<OmpTraitPropertyExtension::ExtensionValue>(scalarExpr)))
+    construct<OmpTraitPropertyExtension::ExtensionValue>(scalarExpr))))
 
-TYPE_PARSER(construct<OmpTraitPropertyExtension>( //
+TYPE_PARSER(sourced(construct<OmpTraitPropertyExtension>( //
     Parser<OmpTraitPropertyName>{},
     parenthesized(nonemptySeparated(
-        Parser<OmpTraitPropertyExtension::ExtensionValue>{}, ","_tok))))
+        Parser<OmpTraitPropertyExtension::ExtensionValue>{}, ","_tok)))))
 
-TYPE_PARSER(construct<OmpTraitProperty>(
-    // Try extension first, before OmpTraitPropertyName.
+TYPE_PARSER(sourced(construct<OmpTraitProperty>(
+    // Try clause first, then extension before OmpTraitPropertyName.
+    construct<OmpTraitProperty>(indirect(Parser<OmpClause>{})) ||
     construct<OmpTraitProperty>(Parser<OmpTraitPropertyExtension>{}) ||
     construct<OmpTraitProperty>(Parser<OmpTraitPropertyName>{}) ||
-    construct<OmpTraitProperty>(indirect(Parser<OmpClause>{})) ||
-    construct<OmpTraitProperty>(scalarExpr)))
+    construct<OmpTraitProperty>(scalarExpr))))
 
 TYPE_PARSER(construct<OmpTraitSelectorName::Value>(
     "ARCH" >> pure(OmpTraitSelectorName::Value::Arch) ||
@@ -199,18 +199,18 @@ TYPE_PARSER(construct<OmpTraitSelectorName::Value>(
     "UID" >> pure(OmpTraitSelectorName::Value::Uid) ||
     "VENDOR" >> pure(OmpTraitSelectorName::Value::Vendor)))
 
-TYPE_PARSER(construct<OmpTraitSelectorName>(
+TYPE_PARSER(sourced(construct<OmpTraitSelectorName>(
     // Parse predefined names first (because of SIMD).
     construct<OmpTraitSelectorName>(Parser<OmpTraitSelectorName::Value>{}) ||
-    construct<OmpTraitSelectorName>(OmpDirectiveNameParser{})))
+    construct<OmpTraitSelectorName>(OmpDirectiveNameParser{}))))
 
 TYPE_PARSER(construct<OmpTraitSelector::Properties>(
     maybe(Parser<OmpTraitScore>{} / ":"_tok),
     nonemptySeparated(Parser<OmpTraitProperty>{}, ","_tok)))
 
-TYPE_PARSER(construct<OmpTraitSelector>( //
+TYPE_PARSER(sourced(construct<OmpTraitSelector>( //
     Parser<OmpTraitSelectorName>{}, //
-    maybe(parenthesized(Parser<OmpTraitSelector::Properties>{}))))
+    maybe(parenthesized(Parser<OmpTraitSelector::Properties>{})))))
 
 TYPE_PARSER(construct<OmpTraitSetSelectorName::Value>(
     "CONSTRUCT" >> pure(OmpTraitSetSelectorName::Value::Construct) ||
@@ -219,15 +219,15 @@ TYPE_PARSER(construct<OmpTraitSetSelectorName::Value>(
     "TARGET_DEVICE" >> pure(OmpTraitSetSelectorName::Value::Target_Device) ||
     "USER" >> pure(OmpTraitSetSelectorName::Value::User)))
 
-TYPE_PARSER(construct<OmpTraitSetSelectorName>(
-    Parser<OmpTraitSetSelectorName::Value>{}))
+TYPE_PARSER(sourced(construct<OmpTraitSetSelectorName>(
+    Parser<OmpTraitSetSelectorName::Value>{})))
 
-TYPE_PARSER(construct<OmpTraitSetSelector>( //
+TYPE_PARSER(sourced(construct<OmpTraitSetSelector>( //
     Parser<OmpTraitSetSelectorName>{},
-    "=" >> braced(nonemptySeparated(Parser<OmpTraitSelector>{}, ","_tok))))
+    "=" >> braced(nonemptySeparated(Parser<OmpTraitSelector>{}, ","_tok)))))
 
-TYPE_PARSER(construct<OmpContextSelectorSpecification>(
-    nonemptySeparated(Parser<OmpTraitSetSelector>{}, ","_tok)))
+TYPE_PARSER(sourced(construct<OmpContextSelectorSpecification>(
+    nonemptySeparated(Parser<OmpTraitSetSelector>{}, ","_tok))))
 
 // Parser<OmpContextSelector> == Parser<traits::OmpContextSelectorSpecification>