Remove -preview=tuples flag.

Author: tgehr

changelog/dmd.tuple-unpacking.dd

@@ -2,11 +2,9 @@ Tuple unpacking is now supported!
 
 D now supports tuple unpacking for variable declarations, `foreach` loops, and function literal
 template parameters.
-This feature is available as a preview and can be enabled with the `-preview=tuples` compiler switch.
 It allows extracting multiple values from a tuple or compile-time sequence directly into distinct variables.
 
 -------
-// Requires -preview=tuples
 import std.typecons : tuple;
 
 void main()

compiler/include/dmd/globals.h

@@ -227,7 +227,6 @@ struct Param
                                  // Implementation: https://github.com/dlang/dmd/pull/9817
     FeatureState safer;          // safer by default (more @safe checks in unattributed code)
                                  // https://github.com/WalterBright/documents/blob/38f0a846726b571f8108f6e63e5e217b91421c86/safer.md
-    FeatureState tuples;         // Tuple unpacking
 
     FeatureState noSharedAccess; // read/write access to shared memory objects
     d_bool previewIn;              // `in` means `[ref] scope const`, accepts rvalues
@@ -335,7 +334,6 @@ struct CompileEnv
     DString time;
     DString vendor;
     DString timestamp;
-    d_bool tuples;
     d_bool previewIn;
     d_bool transitionIn;
     d_bool ddocOutput;

compiler/src/dmd/cli.d

@@ -1111,9 +1111,6 @@ dmd -cov -unittest myprog.d
         Feature("safer", "safer",
             "more safety checks by default",
             "https://github.com/WalterBright/documents/blob/38f0a846726b571f8108f6e63e5e217b91421c86/safer.md", true, false),
-        Feature("tuples", "tuples",
-            "enable tuple unpacking",
-            "https://github.com/tgehr/DIPs/blob/tuple-syntax/DIPs/DIP1xxx-tg.md"),
         Feature("nosharedaccess", "noSharedAccess",
             "disable access to shared memory objects",
             "https://dlang.org/spec/const3.html#shared"),

compiler/src/dmd/globals.d

@@ -207,7 +207,6 @@ extern (C++) struct Param
                                  // Implementation: https://github.com/dlang/dmd/pull/9817
     FeatureState safer;          // safer by default (more @safe checks in unattributed code)
                                  // https://github.com/WalterBright/documents/blob/38f0a846726b571f8108f6e63e5e217b91421c86/safer.md
-    FeatureState tuples;         // Tuple unpacking
     FeatureState noSharedAccess; // read/write access to shared memory objects
     bool previewIn;              // `in` means `[ref] scope const`, accepts rvalues
     bool inclusiveInContracts;   // 'in' contracts of overridden methods must be a superset of parent contract

compiler/src/dmd/lexer.d

@@ -47,7 +47,6 @@ struct CompileEnv
     const(char)[] vendor;    /// __VENDOR__
     const(char)[] timestamp; /// __TIMESTAMP__
 
-    bool tuples;             //// tuple unpacking syntax
     bool previewIn;          /// `in` means `[ref] scope const`, accepts rvalues
     bool transitionIn;       /// `-transition=in` is active, `in` parameters are listed
     bool ddocOutput;         /// collect embedded documentation comments

compiler/src/dmd/main.d

@@ -205,7 +205,6 @@ private int tryMain(const(char)[][] argv, out Param params)
     }
     global.errorSink.errorLimit = global.params.v.errorLimit;
 
-    global.compileEnv.tuples           = params.tuples == FeatureState.enabled;
     global.compileEnv.previewIn        = params.previewIn;
     global.compileEnv.transitionIn     = params.v.vin;
     global.compileEnv.ddocOutput       = params.ddoc.doOutput;

compiler/src/dmd/parse.d

@@ -337,7 +337,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
         auto next = peek(t);
         if (next.value != TOK.leftParenthesis)
             return false;
-        if (compileEnv.tuples && isTupleNotation(next))
+        if (isTupleNotation(next))
             return false;
         return true;
     }
