WIP: Syntax for creating ImmutableArrays

src/Compiler/Checking/CheckExpressions.fs

@@ -5889,7 +5889,19 @@ and TcExprArrayOrList (cenv: cenv) overallTy env tpenv (cType: CollectionType, a
             | CollectionType.List ->
                 List.foldBack (mkCons g argTy) argsR (mkNil g m argTy)
             | CollectionType.ImmutableArray ->
-                Expr.Op (TOp.Block, [argTy], argsR, m)
+                //// TODO: the idea is to use code from builder called in LowerComputedListOrArraySeqExpr. Need to find tcVal to check whether the approach works.
+                //let infoReader = InfoReader(g, cenv.amap)
+                //let collectorTy = g.mk_BlockCollector_ty argTy
+                //let name = "AddMany"
+                //let collVal, collExpr = mkMutableCompGenLocal m "@collector" collectorTy
+                //let listCollectorTy = tyOfExpr g collExpr
+                //let addMethod = 
+                //    match GetIntrinsicMethInfosOfType infoReader (Some name) AccessibleFromSomewhere AllowMultiIntfInstantiations.Yes IgnoreOverrides m listCollectorTy with
+                //    | [x] -> x
+                //    | _ -> error(InternalError("no " + name + " method found on Collector", m))
+                //let expr, _ = BuildMethodCall tcVal g infoReader.amap DefinitelyMutates m false addMethod NormalValUse [] [collExpr] args None
+                //expr
+                Expr.Op (TOp.Block, [argTy], argsR, m) // This code goes down a path that is currently not handled
         expr, tpenv
     )
 

src/Compiler/CodeGen/IlxGen.fs

@@ -3001,6 +3001,9 @@ and GenExprAux (cenv: cenv) (cgbuf: CodeGenBuffer) eenv expr (sequel: sequel) =
             | TOp.LValueOp (LByrefSet, v), [ e ], [] -> GenSetByref cenv cgbuf eenv (v, e, m) sequel
             | TOp.LValueOp (LAddrOf _, v), [], [] -> GenGetValAddr cenv cgbuf eenv (v, m) sequel
             | TOp.Array, elems, [ elemTy ] -> GenNewArray cenv cgbuf eenv (elems, elemTy, m) sequel
+            | TOp.Block, elems, [ elemTy ] ->
+                // This codepath is currently reached with non-computation-expression arrays and not handled
+                failwith $"entering | TOp.Block, {elems}, [ {elemTy} ] ->"
             | TOp.Bytes bytes, [], [] ->
                 if cenv.options.emitConstantArraysUsingStaticDataBlobs then
                     GenConstArray cenv cgbuf eenv g.ilg.typ_Byte bytes (fun buf b -> buf.EmitByte b)

src/Compiler/pars.fsy

@@ -4506,6 +4506,9 @@ atomicExpr:
   | LBRACK listExprElements RBRACK
       { $2 (lhs parseState), false }
 
+  | immarrayExpr
+      { $1, false }
+
   | LBRACK listExprElements recover
       { reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnmatchedBracket())
         exprFromParseError ($2 (rhs2 parseState 1 2)), false }

tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj

@@ -169,6 +169,7 @@
     <Compile Include="ErrorMessages\InterfaceImplInAugmentationsTests.fs" />	
     <Compile Include="Language\IndexerSetterParamArray.fs" />
     <Compile Include="Language\MultiDimensionalArrayTests.fs" />
+    <Compile Include="Language\ImmArrayTests.fs" />
     <Compile Include="Language\RegressionTests.fs" />
     <Compile Include="Language\AttributeCheckingTests.fs" />
     <Compile Include="Language\ObsoleteAttributeCheckingTests.fs" />
@@ -187,6 +188,9 @@
     <Compile Include="Language\PrintfFormatTests.fs" />
 	<Compile Include="Language\InterfaceTests.fs" />
 	<Compile Include="Language\CopyAndUpdateTests.fs" />
+	<None Include="**\*.cs;**\*.fs;**\*.fsx;**\*.fsi" Exclude="@(Compile)">
+      <Link>%(RelativeDir)TestSource\%(Filename)%(Extension)</Link>
+    </None>
     <Compile Include="ConstraintSolver\PrimitiveConstraints.fs" />
     <Compile Include="ConstraintSolver\MemberConstraints.fs" />
     <Compile Include="Interop\DeeplyNestedCSharpClasses.fs" />
@@ -248,11 +252,7 @@
     <Compile Include="FSharpChecker\FindReferences.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="**\*.cs;**\*.fs;**\*.fsx;**\*.fsi" Exclude="@(Compile)">
-      <Link>%(RelativeDir)TestSource\%(Filename)%(Extension)</Link>
-    </None>
-  </ItemGroup>
+  <ItemGroup />
 
   <ItemGroup>
     <None Include="**\*.bsl">

tests/FSharp.Compiler.ComponentTests/Language/ImmArrayTests.fs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+module FSharp.Compiler.ComponentTests.Language.ImmArrayTests
+
+open Xunit
+open FSharp.Test.Compiler
+
+[<Fact>]
+let ``Check creation of a single-element immarray``() =
+    FSharp """
+module ImmarrayTest
+
+let x = [: 42 :]
+    """
+    |> compile
+    |> shouldSucceed
+
+[<Fact>]
+let ``Check creation of an immarray with yields``() =
+    FSharp """
+module ImmarrayTest
+
+let x = [: for i = 0 to 100 do yield 42 :]
+let y = x |> Seq.sum
+    """
+    |> compile
+    |> shouldSucceed