From 509436cab1e809af6297bd15469e5077a17c379b Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Mon, 4 Feb 2019 12:24:25 -0800
Subject: [PATCH] [flang] begin work on structure constructors

Original-commit: flang-compiler/f18@7131a2f91d8bfeed4d675be1db53b52e99acc83f
Reviewed-on: https://github.com/flang-compiler/f18/pull/287
Tree-same-pre-rewrite: false
---
 flang/lib/semantics/resolve-names.cc | 22 +++++++++++++++++++++-
 flang/lib/semantics/symbol.cc        |  6 +++---
 flang/lib/semantics/symbol.h         | 20 +++++++++++++-------
 flang/lib/semantics/type.cc          |  3 ++-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc
index 685aac5..3f2ec42 100644
--- a/flang/lib/semantics/resolve-names.cc
+++ b/flang/lib/semantics/resolve-names.cc
@@ -3057,9 +3057,29 @@ bool DeclarationVisitor::Pre(const parser::StructureConstructor &x) {
   auto savedState{SetDeclTypeSpecState({})};
   BeginDeclTypeSpec();
   Walk(std::get<parser::DerivedTypeSpec>(x.t));
-  Walk(std::get<std::list<parser::ComponentSpec>>(x.t));
+  const DeclTypeSpec *type{GetDeclTypeSpec()};
   EndDeclTypeSpec();
   SetDeclTypeSpecState(savedState);
+  bool anyKeyword{false};
+  for (const auto &component :
+      std::get<std::list<parser::ComponentSpec>>(x.t)) {
+    Walk(component);
+    Symbol *symbol{nullptr};
+    const parser::Expr &value{
+        *std::get<parser::ComponentDataSource>(component.t).v};
+    if (const auto &kw{std::get<std::optional<parser::Keyword>>(component.t)}) {
+      symbol = kw->v.symbol;
+      anyKeyword = true;
+    } else if (anyKeyword) {
+      Say(value.source,
+          "Component value lacks a required component name"_err_en_US);
+    } else {
+      // TODO: keyword = next component in component order
+    }
+    MaybeExpr expr{EvaluateExpr(value)};
+    if (type != nullptr && symbol != nullptr && expr.has_value()) {
+    }
+  }
   return false;
 }
 
diff --git a/flang/lib/semantics/symbol.cc b/flang/lib/semantics/symbol.cc
index 5f7ded7a..a38c039 100644
--- a/flang/lib/semantics/symbol.cc
+++ b/flang/lib/semantics/symbol.cc
@@ -616,15 +616,15 @@ std::list<SourceName> DerivedTypeDetails::OrderParameterNames(
   return result;
 }
 
-std::list<Symbol *> DerivedTypeDetails::OrderParameterDeclarations(
+std::list<const Symbol *> DerivedTypeDetails::OrderParameterDeclarations(
     const Symbol &type) const {
-  std::list<Symbol *> result;
+  std::list<const Symbol *> result;
   if (const DerivedTypeSpec * spec{type.GetParentTypeSpec()}) {
     const DerivedTypeDetails &details{
         spec->typeSymbol().get<DerivedTypeDetails>()};
     result = details.OrderParameterDeclarations(spec->typeSymbol());
   }
-  for (Symbol *symbol : paramDecls_) {
+  for (const Symbol *symbol : paramDecls_) {
     result.push_back(symbol);
   }
   return result;
diff --git a/flang/lib/semantics/symbol.h b/flang/lib/semantics/symbol.h
index c94a83d..0623134 100644
--- a/flang/lib/semantics/symbol.h
+++ b/flang/lib/semantics/symbol.h
@@ -194,11 +194,13 @@ private:
 class DerivedTypeDetails {
 public:
   const std::list<SourceName> &paramNames() const { return paramNames_; }
-  const std::list<Symbol *> &paramDecls() const { return paramDecls_; }
+  const std::list<const Symbol *> &paramDecls() const { return paramDecls_; }
   SourceName extends() const { return extends_; }
   bool sequence() const { return sequence_; }
   void add_paramName(const SourceName &name) { paramNames_.emplace_back(name); }
-  void add_paramDecl(Symbol &symbol) { paramDecls_.emplace_back(&symbol); }
+  void add_paramDecl(const Symbol &symbol) {
+    paramDecls_.emplace_back(&symbol);
+  }
   void set_extends(const SourceName &name) { extends_ = name; }
   void set_sequence(bool x = true) { sequence_ = x; }
 
@@ -209,14 +211,18 @@ public:
   // Returns the complete list of derived type parameter symbols in
   // the order in which their declarations appear in the derived type
   // definitions (parents first).
-  std::list<Symbol *> OrderParameterDeclarations(const Symbol &) const;
+  std::list<const Symbol *> OrderParameterDeclarations(const Symbol &) const;
 
 private:
-  // These are the names of the derived type parameters in (1) the order
-  // in which they appear on the type definition statement, and (2) the
-  // order in which their declarations appear in the derived type definition.
+  // These are (1) the names of the derived type parameters in the order
+  // in which they appear on the type definition statement(s), and (2) the
+  // symbols that correspond to those names in the order in which their
+  // declarations appear in the derived type definition(s).
   std::list<SourceName> paramNames_;
-  std::list<Symbol *> paramDecls_;
+  std::list<const Symbol *> paramDecls_;
+  // These are the declarations of the derived type's components in component
+  // order.  A parent component, if any, appears first in this list.
+  std::list<const Symbol *> components_;
   SourceName extends_;
   bool sequence_{false};
 };
diff --git a/flang/lib/semantics/type.cc b/flang/lib/semantics/type.cc
index 4ddf6ee..1bcbe9d 100644
--- a/flang/lib/semantics/type.cc
+++ b/flang/lib/semantics/type.cc
@@ -84,7 +84,8 @@ void DerivedTypeSpec::Instantiate(
   evaluate::FoldingContext &foldingContext{semanticsContext.foldingContext()};
   auto restorer{foldingContext.WithPDTInstance(*this)};
 
-  for (Symbol *symbol : typeDetails.OrderParameterDeclarations(typeSymbol_)) {
+  for (const Symbol *symbol :
+      typeDetails.OrderParameterDeclarations(typeSymbol_)) {
     const SourceName &name{symbol->name()};
     const TypeParamDetails &details{symbol->get<TypeParamDetails>()};
     MaybeIntExpr expr;
-- 
2.7.4