@@ -845,7 +845,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 {
                     auto next = peek(&token);
                     if (next.value != TOK.leftParenthesis ||
-                        compileEnv.tuples && peekPastParen(next).value == TOK.assign)
+                        peekPastParen(next).value == TOK.assign)
                     {
                         stc = STC.extern_;
                         goto Lstc;
@@ -1098,7 +1098,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
 
             case TOK.leftParenthesis:
                 // confirm unpacking for better error messages:
-                if (compileEnv.tuples && peekPastParen(&token).value == TOK.assign)
+                if (peekPastParen(&token).value == TOK.assign)
                     goto Ldeclaration;
                 goto default;
 
@@ -1288,7 +1288,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
      * Parse auto declarations of the form:
      *   storageClass ident = init, ident = init, ... ;
      * and return the array of them.
-     * Starts with token on the first ident, or '(' with -preview=tuples.
+     * Starts with token on the first ident, or '('
      * Ends with scanner past closing ';'
      */
     private AST.Dsymbols* parseAutoDeclarations(STC storageClass, const(char)* comment)
@@ -1302,7 +1302,6 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
             AST.Dsymbol s;
             if (token.value == TOK.leftParenthesis)
             {
-                assert(compileEnv.tuples);
                 s = parseUnpackDeclaration(storageClass, true);
                 if (!storageClass && token.value == TOK.comma)
                 {
@@ -3239,7 +3238,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                             if (tpl && !*tpl && hasAutoRefParam)
                                 *tpl = new AST.TemplateParameters();
 
-                            if (compileEnv.tuples && tpl && token.value == TOK.leftParenthesis)
+                            if (tpl && token.value == TOK.leftParenthesis)
                             {
                                 const tv2 = peekPastParen(&token).value;
                                 if (tv2 == TOK.comma || tv2 == TOK.rightParenthesis || tv2 == TOK.dotDotDot)
@@ -4643,7 +4642,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 {
                     auto next = peek(&token);
                     if (next.value != TOK.leftParenthesis ||
-                        compileEnv.tuples && peekPastParen(next).value == TOK.assign)
+                        peekPastParen(next).value == TOK.assign)
                     {
                         stc = STC.extern_;
                         goto L1;
@@ -4804,7 +4803,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
              *  (int x, auto y) = initializer;
              *  storage_class (a, b, ...) = initializer;
              */
-            if (compileEnv.tuples && token.value == TOK.leftParenthesis &&
+            if (token.value == TOK.leftParenthesis &&
                 isTupleNotation(&token))
             {
                 // TODO: can we merge this with the branch below?
@@ -5962,7 +5961,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                     goto Larg;
                 }
             }
-            else if (compileEnv.tuples && token.value == TOK.leftParenthesis)
+            else if (token.value == TOK.leftParenthesis)
             {
                 TOK after = peekPastParen(&token).value;
                 if (after == TOK.comma || after == TOK.semicolon)
@@ -6670,7 +6669,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
         case TOK.scope_:
             auto next = peek(&token);
             if (next.value != TOK.leftParenthesis ||
-                compileEnv.tuples && peekPastParen(next).value == TOK.assign)
+                peekPastParen(next).value == TOK.assign)
                 goto Ldeclaration; // scope used as storage class
             nextToken();
             check(TOK.leftParenthesis);

compiler/test/compilable/previewhelp.d

@@ -14,7 +14,6 @@ Upcoming language changes listed by -preview=name:
   =fixAliasThis     when a symbol is resolved, check alias this scope before going to upper scopes (https://github.com/dlang/dmd/pull/8885)
   =rvaluerefparam   enable rvalue arguments to ref parameters (https://gist.github.com/andralex/e5405a5d773f07f73196c05f8339435a)
   =safer            more safety checks by default (https://github.com/WalterBright/documents/blob/38f0a846726b571f8108f6e63e5e217b91421c86/safer.md)
-  =tuples           enable tuple unpacking (https://github.com/tgehr/DIPs/blob/tuple-syntax/DIPs/DIP1xxx-tg.md)
   =nosharedaccess   disable access to shared memory objects (https://dlang.org/spec/const3.html#shared)
   =in               `in` on parameters means `scope const [ref]` and accepts rvalues (https://dlang.org/spec/function.html#in-params)
   =inclusiveincontracts 'in' contracts of overridden methods must be a superset of parent contract (https://dlang.org/changelog/2.095.0.html#inclusive-incontracts)

compiler/test/fail_compilation/unpack_semantic.d

@@ -1,13 +1,12 @@
 /*
-REQUIRED_ARGS: -preview=tuples
 TEST_OUTPUT:
 ---
-fail_compilation/unpack_semantic.d(18): Error: right hand side of unpack declaration must resolve to a tuple or expression sequence, not `int[]`
-fail_compilation/unpack_semantic.d(19): Error: incompatible number of components for unpack declaration (`2` vs. `3`)
-fail_compilation/unpack_semantic.d(22): Error: cannot specify `static` for individual components of an unpack declaration
-fail_compilation/unpack_semantic.d(23): Error: cannot specify `enum` for individual components of an unpack declaration
-fail_compilation/unpack_semantic.d(26): Error: cannot implicitly convert expression `3.0F` of type `float` to `int`
-fail_compilation/unpack_semantic.d(27): Error: cannot implicitly convert expression `7` of type `int` to `void*`
+fail_compilation/unpack_semantic.d(17): Error: right hand side of unpack declaration must resolve to a tuple or expression sequence, not `int[]`
+fail_compilation/unpack_semantic.d(18): Error: incompatible number of components for unpack declaration (`2` vs. `3`)
+fail_compilation/unpack_semantic.d(21): Error: cannot specify `static` for individual components of an unpack declaration
+fail_compilation/unpack_semantic.d(22): Error: cannot specify `enum` for individual components of an unpack declaration
+fail_compilation/unpack_semantic.d(25): Error: cannot implicitly convert expression `3.0F` of type `float` to `int`
+fail_compilation/unpack_semantic.d(26): Error: cannot implicitly convert expression `7` of type `int` to `void*`
 ---
 */
 

compiler/test/fail_compilation/unpacking.d

@@ -1,5 +1,5 @@
 /*
-REQUIRED_ARGS: -preview=tuples -vcolumns
+REQUIRED_ARGS: -vcolumns
 TEST_OUTPUT:
 ---
 fail_compilation/unpacking.d(30,14): Error: unpacked variable `b` needs a type or at least one storage class, did you mean `auto b`?