Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 361117f1 编写于 作者: C Charles Stoner
浏览文件
操作

Merge pull request #5779 from cston/4495 

Script.<Main> should block until <Initialize> has completed

Script.<Main> is now defined as (new Script()).<Initialize>().GetAwaiter().GetResult();

Fixes #4495
上级 1ee3d29f 67a5b653
隐藏空白更改
内联 并排
Showing with 580 addition and 308 deletion
src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs
浏览文件 @ 361117f1
......@@ -2827,7 +2827,7 @@ private void AddSynthesizedConstructorsIfNecessary(ArrayBuilder<Symbol> members,
{
var scriptInitializer = new SynthesizedInteractiveInitializerMethod(this, diagnostics);
members.Add(scriptInitializer);
var scriptEntryPoint = SynthesizedEntryPointSymbol.Create(this, scriptInitializer.ReturnType, diagnostics);
var scriptEntryPoint = SynthesizedEntryPointSymbol.Create(scriptInitializer, diagnostics);
members.Add(scriptEntryPoint);
}
}
......
src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEntryPointSymbol.cs
浏览文件 @ 361117f1
......@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.CSharp.Symbols
......@@ -18,22 +19,38 @@ internal abstract class SynthesizedEntryPointSymbol : MethodSymbol
private readonly NamedTypeSymbol _containingType;
private readonly TypeSymbol _returnType;
internal static SynthesizedEntryPointSymbol Create(NamedTypeSymbol containingType, TypeSymbol returnType, DiagnosticBag diagnostics)
internal static SynthesizedEntryPointSymbol Create(SynthesizedInteractiveInitializerMethod initializerMethod, DiagnosticBag diagnostics)
{
var containingType = initializerMethod.ContainingType;
var compilation = containingType.DeclaringCompilation;
if (containingType.ContainingAssembly.IsInteractive)
if (compilation.IsSubmission)
{
var submissionArrayType = compilation.CreateArrayTypeSymbol(compilation.GetSpecialType(SpecialType.System_Object));
var useSiteDiagnostic = submissionArrayType.GetUseSiteDiagnostic();
if (useSiteDiagnostic != null)
{
ReportUseSiteDiagnostic(useSiteDiagnostic, diagnostics, NoLocation.Singleton);
}
return new SubmissionEntryPoint(containingType, returnType, submissionArrayType);
ReportUseSiteDiagnostics(submissionArrayType, diagnostics);
return new SubmissionEntryPoint(
containingType,
initializerMethod.ReturnType,
submissionArrayType);
}
else
{
return new ScriptEntryPoint(containingType, returnType);
var taskType = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task);
#if DEBUG
HashSet<DiagnosticInfo> useSiteDiagnostics = null;
Debug.Assert(taskType.IsErrorType() || initializerMethod.ReturnType.IsDerivedFrom(taskType, ignoreDynamic: true, useSiteDiagnostics: ref useSiteDiagnostics));
#endif
ReportUseSiteDiagnostics(taskType, diagnostics);
var getAwaiterMethod = taskType.IsErrorType() ?
null :
GetRequiredMethod(taskType, WellKnownMemberNames.GetAwaiter, diagnostics);
var getResultMethod = ((object)getAwaiterMethod == null) ?
null :
GetRequiredMethod(getAwaiterMethod.ReturnType, WellKnownMemberNames.GetResult, diagnostics);
return new ScriptEntryPoint(
containingType,
compilation.GetSpecialType(SpecialType.System_Void),
getAwaiterMethod,
getResultMethod);
}
}
......@@ -265,13 +282,56 @@ private CSharpSyntaxNode GetSyntax()
return (CSharpSyntaxNode)syntaxTree.GetRoot();
}
private static void ReportUseSiteDiagnostics(Symbol symbol, DiagnosticBag diagnostics)
{
var useSiteDiagnostic = symbol.GetUseSiteDiagnostic();
if (useSiteDiagnostic != null)
{
ReportUseSiteDiagnostic(useSiteDiagnostic, diagnostics, NoLocation.Singleton);
}
}
private static MethodSymbol GetRequiredMethod(TypeSymbol type, string methodName, DiagnosticBag diagnostics)
{
var method = type.GetMembers(methodName).SingleOrDefault() as MethodSymbol;
if ((object)method == null)
{
diagnostics.Add(ErrorCode.ERR_MissingPredefinedMember, NoLocation.Singleton, type, methodName);
}
return method;
}
private static BoundCall CreateParameterlessCall(CSharpSyntaxNode syntax, BoundExpression receiver, MethodSymbol method)
{
return new BoundCall(
syntax,
receiver,
method,
ImmutableArray<BoundExpression>.Empty,
default(ImmutableArray<string>),
default(ImmutableArray<RefKind>),
isDelegateCall: false,
expanded: false,
invokedAsExtensionMethod: false,
argsToParamsOpt: default(ImmutableArray<int>),
resultKind: LookupResultKind.Viable,
type: method.ReturnType)
{ WasCompilerGenerated = true };
}
private sealed class ScriptEntryPoint : SynthesizedEntryPointSymbol
{
internal ScriptEntryPoint(NamedTypeSymbol containingType, TypeSymbol returnType) :
private readonly MethodSymbol _getAwaiterMethod;
private readonly MethodSymbol _getResultMethod;
internal ScriptEntryPoint(NamedTypeSymbol containingType, TypeSymbol returnType, MethodSymbol getAwaiterMethod, MethodSymbol getResultMethod) :
base(containingType, returnType)
{
Debug.Assert(containingType.IsScriptClass);
Debug.Assert(returnType.SpecialType == SpecialType.System_Void);
_getAwaiterMethod = getAwaiterMethod;
_getResultMethod = getResultMethod;
}
public override string Name
......@@ -287,10 +347,14 @@ public override ImmutableArray<ParameterSymbol> Parameters
// private static void <Main>()
// {
// var script = new Script();
// script.<Initialize>();
// script.<Initialize>().GetAwaiter().GetResult();
// }
internal override BoundBlock CreateBody()
{
// CreateBody should only be called if no errors.
Debug.Assert((object)_getAwaiterMethod != null);
Debug.Assert((object)_getResultMethod != null);
var syntax = this.GetSyntax();
var ctor = _containingType.GetScriptConstructor();
......@@ -322,23 +386,19 @@ internal override BoundBlock CreateBody()
_containingType)
{ WasCompilerGenerated = true })
{ WasCompilerGenerated = true },
// script.<Initialize>();
// script.<Initialize>().GetAwaiter().GetResult();
new BoundExpressionStatement(
syntax,
new BoundCall(
CreateParameterlessCall(
syntax,
scriptLocal,
initializer,
ImmutableArray<BoundExpression>.Empty,
default(ImmutableArray<string>),
default(ImmutableArray<RefKind>),
isDelegateCall: false,
expanded: false,
invokedAsExtensionMethod: false,
argsToParamsOpt: default(ImmutableArray<int>),
resultKind: LookupResultKind.Viable,
type: initializer.ReturnType)
{ WasCompilerGenerated = true })
CreateParameterlessCall(
syntax,
CreateParameterlessCall(
syntax,
scriptLocal,
initializer),
_getAwaiterMethod),
_getResultMethod))
{ WasCompilerGenerated = true },
// return;
new BoundReturnStatement(
......@@ -357,6 +417,7 @@ private sealed class SubmissionEntryPoint : SynthesizedEntryPointSymbol
base(containingType, returnType)
{
Debug.Assert(containingType.IsSubmissionClass);
Debug.Assert(returnType.SpecialType != SpecialType.System_Void);
_parameters = ImmutableArray.Create<ParameterSymbol>(new SynthesizedParameterSymbol(this, submissionArrayType, 0, RefKind.None, "submissionArray"));
}
......@@ -416,20 +477,10 @@ internal override BoundBlock CreateBody()
{ WasCompilerGenerated = true };
// return submission.<Initialize>();
var initializeResult = new BoundCall(
var initializeResult = CreateParameterlessCall(
syntax,
submissionLocal,
initializer,
ImmutableArray<BoundExpression>.Empty,
default(ImmutableArray<string>),
default(ImmutableArray<RefKind>),
isDelegateCall: false,
expanded: false,
invokedAsExtensionMethod: false,
argsToParamsOpt: default(ImmutableArray<int>),
resultKind: LookupResultKind.Viable,
type: initializer.ReturnType)
{ WasCompilerGenerated = true };
initializer);
Debug.Assert(initializeResult.Type == _returnType);
var returnStatement = new BoundReturnStatement(
syntax,
......
src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs
浏览文件 @ 361117f1
......@@ -230,23 +230,15 @@ internal TypeSymbol ResultType
out TypeSymbol resultType,
out TypeSymbol returnType)
{
var submissionReturnType = compilation.SubmissionReturnType;
if (submissionReturnType == null)
var submissionReturnType = compilation.SubmissionReturnType ?? typeof(object);
var taskT = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task_T);
var useSiteDiagnostic = taskT.GetUseSiteDiagnostic();
if (useSiteDiagnostic != null)
{
resultType = null;
returnType = compilation.GetSpecialType(SpecialType.System_Void);
}
else
{
var taskT = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task_T);
var useSiteDiagnostic = taskT.GetUseSiteDiagnostic();
if (useSiteDiagnostic != null)
{
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton);
}
resultType = compilation.GetTypeByReflectionType(submissionReturnType, diagnostics);
returnType = taskT.Construct(resultType);
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton);
}
resultType = compilation.GetTypeByReflectionType(submissionReturnType, diagnostics);
returnType = taskT.Construct(resultType);
}
}
}
src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Dynamic.cs
浏览文件 @ 361117f1
......@@ -3,12 +3,8 @@
using System;
using System.Collections.Immutable;
using System.Linq;
using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit;
using Microsoft.CodeAnalysis.Text;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Roslyn.Utilities;
......@@ -815,7 +811,9 @@ public void CS1980ERR_DynamicAttributeMissing()
Diagnostic(ErrorCode.ERR_DynamicAttributeMissing, "dynamic").WithArguments("System.Runtime.CompilerServices.DynamicAttribute"));
}
private static readonly string s_noCS1980String = @"
private static string GetNoCS1980String(string typeName)
{
const string noCS1980String = @"
[Attr(typeof(%TYPENAME%))] // No CS1980
public class Gen<T>
{
......@@ -835,9 +833,7 @@ class Attr: System.Attribute
public Attr(object x) {}
}
";
private static string GetNoCS1980String(string typeName)
{
return s_noCS1980String.Replace("%TYPENAME%", typeName);
return noCS1980String.Replace("%TYPENAME%", typeName);
}
[Fact]
......@@ -856,7 +852,7 @@ public void TestNoCS1980WhenNotInContextWhichNeedsDynamicAttribute()
private void TestNoCS1980WhenNotInContextWhichNeedsDynamicAttributeHelper(CSharpParseOptions parseOptions)
{
var source = GetNoCS1980String(typeName: @"dynamic");
var comp = CreateCompilationWithMscorlib(source, parseOptions: parseOptions);
var comp = CreateCompilationWithMscorlib45(source, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (4,7): error CS1962: The typeof operator cannot be used on the dynamic type
// [Attr(typeof(dynamic))] // No CS1980
......@@ -917,7 +913,7 @@ public class Gen2<T> : X // CS1980
set {}
}
}";
comp = CreateCompilationWithMscorlib(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (21,24): error CS1980: Cannot define a class or member that utilizes 'dynamic' because the compiler required type 'System.Runtime.CompilerServices.DynamicAttribute' cannot be found. Are you missing a reference?
// public class Gen2<T> : X // CS1980
......@@ -955,19 +951,19 @@ public void TestDynamicAttributeForSubmissionField()
private void TestDynamicAttributeForSubmissionFieldHelper(CSharpParseOptions parseOptions)
{
string source = GetNoCS1980String(typeName: @"Gen<dynamic>");
var comp = CreateCompilationWithMscorlib(source, parseOptions: parseOptions);
var comp = CreateCompilationWithMscorlib45(source, parseOptions: parseOptions);
comp.VerifyDiagnostics();
// Dynamic type field
string source2 = @"
dynamic x = 0;";
comp = CreateCompilationWithMscorlibAndSystemCore(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions, references: new[] { SystemCoreRef });
comp.VerifyDiagnostics();
var implicitField = comp.ScriptClass.GetMember<FieldSymbol>("x");
DynamicAttributeValidator.ValidateDynamicAttribute(implicitField, comp, expectedDynamicAttribute: true);
// No reference to System.Core, generates CS1980
comp = CreateCompilationWithMscorlib(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (2,1): error CS1980: Cannot define a class or member that utilizes 'dynamic' because the compiler required type 'System.Runtime.CompilerServices.DynamicAttribute' cannot be found. Are you missing a reference?
// dynamic x = 0;
......@@ -977,14 +973,14 @@ private void TestDynamicAttributeForSubmissionFieldHelper(CSharpParseOptions par
// Field type is constructed generic type with dynamic type argument
source2 = source + @"
Gen<dynamic> x = null;";
comp = CreateCompilationWithMscorlibAndSystemCore(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions, references: new[] { SystemCoreRef });
comp.VerifyDiagnostics();
implicitField = comp.ScriptClass.GetMember<FieldSymbol>("x");
var expectedTransformsFlags = new bool[] { false, true };
DynamicAttributeValidator.ValidateDynamicAttribute(implicitField, comp, expectedDynamicAttribute: true, expectedTransformFlags: expectedTransformsFlags);
// No reference to System.Core, generates CS1980
comp = CreateCompilationWithMscorlib(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (20,5): error CS1980: Cannot define a class or member that utilizes 'dynamic' because the compiler required type 'System.Runtime.CompilerServices.DynamicAttribute' cannot be found. Are you missing a reference?
// Gen<dynamic> x = null;
......@@ -995,13 +991,13 @@ private void TestDynamicAttributeForSubmissionFieldHelper(CSharpParseOptions par
string aliasDecl = @"using X = Gen<dynamic>; // No CS1980";
source2 = aliasDecl + source + @"
X x = null;";
comp = CreateCompilationWithMscorlibAndSystemCore(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions, references: new[] { SystemCoreRef });
comp.VerifyDiagnostics();
implicitField = comp.ScriptClass.GetMember<FieldSymbol>("x");
DynamicAttributeValidator.ValidateDynamicAttribute(implicitField, comp, expectedDynamicAttribute: true, expectedTransformFlags: expectedTransformsFlags);
// No reference to System.Core, generates CS1980
comp = CreateCompilationWithMscorlib(source2, parseOptions: parseOptions);
comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (20,1): error CS1980: Cannot define a class or member that utilizes 'dynamic' because the compiler required type 'System.Runtime.CompilerServices.DynamicAttribute' cannot be found. Are you missing a reference?
// X x = null;
......@@ -1027,7 +1023,7 @@ private void TestDynamicAttributeForSubmissionGlobalStatementHelper(CSharpParseO
System.Console.WriteLine(typeof(dynamic));
System.Console.WriteLine(typeof(Gen<dynamic>));
System.Console.WriteLine(typeof(X));";
var comp = CreateCompilationWithMscorlib(source2, parseOptions: parseOptions);
var comp = CreateCompilationWithMscorlib45(source2, parseOptions: parseOptions);
comp.VerifyDiagnostics(
// (20,26): error CS1962: The typeof operator cannot be used on the dynamic type
// System.Console.WriteLine(typeof(dynamic));
......
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDynamicTests.cs
浏览文件 @ 361117f1
......@@ -7198,9 +7198,10 @@ public class Color
var verifier = CompileAndVerify(script);
verifier.VerifyIL("<<Initialize>>d__0.System.Runtime.CompilerServices.IAsyncStateMachine.MoveNext()",
@"{
// Code size 158 (0x9e)
// Code size 161 (0xa1)
.maxstack 10
.locals init (System.Exception V_0)
.locals init (object V_0,
System.Exception V_1)
.try
{
IL_0000: ldarg.0
......@@ -7239,27 +7240,30 @@ .locals init (System.Exception V_0)
IL_0062: box ""int""
IL_0067: callvirt ""object System.Func<System.Runtime.CompilerServices.CallSite, Color, object, object>.Invoke(System.Runtime.CompilerServices.CallSite, Color, object)""
IL_006c: stfld ""dynamic Script.x""
IL_0071: leave.s IL_008a
IL_0071: ldnull
IL_0072: stloc.0
IL_0073: leave.s IL_008c
}
catch System.Exception
{
IL_0073: stloc.0
IL_0074: ldarg.0
IL_0075: ldc.i4.s -2
IL_0077: stfld ""int Script.<<Initialize>>d__0.<>1__state""
IL_007c: ldarg.0
IL_007d: ldflda ""System.Runtime.CompilerServices.AsyncVoidMethodBuilder Script.<<Initialize>>d__0.<>t__builder""
IL_0082: ldloc.0
IL_0083: call ""void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.SetException(System.Exception)""
IL_0088: leave.s IL_009d
IL_0075: stloc.1
IL_0076: ldarg.0
IL_0077: ldc.i4.s -2
IL_0079: stfld ""int Script.<<Initialize>>d__0.<>1__state""
IL_007e: ldarg.0
IL_007f: ldflda ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> Script.<<Initialize>>d__0.<>t__builder""
IL_0084: ldloc.1
IL_0085: call ""void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.SetException(System.Exception)""
IL_008a: leave.s IL_00a0
}
IL_008a: ldarg.0
IL_008b: ldc.i4.s -2
IL_008d: stfld ""int Script.<<Initialize>>d__0.<>1__state""
IL_0092: ldarg.0
IL_0093: ldflda ""System.Runtime.CompilerServices.AsyncVoidMethodBuilder Script.<<Initialize>>d__0.<>t__builder""
IL_0098: call ""void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.SetResult()""
IL_009d: ret
IL_008c: ldarg.0
IL_008d: ldc.i4.s -2
IL_008f: stfld ""int Script.<<Initialize>>d__0.<>1__state""
IL_0094: ldarg.0
IL_0095: ldflda ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> Script.<<Initialize>>d__0.<>t__builder""
IL_009a: ldloc.0
IL_009b: call ""void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.SetResult(object)""
IL_00a0: ret
}", realIL: true);
}
......
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenScriptTests.cs
浏览文件 @ 361117f1
......@@ -20,11 +20,10 @@ public void AnonymousTypes_TopLevelVar()
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
CompileAndVerify(
CSharpCompilation.Create(
assemblyName: "Test",
CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef_v4_0_30316_17626, SystemCoreRef },
syntaxTrees: new[] { tree }),
references: new[] { SystemCoreRef }),
expectedOutput: "{ a = 1 }"
);
}
......@@ -40,11 +39,10 @@ public void AnonymousTypes_TopLevel_Object()
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
CompileAndVerify(
CSharpCompilation.Create(
assemblyName: "Test",
CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef_v4_0_30316_17626, SystemCoreRef },
syntaxTrees: new[] { tree }),
references: new[] { SystemCoreRef }),
expectedOutput: "{ a = 1 }"
);
}
......@@ -59,11 +57,10 @@ public void AnonymousTypes_TopLevel_NoLocal()
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
CompileAndVerify(
CSharpCompilation.Create(
assemblyName: "Test",
CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef_v4_0_30316_17626, SystemCoreRef },
syntaxTrees: new[] { tree }),
references: new[] { SystemCoreRef }),
expectedOutput: "{ a = 1 }"
);
}
......@@ -86,11 +83,10 @@ public void M()
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
CompileAndVerify(
CSharpCompilation.Create(
assemblyName: "Test",
CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef_v4_0_30316_17626, SystemCoreRef },
syntaxTrees: new[] { tree }),
references: new[] { SystemCoreRef }),
expectedOutput: "{ a = 1 }"
);
}
......@@ -111,11 +107,9 @@ public void M(object p = new { a = 1 })
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef },
syntaxTrees: new[] { tree });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (5,30): error CS1736: Default parameter value for 'p' must be a compile-time constant
......@@ -138,11 +132,9 @@ public void M(object p = new { a = 1 })
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef },
syntaxTrees: new[] { tree });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (4,26): error CS1736: Default parameter value for 'p' must be a compile-time constant
......@@ -171,11 +163,9 @@ public void M()
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef },
syntaxTrees: new[] { tree });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (9,8): error CS0182: An attribute argument must be a constant expression, typeof expression or array creation expression of an attribute parameter type
......@@ -201,11 +191,9 @@ class CLS
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
references: new[] { MscorlibRef },
syntaxTrees: new[] { tree });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (9,8): error CS0836: Cannot use anonymous type in a constant expression
......@@ -487,5 +475,136 @@ public void ExprStmtWithMethodCall()
s0.VerifyEmitDiagnostics();
s1.VerifyEmitDiagnostics();
}
/// <summary>
/// The script entry point should complete synchronously.
/// </summary>
[WorkItem(4495)]
[Fact]
public void ScriptEntryPoint()
{
var source =
@"{
await System.Threading.Tasks.Task.Delay(100);
System.Console.Write(""complete"");
}";
var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Script, options: TestOptions.DebugExe);
var verifier = CompileAndVerify(compilation, expectedOutput: @"complete");
var methodData = verifier.TestData.GetMethodData("<Initialize>");
Assert.Equal("System.Threading.Tasks.Task<object>", methodData.Method.ReturnType.ToDisplayString());
methodData.VerifyIL(
@"{
// Code size 60 (0x3c)
.maxstack 2
.locals init (<<Initialize>>d__0 V_0,
System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> V_1)
IL_0000: newobj ""<<Initialize>>d__0..ctor()""
IL_0005: stloc.0
IL_0006: ldloc.0
IL_0007: ldarg.0
IL_0008: stfld ""Script <<Initialize>>d__0.<>4__this""
IL_000d: ldloc.0
IL_000e: call ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Create()""
IL_0013: stfld ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0018: ldloc.0
IL_0019: ldc.i4.m1
IL_001a: stfld ""int <<Initialize>>d__0.<>1__state""
IL_001f: ldloc.0
IL_0020: ldfld ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0025: stloc.1
IL_0026: ldloca.s V_1
IL_0028: ldloca.s V_0
IL_002a: call ""void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Start<<<Initialize>>d__0>(ref <<Initialize>>d__0)""
IL_002f: nop
IL_0030: ldloc.0
IL_0031: ldflda ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0036: call ""System.Threading.Tasks.Task<object> System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Task.get""
IL_003b: ret
}");
methodData = verifier.TestData.GetMethodData("<Main>");
Assert.True(methodData.Method.ReturnsVoid);
methodData.VerifyIL(
@"{
// Code size 24 (0x18)
.maxstack 1
.locals init (System.Runtime.CompilerServices.TaskAwaiter V_0)
IL_0000: newobj "".ctor()""
IL_0005: callvirt ""System.Threading.Tasks.Task<object> <Initialize>()""
IL_000a: callvirt ""System.Runtime.CompilerServices.TaskAwaiter System.Threading.Tasks.Task.GetAwaiter()""
IL_000f: stloc.0
IL_0010: ldloca.s V_0
IL_0012: call ""void System.Runtime.CompilerServices.TaskAwaiter.GetResult()""
IL_0017: ret
}");
}
[Fact]
public void InteractiveEntryPoint()
{
var references = new[] { MscorlibRef_v4_0_30316_17626, SystemCoreRef };
var source0 =
@"{
await System.Threading.Tasks.Task.Delay(100);
System.Console.Write(""complete"");
}";
var s0 = CSharpCompilation.CreateSubmission(
"s0.dll",
SyntaxFactory.ParseSyntaxTree(source0, options: TestOptions.Interactive),
references);
var verifier = CompileAndVerify(s0, verify: false);
var methodData = verifier.TestData.GetMethodData("<Initialize>");
Assert.Equal("System.Threading.Tasks.Task<object>", methodData.Method.ReturnType.ToDisplayString());
methodData.VerifyIL(
@"{
// Code size 60 (0x3c)
.maxstack 2
.locals init (<<Initialize>>d__0 V_0,
System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> V_1)
IL_0000: newobj ""<<Initialize>>d__0..ctor()""
IL_0005: stloc.0
IL_0006: ldloc.0
IL_0007: ldarg.0
IL_0008: stfld ""Script <<Initialize>>d__0.<>4__this""
IL_000d: ldloc.0
IL_000e: call ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Create()""
IL_0013: stfld ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0018: ldloc.0
IL_0019: ldc.i4.m1
IL_001a: stfld ""int <<Initialize>>d__0.<>1__state""
IL_001f: ldloc.0
IL_0020: ldfld ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0025: stloc.1
IL_0026: ldloca.s V_1
IL_0028: ldloca.s V_0
IL_002a: call ""void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Start<<<Initialize>>d__0>(ref <<Initialize>>d__0)""
IL_002f: nop
IL_0030: ldloc.0
IL_0031: ldflda ""System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object> <<Initialize>>d__0.<>t__builder""
IL_0036: call ""System.Threading.Tasks.Task<object> System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Task.get""
IL_003b: ret
}");
methodData = verifier.TestData.GetMethodData("<Factory>");
Assert.Equal("System.Threading.Tasks.Task<object>", methodData.Method.ReturnType.ToDisplayString());
methodData.VerifyIL(
@"{
// Code size 12 (0xc)
.maxstack 1
IL_0000: ldarg.0
IL_0001: newobj "".ctor(object[])""
IL_0006: callvirt ""System.Threading.Tasks.Task<object> <Initialize>()""
IL_000b: ret
}");
}
[Fact]
public void ScriptEntryPoint_MissingMethods()
{
var source =
@"System.Console.WriteLine(1);";
var compilation = CreateCompilationWithMscorlib(source, parseOptions: TestOptions.Script, options: TestOptions.DebugExe);
compilation.VerifyDiagnostics(
// error CS0656: Missing compiler required member 'Task.GetAwaiter'
Diagnostic(ErrorCode.ERR_MissingPredefinedMember).WithArguments("System.Threading.Tasks.Task", "GetAwaiter").WithLocation(1, 1));
}
}
}
src/Compilers/CSharp/Test/Emit/Emit/EntryPointTests.cs
浏览文件 @ 361117f1
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
......@@ -121,7 +119,7 @@ public class C
}
";
var compilation = CreateCompilationWithMscorlib(
var compilation = CreateCompilationWithMscorlib45(
new[]
{
Parse(csx, options: TestOptions.Script),
......@@ -768,7 +766,7 @@ class C
}
";
var compilation = CreateCompilationWithMscorlib(
var compilation = CreateCompilationWithMscorlib45(
new[]
{
SyntaxFactory.ParseSyntaxTree(csx, options: TestOptions.Script),
......
src/Compilers/CSharp/Test/Semantic/Semantics/ImplicitlyTypedLocalsTests.cs
浏览文件 @ 361117f1
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Xunit;
......@@ -50,7 +48,7 @@ public void ImplicitlyTypedVariableAssignedArrayInitializer()
string text = @"
var array = { 1, 2 };
";
CreateCompilationWithMscorlib(text, parseOptions: TestOptions.Script).VerifyDiagnostics(
CreateCompilationWithMscorlib45(text, parseOptions: TestOptions.Script).VerifyDiagnostics(
// (2,5): error CS0820: Cannot initialize an implicitly-typed variable with an array initializer
// var array = { 1, 2 };
Diagnostic(ErrorCode.ERR_ImplicitlyTypedVariableAssignedArrayInitializer, "array = { 1, 2 }"));
......
src/Compilers/CSharp/Test/Semantic/Semantics/ScriptSemanticsTests.cs
浏览文件 @ 361117f1
......@@ -23,7 +23,7 @@ public void ThisIndexerAccessInScript()
string test = @"
this[1]
";
var compilation = CreateCompilationWithMscorlib(test, parseOptions: TestOptions.Interactive);
var compilation = CreateCompilationWithMscorlib45(test, parseOptions: TestOptions.Interactive);
var tree = compilation.SyntaxTrees.Single();
var model = compilation.GetSemanticModel(tree);
......@@ -53,7 +53,7 @@ public void MainInScript2()
var tree = SyntaxFactory.ParseSyntaxTree(text, options: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib(tree, options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
var compilation = CreateCompilationWithMscorlib45(new[] { tree }, options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (1,13): warning CS7022: The entry point of the program is global script code; ignoring 'Main()' entry point.
......@@ -76,7 +76,7 @@ public void MainInScript1()
var tree = SyntaxFactory.ParseSyntaxTree(text, options: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib(tree, options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
var compilation = CreateCompilationWithMscorlib45(new[] { tree }, options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
compilation.VerifyDiagnostics(
// (1,13): warning CS7022: The entry point of the program is global script code; ignoring 'Main()' entry point.
......@@ -230,10 +230,9 @@ enum F { }
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script);
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
syntaxTrees: new[] { tree });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
var global = compilation.GlobalNamespace;
ImmutableArray<NamedTypeSymbol> members;
......@@ -273,11 +272,9 @@ public void UsingStaticClass()
";
var tree = SyntaxFactory.ParseSyntaxTree(test, options: TestOptions.Script.WithLanguageVersion(LanguageVersion.CSharp6));
var compilation = CSharpCompilation.Create(
assemblyName: "Test",
options: TestOptions.ReleaseExe.WithScriptClassName("Script"),
syntaxTrees: new[] { tree },
references: new[] { MscorlibRef });
var compilation = CreateCompilationWithMscorlib45(
new[] { tree },
options: TestOptions.ReleaseExe.WithScriptClassName("Script"));
var expr = (((tree.
GetCompilationUnitRoot() as CompilationUnitSyntax).
......@@ -383,7 +380,7 @@ public void CheckedDecimalAddition()
decimal d = checked(2M + 1M);
";
var compilation = CreateCompilationWithMscorlib(Parse(source, options: TestOptions.Script));
var compilation = CreateCompilationWithMscorlib45(new[] { Parse(source, options: TestOptions.Script) });
compilation.VerifyDiagnostics();
}
......@@ -396,7 +393,7 @@ public void CheckedEnumAddition()
FileAccess fa = checked(FileAccess.Read + 1);
";
var compilation = CreateCompilationWithMscorlib(Parse(source, options: TestOptions.Script));
var compilation = CreateCompilationWithMscorlib45(new[] { Parse(source, options: TestOptions.Script) });
compilation.VerifyDiagnostics();
}
......@@ -408,7 +405,7 @@ public void DelegateAddition()
System.Action a = null;
a += null;
";
var compilation = CreateCompilationWithMscorlib(Parse(source, options: TestOptions.Script));
var compilation = CreateCompilationWithMscorlib45(new[] { Parse(source, options: TestOptions.Script) });
compilation.VerifyDiagnostics();
}
......
src/Compilers/CSharp/Test/Semantic/Semantics/SemanticErrorTests.cs
浏览文件 @ 361117f1
......@@ -1354,12 +1354,8 @@ void foo()
this.foo();
}
}";
var comp = CSharpCompilation.Create(
"Test",
new[] { SyntaxFactory.ParseSyntaxTree(text, options: TestOptions.Script) },
new[] { MscorlibRef });
var comp = CreateCompilationWithMscorlib45(
new[] { SyntaxFactory.ParseSyntaxTree(text, options: TestOptions.Script) });
comp.VerifyDiagnostics(
// (4,9): error CS0027: Keyword 'this' is not available in the current context
Diagnostic(ErrorCode.ERR_ThisInBadContext, "this"),
......@@ -10681,7 +10677,7 @@ class C
[Fact]
public void CS0670ERR_FieldCantHaveVoidType_Var()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
var x = default(void);
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (2,17): error CS1547: Keyword 'void' cannot be used in this context
......@@ -10835,7 +10831,7 @@ static void N(object o)
[Fact]
public void CS0723ERR_VarDeclIsStaticClass_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
static class SC {}
var sc2 = new SC();
......@@ -11065,7 +11061,7 @@ public static void Main()
[Fact]
public void CS0815ERR_ImplicitlyTypedVariableAssignedBadValue_Field()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
static void M() {}
var m = M;
......@@ -11115,7 +11111,7 @@ public static int Main()
[Fact]
public void CS0818ERR_ImplicitlyTypedVariableWithNoInitializer_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
var a; // CS0818
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (1,5): error CS0818: Implicitly-typed variables must be initialized
......@@ -11150,7 +11146,7 @@ public static int Main()
[Fact]
public void CS0819ERR_ImplicitlyTypedVariableMultipleDeclarator_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
var foo = 4, bar = 4.5;
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (2,1): error CS0819: Implicitly-typed fields cannot have multiple declarators
......@@ -11182,7 +11178,7 @@ public static int Main()
[Fact]
public void CS0820ERR_ImplicitlyTypedVariableAssignedArrayInitializer_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
var y = { 1, 2, 3 };
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (1,5): error CS0820: Cannot initialize an implicitly-typed variable with an array initializer
......@@ -11247,7 +11243,7 @@ public static void Main()
[Fact]
public void CS0822ERR_ImplicitlyTypedVariableCannotBeConst_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
const var x = 0; // CS0822.cs
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (2,7): error CS0822: Implicitly-typed variables cannot be constant
......@@ -11257,20 +11253,20 @@ public void CS0822ERR_ImplicitlyTypedVariableCannotBeConst_Fields()
[Fact]
public void CS0825ERR_ImplicitlyTypedVariableCannotBeUsedAsTheTypeOfAParameter_Fields()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
void foo(var arg) { }
var foo(int arg) { return 2; }
", parseOptions: TestOptions.Script).VerifyDiagnostics(
// (1,10): error CS0825: The contextual keyword 'var' may only appear within a local variable declaration or in script code
// (2,1): error CS0825: The contextual keyword 'var' may only appear within a local variable declaration or in script code
Diagnostic(ErrorCode.ERR_TypeVarNotFound, "var"),
// (2,1): error CS0825: The contextual keyword 'var' may only appear within a local variable declaration or in script code
Diagnostic(ErrorCode.ERR_TypeVarNotFound, "var"));
}
[Fact]
public void CS0825ERR_ImplicitlyTypedVariableCannotBeUsedAsTheTypeOfAParameter_Fields2()
{
CreateCompilationWithMscorlib(@"
CreateCompilationWithMscorlib45(@"
T foo<T>() { return default(T); }
foo<var>();
", parseOptions: TestOptions.Script).VerifyDiagnostics(
......
src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs
浏览文件 @ 361117f1
......@@ -2126,7 +2126,7 @@ public void SwitchFallOut_Script()
case 2:
Console.WriteLine(2);
}";
var compilation = CreateCompilationWithMscorlib(source, references: new[] { SystemCoreRef }, parseOptions: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib45(source, references: new[] { SystemCoreRef }, parseOptions: TestOptions.Script);
compilation.VerifyDiagnostics(
// (4,5): error CS0163: Control cannot fall through from one case label ('default:') to another
// default:
......
src/Compilers/CSharp/Test/Semantic/Semantics/UnsafeTests.cs
浏览文件 @ 361117f1
......@@ -7592,7 +7592,7 @@ public void StackAllocNotExpression_GlobalDeclaration()
var text = @"
unsafe int* p = stackalloc int[1];
";
CreateCompilationWithMscorlib(text, options: TestOptions.UnsafeReleaseDll, parseOptions: TestOptions.Script).VerifyDiagnostics(
CreateCompilationWithMscorlib45(text, options: TestOptions.UnsafeReleaseDll, parseOptions: TestOptions.Script).VerifyDiagnostics(
// (4,14): error CS1525: Invalid expression term 'stackalloc'
// int* p = stackalloc int[1];
Diagnostic(ErrorCode.ERR_InvalidExprTerm, "stackalloc").WithArguments("stackalloc"));
......
src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs
浏览文件 @ 361117f1
......@@ -10,13 +10,10 @@
using System.Reflection.PortableExecutable;
using System.Text;
using System.Threading;
using System.Xml.Linq;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Roslyn.Utilities;
using Xunit;
......@@ -1345,7 +1342,7 @@ class A
public void GetEntryPoint_Script()
{
var source = @"System.Console.WriteLine(1);";
var compilation = CreateCompilationWithMscorlib(source, options: TestOptions.ReleaseExe, parseOptions: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib45(source, options: TestOptions.ReleaseExe, parseOptions: TestOptions.Script);
compilation.VerifyDiagnostics();
var scriptMethod = compilation.GetMember<MethodSymbol>("Script.<Main>");
......@@ -1366,7 +1363,7 @@ class A
static void Main() { }
}
";
var compilation = CreateCompilationWithMscorlib(source, parseOptions: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Script);
compilation.VerifyDiagnostics(
// (4,17): warning CS7022: The entry point of the program is global script code; ignoring 'A.Main()' entry point.
// static void Main() { }
......
src/Compilers/CSharp/Test/Symbol/Compilation/GetUnusedImportDirectivesTests.cs
浏览文件 @ 361117f1
......@@ -34,7 +34,6 @@ void Foo()
Diagnostic(ErrorCode.HDN_UnusedUsingDirective, "using System;"));
}
[WorkItem(865627, "DevDiv")]
[Fact]
public void TestUnusedExtensionMarksImportsAsUsed()
......@@ -69,7 +68,6 @@ public static void Method1(this Class1 arg0, string arg1)
}";
var classLib2 = CreateCompilationWithMscorlib(text: class2Source, assemblyName: "ClassLibrary2", references: new[] { SystemRef, SystemCoreRef, classLib1.ToMetadataReference() });
string consoleApplicationSource = @"using ClassLibrary2;
using ClassLibrary1;
......@@ -141,7 +139,6 @@ static void Main(string[] args)
Diagnostic(ErrorCode.HDN_UnusedUsingDirective, "using System.Threading.Tasks;")
);
comp = comp.WithReferences(comp.References.Concat(SystemCoreRef));
comp.VerifyDiagnostics(
// (2,1): info CS8019: Unnecessary using directive.
......@@ -372,7 +369,7 @@ public void UnusedUsingInteractive()
public void UnusedUsingScript()
{
var tree = Parse("using System;", options: TestOptions.Script);
var comp = CreateCompilationWithMscorlib(tree);
var comp = CreateCompilationWithMscorlib45(new[] { tree });
comp.VerifyDiagnostics(
// (2,1): info CS8019: Unnecessary using directive.
......
src/Compilers/CSharp/Test/Symbol/Compilation/LoadDirectiveTests.cs
浏览文件 @ 361117f1
......@@ -10,38 +10,41 @@ namespace Microsoft.CodeAnalysis.CSharp.UnitTests
public class LoadDirectiveTests : CSharpTestBase
{
[Fact]
void EmptyFile()
public void EmptyFile()
{
var code = "#load \"\"";
var compilation = CreateCompilation(code);
var options = TestOptions.DebugDll.WithSourceReferenceResolver(TestSourceReferenceResolver.Default);
var compilation = CreateCompilationWithMscorlib45(code, options: options, parseOptions: TestOptions.Interactive);
Assert.Single(compilation.SyntaxTrees);
compilation.GetDiagnostics().Verify(
compilation.VerifyDiagnostics(
// error CS1504: Source file '' could not be opened -- Could not find file.
Diagnostic(ErrorCode.ERR_NoSourceFile, "\"\"").WithArguments("", CSharpResources.CouldNotFindFile).WithLocation(1, 7));
}
[Fact]
void MissingFile()
public void MissingFile()
{
var code = "#load \"missing\"";
var compilation = CreateCompilation(code);
var options = TestOptions.DebugDll.WithSourceReferenceResolver(TestSourceReferenceResolver.Default);
var compilation = CreateCompilationWithMscorlib45(code, options: options, parseOptions: TestOptions.Interactive);
Assert.Single(compilation.SyntaxTrees);
compilation.GetDiagnostics().Verify(
compilation.VerifyDiagnostics(
// error CS1504: Source file 'missing' could not be opened -- Could not find file.
Diagnostic(ErrorCode.ERR_NoSourceFile, "\"missing\"").WithArguments("missing", CSharpResources.CouldNotFindFile).WithLocation(1, 7));
}
[Fact]
void FileWithErrors()
public void FileWithErrors()
{
var code = "#load \"a.csx\"";
var resolver = CreateResolver(
Script("a.csx", @"
#load ""b.csx""
asdf();"));
var compilation = CreateCompilation(code, resolver);
var options = TestOptions.DebugDll.WithSourceReferenceResolver(resolver);
var compilation = CreateCompilationWithMscorlib45(code, options: options, parseOptions: TestOptions.Script);
Assert.Equal(2, compilation.SyntaxTrees.Length);
compilation.GetParseDiagnostics().Verify(
......@@ -58,27 +61,18 @@ void FileWithErrors()
}
[Fact]
void NoSourceReferenceResolver()
public void NoSourceReferenceResolver()
{
var code = "#load \"test\"";
var compilation = CreateCompilationWithMscorlib(code, parseOptions: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib45(code, parseOptions: TestOptions.Script);
Assert.Single(compilation.SyntaxTrees);
compilation.GetDiagnostics().Verify(
compilation.VerifyDiagnostics(
// (1,1): error CS8099: Source file references are not supported.
// #load "test"
Diagnostic(ErrorCode.ERR_SourceFileReferencesNotSupported, @"#load ""test""").WithLocation(1, 1));
}
private static CSharpCompilation CreateCompilation(string code, SourceReferenceResolver sourceReferenceResolver = null)
{
var options = new CSharpCompilationOptions(
OutputKind.DynamicallyLinkedLibrary,
sourceReferenceResolver: sourceReferenceResolver ?? TestSourceReferenceResolver.Default);
var parseOptions = new CSharpParseOptions(kind: SourceCodeKind.Interactive);
return CreateCompilationWithMscorlib(code, options: options, parseOptions: parseOptions);
}
private static SourceReferenceResolver CreateResolver(params KeyValuePair<string, string>[] scripts)
{
var sources = new Dictionary<string, string>();
......
src/Compilers/CSharp/Test/Symbol/Compilation/ReferenceManagerTests.cs
浏览文件 @ 361117f1
......@@ -867,7 +867,7 @@ public void DuplicateAssemblyReferences_EquivalentPath()
t2 = Parse($"#r \"{p3}\"", options: TestOptions.Script),
t3 = Parse("#r \"Lib\"", options: TestOptions.Script),
},
references: new MetadataReference[] { MscorlibRef, r1, r2 },
references: new MetadataReference[] { MscorlibRef_v4_0_30316_17626, r1, r2 },
options: TestOptions.ReleaseDll.WithMetadataReferenceResolver(
new TestMetadataReferenceResolver(
assemblyNames: new Dictionary<string, PortableExecutableReference> { { "Lib", r3 } },
......@@ -879,7 +879,7 @@ public void DuplicateAssemblyReferences_EquivalentPath()
var refs = compilation.ExternalReferences;
Assert.Equal(3, refs.Length);
Assert.Equal(MscorlibRef, refs[0]);
Assert.Equal(MscorlibRef_v4_0_30316_17626, refs[0]);
Assert.Equal(r1, refs[1]);
Assert.Equal(r2, refs[2]);
......
src/Compilers/CSharp/Test/Symbol/Symbols/CompilationCreationTests.cs
浏览文件 @ 361117f1
......@@ -2684,9 +2684,8 @@ public void CompilationWithReferenceDirectives()
", options: TestOptions.Script)
};
var compilation = CSharpCompilation.Create("foo",
syntaxTrees: trees,
references: new[] { MscorlibRef },
var compilation = CreateCompilationWithMscorlib45(
trees,
options: TestOptions.ReleaseDll.WithMetadataReferenceResolver(new Resolver(data, core, system)));
compilation.VerifyDiagnostics();
......@@ -2721,9 +2720,8 @@ public void CompilationWithReferenceDirectives_Errors()
")
};
var compilation = CSharpCompilation.Create("foo",
syntaxTrees: trees,
references: new[] { MscorlibRef },
var compilation = CreateCompilationWithMscorlib45(
trees,
options: TestOptions.ReleaseDll.WithMetadataReferenceResolver(new Resolver(data, core, system)));
compilation.VerifyDiagnostics(
......@@ -2768,11 +2766,8 @@ public void MetadataReferenceProvider()
#r """ + csInterfaces01 + @"""
class C : Metadata.ICSPropImpl { }";
var compilation = CSharpCompilation.Create("foo",
syntaxTrees: new[]
{
Parse(source, options: TestOptions.Script)
},
var compilation = CreateCompilationWithMscorlib45(
new[] { Parse(source, options: TestOptions.Script) },
options: TestOptions.ReleaseDll.WithMetadataReferenceResolver(new DummyReferenceResolver(csClasses01)));
compilation.VerifyDiagnostics();
......@@ -2781,10 +2776,9 @@ class C : Metadata.ICSPropImpl { }";
[Fact]
public void CompilationWithReferenceDirective_NoResolver()
{
var compilation = CSharpCompilation.Create("foo",
var compilation = CreateCompilationWithMscorlib45(
new[] { SyntaxFactory.ParseSyntaxTree(@"#r ""bar""", TestOptions.Script, "a.csx", Encoding.UTF8) },
new[] { MscorlibRef },
TestOptions.ReleaseDll.WithMetadataReferenceResolver(null));
options: TestOptions.ReleaseDll.WithMetadataReferenceResolver(null));
compilation.VerifyDiagnostics(
// a.csx(1,1): error CS7099: Metadata references not supported.
......@@ -2809,11 +2803,9 @@ class C
")
};
var compilation = CSharpCompilation.Create(
"foo",
options: TestOptions.ReleaseDll.WithUsings(ImmutableArray.Create("System.Console", "System")),
syntaxTrees: trees,
references: new[] { MscorlibRef });
var compilation = CreateCompilationWithMscorlib45(
trees,
options: TestOptions.ReleaseDll.WithUsings(ImmutableArray.Create("System.Console", "System")));
var diagnostics = compilation.GetDiagnostics().ToArray();
......@@ -2833,11 +2825,9 @@ public void GlobalUsings_Errors()
", options: TestOptions.Script)
};
var compilation = CSharpCompilation.Create(
"foo",
options: TestOptions.ReleaseDll.WithUsings("System.Console!", "Blah"),
syntaxTrees: trees,
references: new[] { MscorlibRef });
var compilation = CreateCompilationWithMscorlib45(
trees,
options: TestOptions.ReleaseDll.WithUsings("System.Console!", "Blah"));
compilation.VerifyDiagnostics(
// error CS0234: The type or namespace name 'Console!' does not exist in the namespace 'System' (are you missing an assembly reference?)
......
src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs
浏览文件 @ 361117f1
......@@ -3682,7 +3682,7 @@ class C
}
var o = new object();
o.F();";
var compilation = CreateCompilationWithMscorlib(source, references: new[] { SystemCoreRef }, parseOptions: TestOptions.Script);
var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Script);
compilation.VerifyDiagnostics();
}
......
src/Compilers/CSharp/Test/Symbol/Symbols/ImplicitClassTests.cs
浏览文件 @ 361117f1
......@@ -4,7 +4,6 @@
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Xunit;
......@@ -58,7 +57,7 @@ void Foo()
[Fact, WorkItem(531535, "DevDiv")]
public void Events()
{
var c = CreateCompilationWithMscorlib(@"
var c = CreateCompilationWithMscorlib45(@"
event System.Action e;
", parseOptions: TestOptions.Script);
......
src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExternAliasTests.cs
浏览文件 @ 361117f1
......@@ -93,7 +93,7 @@ public void ExternAliasInScript()
extern alias Bar;
Bar::NS.Foo d = new Bar::NS.Foo();
";
var comp = CreateCompilationWithMscorlib(src, options: new CSharpCompilationOptions(OutputKind.ConsoleApplication), parseOptions: TestOptions.Script);
var comp = CreateCompilationWithMscorlib45(src, options: new CSharpCompilationOptions(OutputKind.ConsoleApplication), parseOptions: TestOptions.Script);
comp = comp.AddReferences(Foo1, Foo2);
comp.VerifyDiagnostics();
}
......
src/Compilers/CSharp/Test/Symbol/Symbols/Source/ModifierTests.cs
浏览文件 @ 361117f1
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Immutable;
using System.Linq;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Xunit;
using System.Collections.Immutable;
namespace Microsoft.CodeAnalysis.CSharp.UnitTests
{
......@@ -106,7 +103,7 @@ public void InScript()
";
foreach (var options in new[] { TestOptions.Script, TestOptions.Interactive })
{
var comp = CreateCompilationWithMscorlib(text, parseOptions: options);
var comp = CreateCompilationWithMscorlib45(text, parseOptions: options);
var script = comp.ScriptClass;
var m1 = script.GetMembers("M1").Single() as MethodSymbol;
Assert.Equal(Accessibility.Private, m1.DeclaredAccessibility);
......
src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs
浏览文件 @ 361117f1
......@@ -15627,8 +15627,8 @@ class A { public int Foo() { return 2; }}
Diagnostic(ErrorCode.ERR_NamespaceNotAllowedInScript, "namespace").WithLocation(2, 1)
};
CreateCompilationWithMscorlib(Parse(text, options: TestOptions.Script)).VerifyDiagnostics(expectedDiagnostics);
CreateCompilationWithMscorlib(Parse(text, options: TestOptions.Interactive)).VerifyDiagnostics(expectedDiagnostics);
CreateCompilationWithMscorlib45(new[] { Parse(text, options: TestOptions.Script) }).VerifyDiagnostics(expectedDiagnostics);
CreateCompilationWithMscorlib45(new[] { Parse(text, options: TestOptions.Interactive) }).VerifyDiagnostics(expectedDiagnostics);
}
[Fact]
......
src/Compilers/VisualBasic/Portable/Symbols/Source/SourceMemberContainerTypeSymbol.vb
浏览文件 @ 361117f1
......@@ -2772,7 +2772,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Dim syntaxRef = SyntaxReferences.Single()
Dim scriptInitializer = New SynthesizedInteractiveInitializerMethod(syntaxRef, Me, diagnostics)
AddSymbolToMembers(scriptInitializer, members.Members)
Dim scriptEntryPoint = SynthesizedEntryPointSymbol.Create(Me, scriptInitializer.ReturnType, diagnostics)
Dim scriptEntryPoint = SynthesizedEntryPointSymbol.Create(scriptInitializer, diagnostics)
AddSymbolToMembers(scriptEntryPoint, members.Members)
End If
End Sub
......
src/Compilers/VisualBasic/Portable/Symbols/Source/SynthesizedEntryPointSymbol.vb
浏览文件 @ 361117f1
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports System.Collections.Immutable
Imports System.Linq
Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
''' <summary>
......@@ -15,17 +16,31 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Private ReadOnly _containingType As NamedTypeSymbol
Private ReadOnly _returnType As TypeSymbol
Friend Shared Function Create(containingType As NamedTypeSymbol, returnType As TypeSymbol, diagnostics As DiagnosticBag) As SynthesizedEntryPointSymbol
Dim compilation = containingType.DeclaringCompilation
If containingType.ContainingAssembly.IsInteractive Then
Friend Shared Function Create(initializerMethod As SynthesizedInteractiveInitializerMethod, diagnostics As DiagnosticBag) As SynthesizedEntryPointSymbol
Dim containingType = initializerMethod.ContainingType
Dim compilation = ContainingType.DeclaringCompilation
If compilation.IsSubmission Then
Dim submissionArrayType = compilation.CreateArrayTypeSymbol(compilation.GetSpecialType(SpecialType.System_Object))
Dim useSiteDiagnostic = submissionArrayType.GetUseSiteErrorInfo()
If useSiteDiagnostic IsNot Nothing Then
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton)
End If
Return New SubmissionEntryPoint(containingType, returnType, submissionArrayType)
ReportUseSiteDiagnostics(submissionArrayType, diagnostics)
Return New SubmissionEntryPoint(containingType, initializerMethod.ReturnType, submissionArrayType)
Else
Return New ScriptEntryPoint(containingType, returnType)
Dim taskType = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task)
#If DEBUG Then
Dim useSiteDiagnostics As HashSet(Of DiagnosticInfo) = Nothing
Debug.Assert(taskType.IsErrorType() OrElse initializerMethod.ReturnType.IsOrDerivedFrom(taskType, useSiteDiagnostics))
#End If
ReportUseSiteDiagnostics(taskType, diagnostics)
Dim getAwaiterMethod = If(taskType.IsErrorType(),
Nothing,
GetRequiredMethod(taskType, WellKnownMemberNames.GetAwaiter, diagnostics))
Dim getResultMethod = If(getAwaiterMethod Is Nothing,
Nothing,
GetRequiredMethod(getAwaiterMethod.ReturnType, WellKnownMemberNames.GetResult, diagnostics))
Return New ScriptEntryPoint(
containingType,
compilation.GetSpecialType(SpecialType.System_Void),
getAwaiterMethod,
getResultMethod)
End If
End Function
......@@ -174,14 +189,49 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Return VisualBasicSyntaxTree.Dummy.GetRoot()
End Function
Private Shared Sub ReportUseSiteDiagnostics(symbol As Symbol, diagnostics As DiagnosticBag)
Dim useSiteDiagnostic = symbol.GetUseSiteErrorInfo()
If useSiteDiagnostic IsNot Nothing Then
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton)
End If
End Sub
Private Shared Function GetRequiredMethod(type As TypeSymbol, methodName As String, diagnostics As DiagnosticBag) As MethodSymbol
Dim method = TryCast(type.GetMembers(methodName).SingleOrDefault(), MethodSymbol)
If method Is Nothing Then
diagnostics.Add(
ErrorFactory.ErrorInfo(ERRID.ERR_MissingRuntimeHelper, type.MetadataName & "." & methodName),
NoLocation.Singleton)
End If
Return method
End Function
Private Shared Function CreateParameterlessCall(syntax As VisualBasicSyntaxNode, receiver As BoundExpression, method As MethodSymbol) As BoundCall
Return New BoundCall(
syntax,
method,
methodGroupOpt:=Nothing,
receiverOpt:=receiver.MakeRValue(),
arguments:=ImmutableArray(Of BoundExpression).Empty,
constantValueOpt:=Nothing,
suppressObjectClone:=False,
type:=method.ReturnType).MakeCompilerGenerated()
End Function
Private NotInheritable Class ScriptEntryPoint
Inherits SynthesizedEntryPointSymbol
Friend Sub New(containingType As NamedTypeSymbol, returnType As TypeSymbol)
Private ReadOnly _getAwaiterMethod As MethodSymbol
Private ReadOnly _getResultMethod As MethodSymbol
Friend Sub New(containingType As NamedTypeSymbol, returnType As TypeSymbol, getAwaiterMethod As MethodSymbol, getResultMethod As MethodSymbol)
MyBase.New(containingType, returnType)
Debug.Assert(containingType.IsScriptClass)
Debug.Assert(returnType.SpecialType = SpecialType.System_Void)
_getAwaiterMethod = getAwaiterMethod
_getResultMethod = getResultMethod
End Sub
Public Overrides ReadOnly Property Name As String
......@@ -198,9 +248,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
' Private Shared Sub <Main>()
' Dim script As New Script()
' script.<Initialize>()
' script.<Initialize>().GetAwaiter().GetResult()
' End Sub
Friend Overrides Function CreateBody() As BoundBlock
' CreateBody should only be called if no errors.
Debug.Assert(_getAwaiterMethod IsNot Nothing)
Debug.Assert(_getResultMethod IsNot Nothing)
Dim syntax = GetSyntax()
Dim ctor = _containingType.GetScriptConstructor()
......@@ -228,18 +282,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
type:=_containingType).MakeCompilerGenerated(),
suppressObjectClone:=False).MakeCompilerGenerated()).MakeCompilerGenerated()
' script.<Initialize>()
' script.<Initialize>().GetAwaiter().GetResult()
Dim scriptInitialize = New BoundExpressionStatement(
syntax,
New BoundCall(
CreateParameterlessCall(
syntax,
initializer,
methodGroupOpt:=Nothing,
receiverOpt:=scriptLocal.MakeRValue(),
arguments:=ImmutableArray(Of BoundExpression).Empty,
constantValueOpt:=Nothing,
suppressObjectClone:=False,
type:=initializer.ReturnType).MakeCompilerGenerated()).MakeCompilerGenerated()
CreateParameterlessCall(
syntax,
CreateParameterlessCall(
syntax,
scriptLocal,
initializer),
_getAwaiterMethod),
_getResultMethod)).MakeCompilerGenerated()
' Return
Dim returnStatement = New BoundReturnStatement(
......@@ -321,15 +376,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
' Return submission.<Initialize>()
Dim returnStatement = New BoundReturnStatement(
syntax,
New BoundCall(
CreateParameterlessCall(
syntax,
initializer,
methodGroupOpt:=Nothing,
receiverOpt:=submissionLocal.MakeRValue(),
arguments:=ImmutableArray(Of BoundExpression).Empty,
constantValueOpt:=Nothing,
suppressObjectClone:=False,
type:=initializer.ReturnType).MakeCompilerGenerated().MakeRValue(),
submissionLocal,
initializer).MakeRValue(),
functionLocalOpt:=Nothing,
exitLabelOpt:=Nothing).MakeCompilerGenerated()
......
src/Compilers/VisualBasic/Portable/Symbols/Source/SynthesizedInteractiveInitializerMethod.vb
浏览文件 @ 361117f1
......@@ -24,9 +24,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
_syntaxReference = syntaxReference
CalculateReturnType(containingType.DeclaringCompilation, diagnostics, ResultType, _returnType)
FunctionLocal = If(ResultType Is Nothing,
Nothing,
New SynthesizedLocal(Me, ResultType, SynthesizedLocalKind.FunctionReturnValue, Syntax))
FunctionLocal = New SynthesizedLocal(Me, ResultType, SynthesizedLocalKind.FunctionReturnValue, Syntax)
ExitLabel = New GeneratedLabelSymbol("exit")
End Sub
......@@ -137,7 +135,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Return New BoundBlock(
syntax,
Nothing,
If(FunctionLocal Is Nothing, ImmutableArray(Of LocalSymbol).Empty, ImmutableArray.Create(FunctionLocal)),
ImmutableArray.Create(FunctionLocal),
ImmutableArray.Create(Of BoundStatement)(New BoundLabelStatement(syntax, ExitLabel)))
End Function
......@@ -151,19 +149,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
ByRef resultType As TypeSymbol,
ByRef returnType As TypeSymbol)
Dim submissionReturnType = compilation.SubmissionReturnType
If submissionReturnType Is Nothing Then
resultType = Nothing
returnType = compilation.GetSpecialType(SpecialType.System_Void)
Else
Dim taskT = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task_T)
Dim useSiteDiagnostic = taskT.GetUseSiteErrorInfo()
If useSiteDiagnostic IsNot Nothing Then
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton)
End If
resultType = compilation.GetTypeByReflectionType(submissionReturnType, diagnostics)
returnType = taskT.Construct(resultType)
Dim submissionReturnType = If(compilation.SubmissionReturnType, GetType(Object))
Dim taskT = compilation.GetWellKnownType(WellKnownType.System_Threading_Tasks_Task_T)
Dim useSiteDiagnostic = taskT.GetUseSiteErrorInfo()
If useSiteDiagnostic IsNot Nothing Then
diagnostics.Add(useSiteDiagnostic, NoLocation.Singleton)
End If
resultType = compilation.GetTypeByReflectionType(submissionReturnType, diagnostics)
returnType = taskT.Construct(resultType)
End Sub
End Class
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenScriptTests.vb
浏览文件 @ 361117f1
......@@ -59,19 +59,16 @@ System.Console.WriteLine(1+1)
Diagnostic(ERRID.ERR_ExecutableAsDeclaration, "System.Console.WriteLine(1+1)"))
End Sub
<Fact>
Public Sub ReturnStatement()
Dim source = <text>
Return Foo
Return 1
</text>.Value
Dim tree = VisualBasicSyntaxTree.ParseText(source, options:=TestOptions.Script)
Dim c = VisualBasicCompilation.Create("Test", {tree}, LatestVbReferences)
Dim c = CreateCompilationWithMscorlib45({tree})
c.VerifyDiagnostics(
Diagnostic(ERRID.ERR_ReturnFromNonFunction, "Return Foo").WithLocation(2, 1),
Diagnostic(ERRID.ERR_NameNotDeclared1, "Foo").WithArguments("Foo").WithLocation(2, 8))
c.VerifyDiagnostics()
End Sub
<Fact>
......@@ -285,6 +282,122 @@ Imports Unknown
submission.GetDiagnostics().AssertTheseDiagnostics(expectedErrors)
End Sub
''' <summary>
''' The script entry point should complete synchronously.
''' </summary>
<WorkItem(4495)>
<Fact>
Public Sub ScriptEntryPoint()
Dim comp = CreateCompilationWithMscorlib45AndVBRuntime(
<compilation>
<file name="a.vbx"><![CDATA[
System.Threading.Tasks.Task.Delay(100)
System.Console.Write("complete")
]]></file>
</compilation>,
parseOptions:=TestOptions.Script,
options:=TestOptions.DebugExe,
additionalRefs:={SystemCoreRef})
Dim verifier = CompileAndVerify(comp, expectedOutput:="complete")
Dim methodData = verifier.TestData.GetMethodData("Script.<Initialize>")
Assert.Equal("System.Threading.Tasks.Task(Of Object)", methodData.Method.ReturnType.ToDisplayString())
methodData.VerifyIL(
"{
// Code size 57 (0x39)
.maxstack 2
.locals init (Script.VB$StateMachine_1_<Initialize> V_0)
IL_0000: newobj ""Sub Script.VB$StateMachine_1_<Initialize>..ctor()""
IL_0005: stloc.0
IL_0006: ldloc.0
IL_0007: ldarg.0
IL_0008: stfld ""Script.VB$StateMachine_1_<Initialize>.$VB$Me As Script""
IL_000d: ldloc.0
IL_000e: ldc.i4.m1
IL_000f: stfld ""Script.VB$StateMachine_1_<Initialize>.$State As Integer""
IL_0014: ldloc.0
IL_0015: call ""Function System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).Create() As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_001a: stfld ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_001f: ldloc.0
IL_0020: ldflda ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_0025: ldloca.s V_0
IL_0027: call ""Sub System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).Start(Of Script.VB$StateMachine_1_<Initialize>)(ByRef Script.VB$StateMachine_1_<Initialize>)""
IL_002c: nop
IL_002d: ldloc.0
IL_002e: ldflda ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_0033: call ""Function System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).get_Task() As System.Threading.Tasks.Task(Of Object)""
IL_0038: ret
}")
methodData = verifier.TestData.GetMethodData("Script.<Main>")
Assert.True(methodData.Method.ReturnsVoid)
methodData.VerifyIL(
"{
// Code size 24 (0x18)
.maxstack 1
.locals init (System.Runtime.CompilerServices.TaskAwaiter V_0)
IL_0000: newobj ""Sub Script..ctor()""
IL_0005: callvirt ""Function Script.<Initialize>() As System.Threading.Tasks.Task(Of Object)""
IL_000a: callvirt ""Function System.Threading.Tasks.Task.GetAwaiter() As System.Runtime.CompilerServices.TaskAwaiter""
IL_000f: stloc.0
IL_0010: ldloca.s V_0
IL_0012: call ""Sub System.Runtime.CompilerServices.TaskAwaiter.GetResult()""
IL_0017: ret
}")
End Sub
<Fact>
Public Sub InteractiveEntryPoint()
Dim parseOptions = TestOptions.Interactive
Dim references = {MscorlibRef_v4_0_30316_17626, SystemCoreRef, MsvbRef}
Dim source0 = <![CDATA[
System.Threading.Tasks.Task.Delay(100)
System.Console.Write("complete")
]]>
Dim s0 = VisualBasicCompilation.CreateSubmission(
"s0.dll",
syntaxTree:=Parse(source0.Value, parseOptions),
references:=references)
Dim verifier = CompileAndVerify(s0, verify:=False)
Dim methodData = verifier.TestData.GetMethodData("Script.<Initialize>")
Assert.Equal("System.Threading.Tasks.Task(Of Object)", methodData.Method.ReturnType.ToDisplayString())
methodData.VerifyIL(
"{
// Code size 57 (0x39)
.maxstack 2
.locals init (Script.VB$StateMachine_1_<Initialize> V_0)
IL_0000: newobj ""Sub Script.VB$StateMachine_1_<Initialize>..ctor()""
IL_0005: stloc.0
IL_0006: ldloc.0
IL_0007: ldarg.0
IL_0008: stfld ""Script.VB$StateMachine_1_<Initialize>.$VB$Me As Script""
IL_000d: ldloc.0
IL_000e: ldc.i4.m1
IL_000f: stfld ""Script.VB$StateMachine_1_<Initialize>.$State As Integer""
IL_0014: ldloc.0
IL_0015: call ""Function System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).Create() As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_001a: stfld ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_001f: ldloc.0
IL_0020: ldflda ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_0025: ldloca.s V_0
IL_0027: call ""Sub System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).Start(Of Script.VB$StateMachine_1_<Initialize>)(ByRef Script.VB$StateMachine_1_<Initialize>)""
IL_002c: nop
IL_002d: ldloc.0
IL_002e: ldflda ""Script.VB$StateMachine_1_<Initialize>.$Builder As System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object)""
IL_0033: call ""Function System.Runtime.CompilerServices.AsyncTaskMethodBuilder(Of Object).get_Task() As System.Threading.Tasks.Task(Of Object)""
IL_0038: ret
}")
methodData = verifier.TestData.GetMethodData("Script.<Factory>")
Assert.Equal("System.Threading.Tasks.Task(Of Object)", methodData.Method.ReturnType.ToDisplayString())
methodData.VerifyIL(
"{
// Code size 12 (0xc)
.maxstack 1
IL_0000: ldarg.0
IL_0001: newobj ""Sub Script..ctor(Object())""
IL_0006: callvirt ""Function Script.<Initialize>() As System.Threading.Tasks.Task(Of Object)""
IL_000b: ret
}")
End Sub
End Class
End Namespace
src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb
浏览文件 @ 361117f1
......@@ -1288,7 +1288,7 @@ End Class
<Fact()>
Public Sub GetEntryPoint_Script()
Dim source = <![CDATA[System.Console.WriteLine(1)]]>
Dim compilation = CreateCompilationWithMscorlib({VisualBasicSyntaxTree.ParseText(source.Value, options:=TestOptions.Script)}, options:=TestOptions.ReleaseDll)
Dim compilation = CreateCompilationWithMscorlib45({VisualBasicSyntaxTree.ParseText(source.Value, options:=TestOptions.Script)}, options:=TestOptions.ReleaseDll)
compilation.VerifyDiagnostics()
Dim scriptMethod = compilation.GetMember("Script.<Main>")
......@@ -1308,7 +1308,7 @@ End Class
End Sub
End Class
]]>
Dim compilation = CreateCompilationWithMscorlib({VisualBasicSyntaxTree.ParseText(source.Value, options:=TestOptions.Script)}, options:=TestOptions.ReleaseDll)
Dim compilation = CreateCompilationWithMscorlib45({VisualBasicSyntaxTree.ParseText(source.Value, options:=TestOptions.Script)}, options:=TestOptions.ReleaseDll)
compilation.VerifyDiagnostics(Diagnostic(ERRID.WRN_MainIgnored, "Main").WithArguments("Public Shared Sub Main()").WithLocation(3, 20))
Dim scriptMethod = compilation.GetMember("Script.<Main>")
......
src/Compilers/VisualBasic/Test/Semantic/Semantics/GetUnusedImportDirectivesTests.vb
浏览文件 @ 361117f1
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.Test.Utilities
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Roslyn.Test.Utilities
Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics
......@@ -311,7 +306,7 @@ Imports System
<Fact()>
Public Sub UnusedImportScript()
Dim tree = Parse("Imports System", options:=TestOptions.Script)
Dim compilation = CreateCompilationWithMscorlib(tree)
Dim compilation = CreateCompilationWithMscorlib45({tree})
compilation.AssertTheseDiagnostics(
<errors>
BC50001: Unused import statement.
......
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/ExtensionMethods/ExtensionMethodTests.vb
浏览文件 @ 361117f1
......@@ -2433,19 +2433,16 @@ End Module
<Fact>
Public Sub ScriptExtensionMethods()
Dim comp = CreateCompilationWithMscorlib(
<compilation>
<file name="a.vbx"><![CDATA[
Dim source = <![CDATA[
Imports System.Runtime.CompilerServices
<Extension>
Shared Function F(o As Object) As Object
Return Nothing
End Function
Dim o As New Object()
o.F()]]></file>
</compilation>,
parseOptions:=TestOptions.Script,
references:={MscorlibRef, SystemCoreRef})
o.F()]]>
Dim comp = CreateCompilationWithMscorlib45(
{VisualBasicSyntaxTree.ParseText(source.Value, TestOptions.Script)})
comp.VerifyDiagnostics()
Assert.True(comp.SourceAssembly.MightContainExtensionMethods)
End Sub
......@@ -2463,6 +2460,7 @@ End Function
Dim o As New Object()
? o.F()]]>
Dim source1 = <![CDATA[
Imports System.Runtime.CompilerServices
<Extension>
Shared Function G(o As Object) As Object
Return 1
......@@ -2477,7 +2475,7 @@ Dim o As New Object()
Assert.True(s0.SourceAssembly.MightContainExtensionMethods)
Dim s1 = VisualBasicCompilation.CreateSubmission(
"s1.dll",
syntaxTree:=Parse(source0.Value, parseOptions),
syntaxTree:=Parse(source1.Value, parseOptions),
previousSubmission:=s0,
references:=references)
s1.VerifyDiagnostics()
......
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/SymbolErrorTests.vb
浏览文件 @ 361117f1
......@@ -23675,15 +23675,13 @@ Imports GlobEnumsClass
<Fact>
Public Sub MustOverrideInScript()
Dim comp = CreateCompilationWithMscorlib(
<compilation>
<file name="a.vbx"><![CDATA[
Dim source = <![CDATA[
Friend MustOverride Function F() As Object
Friend MustOverride ReadOnly Property P
]]></file>
</compilation>,
parseOptions:=TestOptions.Script,
references:={MscorlibRef, SystemCoreRef})
]]>
Dim comp = CreateCompilationWithMscorlib45(
{VisualBasicSyntaxTree.ParseText(source.Value, TestOptions.Script)},
references:={SystemCoreRef})
comp.AssertTheseDiagnostics(<expected>
BC30607: 'NotInheritable' classes cannot have members declared 'MustOverride'.
Friend MustOverride Function F() As Object
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或