Guard "object literals" feature with SWIFT_ENABLE_OBJECT_LITERALS.

This is not a feature we're releasing at the moment, so provide a way
to turn it off.

rdar://problem/21935551

Swift SVN r30966

Author: jrose-apple

CMakeLists.txt

@@ -60,6 +60,10 @@ option(SWIFT_ENABLE_TARGET_TVOS
     "Enable compiler support for targeting tvOS"
     TRUE)
 
+option(SWIFT_ENABLE_OBJECT_LITERALS
+    "Enable compiler support for object literals"
+    TRUE)
+
 set(SWIFT_VERSION "2.0" CACHE STRING
     "The user-visible version of the Swift compiler")
 set(SWIFT_VENDOR "" CACHE STRING

cmake/modules/AddSwift.cmake

@@ -55,11 +55,6 @@ function(_add_variant_c_compile_link_flags
         "-m${SWIFT_SDK_${sdk}_VERSION_MIN_NAME}-version-min=${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION}")
   endif()
 
-  if(${SWIFT_ENABLE_TARGET_TVOS})
-    list(APPEND result
-        " -DSWIFT_ENABLE_TARGET_TVOS=\"1\"")
-  endif()
-
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -99,6 +94,14 @@ function(_add_variant_c_compile_flags
     list(APPEND result "-DNDEBUG")
   endif()
 
+  if(SWIFT_ENABLE_TARGET_TVOS)
+    list(APPEND result "-DSWIFT_ENABLE_TARGET_TVOS=\"1\"")
+  endif()
+
+  if(SWIFT_ENABLE_OBJECT_LITERALS)
+    list(APPEND result "-DSWIFT_ENABLE_OBJECT_LITERALS=\"1\"")
+  endif()
+
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -132,6 +135,10 @@ function(_add_variant_swift_compile_flags
     list(APPEND result "-D" "INTERNAL_CHECKS_ENABLED")
   endif()
 
+  if(SWIFT_ENABLE_OBJECT_LITERALS)
+    list(APPEND result "-D" "SWIFT_ENABLE_OBJECT_LITERALS")
+  endif()
+
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 

include/swift/AST/DiagnosticsParse.def

@@ -987,13 +987,15 @@ ERROR(expected_rsquare_expr_list,expr_parsing,none,
 ERROR(expected_rsquare_array_expr,expr_parsing,PointsToFirstBadToken,
       "expected ']' in container literal expression", ())
 
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 // Object literal expressions
 ERROR(expected_identifier_after_l_square_lit,expr_parsing,none,
       "expected identifier after '[#' in object literal expression", ())
 ERROR(expected_arg_list_in_object_literal,expr_parsing,none,
       "expected argument list in object literal", ())
 ERROR(expected_r_square_lit_after_object_literal,expr_parsing,none,
       "expected '#]' at end of object literal expression", ())
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 // If expressions
 ERROR(expected_expr_after_if_question,expr_parsing,none,

include/swift/AST/DiagnosticsSema.def

@@ -339,8 +339,10 @@ ERROR(pattern_used_in_type,sema_nb,none,
 NOTE(note_module_as_type,sema_nb,none,
      "cannot use module %0 as a type", (Identifier))
 
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 ERROR(use_unknown_object_literal,sema_nb,none,
      "use of unknown object literal name %0", (Identifier))
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 ERROR(use_non_type_value,sema_nb,none,
       "%0 is not a type", (Identifier))
@@ -1624,8 +1626,10 @@ ERROR(interpolation_broken_proto,sema_tce,none,
       "protocol 'StringInterpolationConvertible' is broken",
       ())
 
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 ERROR(object_literal_broken_proto,sema_tce,none,
       "object literal protocol is broken", ())
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 ERROR(discard_expr_outside_of_assignment,sema_tce,none,
       "'_' can only appear in a pattern or on the left side of an assignment",

include/swift/AST/Expr.h

@@ -773,6 +773,7 @@ class MagicIdentifierLiteralExpr : public LiteralExpr {
   }
 };
 
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 // ObjectLiteralExpr - An expression of the form
 // '[#Color(red: 1, blue: 0, green: 0, alpha: 1)#]' with a name and a list
 // argument. The components of the list argument are meant to be themselves
@@ -809,6 +810,7 @@ class ObjectLiteralExpr : public LiteralExpr {
     return E->getKind() == ExprKind::ObjectLiteral;
   }
 };
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 /// DiscardAssignmentExpr - A '_' in the left-hand side of an assignment, which
 /// discards the corresponding tuple element on the right-hand side.

include/swift/AST/ExprNodes.def

@@ -56,9 +56,11 @@ ABSTRACT_EXPR(Literal, Expr)
   EXPR(BooleanLiteral, LiteralExpr)
   EXPR(StringLiteral, LiteralExpr)
   EXPR(InterpolatedStringLiteral, LiteralExpr)
-  EXPR(MagicIdentifierLiteral, LiteralExpr)
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
   EXPR(ObjectLiteral, LiteralExpr)
-  EXPR_RANGE(Literal, NilLiteral, ObjectLiteral)
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
+  EXPR(MagicIdentifierLiteral, LiteralExpr)
+  EXPR_RANGE(Literal, NilLiteral, MagicIdentifierLiteral)
 EXPR(DiscardAssignment, Expr)
 EXPR(DeclRef, Expr)
 EXPR(SuperRef, Expr)

include/swift/AST/KnownProtocols.def

@@ -61,8 +61,11 @@ LITERAL_CONVERTIBLE_PROTOCOL(StringInterpolationConvertible, string)
 LITERAL_CONVERTIBLE_PROTOCOL(StringLiteralConvertible, string)
 LITERAL_CONVERTIBLE_PROTOCOL(NilLiteralConvertible, nil)
 LITERAL_CONVERTIBLE_PROTOCOL(UnicodeScalarLiteralConvertible, character)
+
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 LITERAL_CONVERTIBLE_PROTOCOL(_ColorLiteralConvertible, color)
 LITERAL_CONVERTIBLE_PROTOCOL(_ImageLiteralConvertible, image)
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 BUILTIN_LITERAL_CONVERTIBLE_PROTOCOL(_BuiltinBooleanLiteralConvertible)
 BUILTIN_LITERAL_CONVERTIBLE_PROTOCOL(_BuiltinExtendedGraphemeClusterLiteralConvertible)

include/swift/IDE/SyntaxModel.h

@@ -53,8 +53,10 @@ enum class SyntaxNodeKind : uint8_t {
   AttributeBuiltin,
   /// An editor placeholder string <#like this#>.
   EditorPlaceholder,
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
   /// An editor object literal [#like(this)#]
   ObjectLiteral
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 };
 
 struct SyntaxNode {
@@ -105,7 +107,9 @@ enum class SyntaxStructureKind : uint8_t {
   CallExpression,
   ArrayExpression,
   DictionaryExpression,
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
   ObjectLiteralExpression,
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 };
 
 enum class SyntaxStructureElementKind : uint8_t {

include/swift/Parse/Parser.h

@@ -1136,7 +1136,9 @@ class Parser {
 
   Expr *parseExprAnonClosureArg();
   ParserResult<Expr> parseExprList(tok LeftTok, tok RightTok);
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
   ParserResult<Expr> parseExprObjectLiteral();
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
   ParserResult<Expr> parseExprCallSuffix(ParserResult<Expr> fn,
                                          Identifier firstSelectorPiece
                                            = Identifier(),

include/swift/Parse/Tokens.def

@@ -123,8 +123,10 @@ PUNCTUATOR(r_brace,       "}")
 PUNCTUATOR(l_square,      "[")
 PUNCTUATOR(r_square,      "]")
 
+#ifdef SWIFT_ENABLE_OBJECT_LITERALS
 PUNCTUATOR(l_square_lit,  "[#")
 PUNCTUATOR(r_square_lit,  "#]")
+#endif // SWIFT_ENABLE_OBJECT_LITERALS
 
 PUNCTUATOR(period,        ".")
 PUNCTUATOR(period_prefix, ".")