---

yaml
---
r: 348917
b: refs/heads/master
c: 242f9a7
h: refs/heads/master
i:
  348915: 104baca

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0d4cf76ed0b6dfed4b13c58f7ee5a13473d10e3e
+refs/heads/master: 242f9a72733f0973be85434c89d2c889c877e403
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Parse/ASTGen.h

@@ -37,6 +37,9 @@ class ASTGen {
 
   // FIXME: remove when Syntax can represent all types and ASTGen can handle
   // them
+  /// Exprs that cannot be represented by Syntax or generated by ASTGen.
+  llvm::DenseMap<SourceLoc, Expr *> Exprs;
+
   /// Decl attributes that cannot be represented by Syntax or generated by
   /// ASTGen.
   llvm::DenseMap<SourceLoc, DeclAttributes> ParsedDeclAttrs;
@@ -220,6 +223,10 @@ class ASTGen {
   TypeRepr *lookupType(syntax::TypeSyntax Type);
 
 public:
+  void addExpr(Expr *Expr, const SourceLoc Loc);
+  bool hasExpr(const SourceLoc Loc) const;
+  Expr *getExpr(const SourceLoc Loc) const;
+
   void addDeclAttributes(DeclAttributes attrs, const SourceLoc Loc);
   bool hasDeclAttributes(SourceLoc Loc) const;
   DeclAttributes getDeclAttributes(const SourceLoc Loc) const;

trunk/include/swift/Parse/Parser.h

@@ -1428,6 +1428,7 @@ class Parser {
 
   //===--------------------------------------------------------------------===//
   // Expression Parsing
+  ParsedSyntaxResult<ParsedExprSyntax> parseExpressionSyntax(Diag<> ID);
   ParserResult<Expr> parseExpr(Diag<> ID) {
     return parseExprImpl(ID, /*isExprBasic=*/false);
   }

trunk/lib/Parse/ASTGen.cpp

@@ -232,6 +232,10 @@ TrailingWhereClause *ASTGen::generate(const GenericWhereClauseSyntax &syntax,
 Expr *ASTGen::generate(const ExprSyntax &E, const SourceLoc Loc) {
   Expr *result = nullptr;
 
+  auto exprLoc = advanceLocBegin(Loc, E);
+  if (hasExpr(exprLoc))
+    return getExpr(exprLoc);
+
   if (auto identifierExpr = E.getAs<IdentifierExprSyntax>())
     result = generate(*identifierExpr, Loc);
   else if (auto superRefExpr = E.getAs<SuperRefExprSyntax>())
@@ -1351,6 +1355,30 @@ TypeRepr *ASTGen::lookupType(TypeSyntax Type) {
   return Found != TypeCache.end() ? Found->second : nullptr;
 }
 
+void ASTGen::addExpr(Expr *E, const SourceLoc Loc) {
+#ifndef NDEBUG
+  if (hasExpr(Loc)) {
+    bool PrevIsSubExpr = false;
+    Expr *Prev = Exprs.find(Loc)->second;
+    E->forEachChildExpr([&](Expr *Child) {
+      if (Child == Prev)
+        PrevIsSubExpr = true;
+      return Child;
+    });
+    assert(PrevIsSubExpr);
+  }
+#endif
+  Exprs.insert({Loc, E});
+}
+
+bool ASTGen::hasExpr(const SourceLoc Loc) const {
+  return Exprs.find(Loc) != Exprs.end();
+}
+
+Expr *ASTGen::getExpr(const SourceLoc Loc) const {
+  return Exprs.find(Loc)->second;
+}
+
 void ASTGen::addDeclAttributes(DeclAttributes attrs, SourceLoc Loc) {
   ParsedDeclAttrs.insert({Loc, attrs});
 }

trunk/lib/Parse/ParseExpr.cpp

@@ -35,6 +35,19 @@
 using namespace swift;
 using namespace swift::syntax;
 
+ParsedSyntaxResult<ParsedExprSyntax> Parser::parseExpressionSyntax(Diag<> ID) {
+  SourceLoc ExprLoc = Tok.getLoc();
+  SyntaxParsingContext ExprParsingContext(SyntaxContext,
+                                          SyntaxContextKind::Expr);
+  ExprParsingContext.setTransparent();
+  ParserResult<Expr> Result = parseExpr(ID);
+  if (auto ParsedExpr = ExprParsingContext.popIf<ParsedExprSyntax>()) {
+    Generator.addExpr(Result.getPtrOrNull(), ExprLoc);
+    return makeParsedResult(std::move(*ParsedExpr), Result.getStatus());
+  }
+  return Result.getStatus();
+}
+
 /// parseExpr
 ///
 ///   expr: