提交 b4fc0360 编写于 作者: J Jonathon Marolf

fixing implicit comversion errors

上级 4d3d313e
......@@ -10,7 +10,7 @@
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic</AssemblyName>
<TargetFramework>netstandard1.3</TargetFramework>
<ServiceablePackage>true</ServiceablePackage>
<NoWarn>$(NoWarn);42014;40057;42016;41999</NoWarn>
<NoWarn>$(NoWarn);42014;40057</NoWarn>
<CodeAnalysisRuleSet>..\BasicCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
<!-- This is required to prevent downgrade references from CscCore/VbcCode since we must
reference Microsoft.NETCore.App to target the shared framework (bug
......
......@@ -245,7 +245,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Debug.Assert(tree IsNot VisualBasicSyntaxTree.Dummy)
Debug.Assert(tree.IsMyTemplate)
Interlocked.CompareExchange(_lazyMyTemplate, tree, VisualBasicSyntaxTree.Dummy)
Interlocked.CompareExchange(Of SyntaxTree)(_lazyMyTemplate, tree, VisualBasicSyntaxTree.Dummy)
Else
' we need to make one.
Dim text As String = EmbeddedResources.VbMyTemplateText
......@@ -260,7 +260,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Throw ExceptionUtilities.Unreachable
End If
If Interlocked.CompareExchange(_lazyMyTemplate, tree, VisualBasicSyntaxTree.Dummy) Is VisualBasicSyntaxTree.Dummy Then
If Interlocked.CompareExchange(Of SyntaxTree)(_lazyMyTemplate, tree, VisualBasicSyntaxTree.Dummy) Is VisualBasicSyntaxTree.Dummy Then
' set global cache
s_myTemplateCache(parseOptions) = tree
End If
......
......@@ -134,7 +134,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Emit
typesByName.Add(type.Name, type)
End If
Next
Interlocked.CompareExchange(Me._lazyTopLevelTypes, typesByName, Nothing)
Interlocked.CompareExchange(Of IReadOnlyDictionary(Of String, Cci.INamespaceTypeDefinition))(Me._lazyTopLevelTypes, typesByName, Nothing)
End If
Return Me._lazyTopLevelTypes
End Function
......
......@@ -55,7 +55,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Get
If Me._lazyAnonymousDelegateSymbol Is ErrorTypeSymbol.UnknownResultType Then
Dim newValue As NamedTypeSymbol = MakeAssociatedAnonymousDelegate()
Dim oldValue As NamedTypeSymbol = Interlocked.CompareExchange(Me._lazyAnonymousDelegateSymbol, newValue, ErrorTypeSymbol.UnknownResultType)
Dim oldValue As NamedTypeSymbol = Interlocked.CompareExchange(Of NamedTypeSymbol)(Me._lazyAnonymousDelegateSymbol, newValue, ErrorTypeSymbol.UnknownResultType)
Debug.Assert(oldValue Is ErrorTypeSymbol.UnknownResultType OrElse oldValue Is newValue)
End If
Return Me._lazyAnonymousDelegateSymbol
......
......@@ -1296,7 +1296,7 @@ lReportErrorOnTwoTokens:
meParameter = Nothing
Else
If _lazyMeParameter Is Nothing Then
Interlocked.CompareExchange(_lazyMeParameter, New MeParameterSymbol(Me), Nothing)
Interlocked.CompareExchange(Of ParameterSymbol)(_lazyMeParameter, New MeParameterSymbol(Me), Nothing)
End If
meParameter = _lazyMeParameter
......
......@@ -178,7 +178,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
meParameter = Nothing
Else
If _lazyMeParameter Is Nothing Then
Interlocked.CompareExchange(_lazyMeParameter, New MeParameterSymbol(Me), Nothing)
Interlocked.CompareExchange(Of ParameterSymbol)(_lazyMeParameter, New MeParameterSymbol(Me), Nothing)
End If
meParameter = _lazyMeParameter
......
......@@ -12,7 +12,7 @@
<TargetFramework>netstandard1.3</TargetFramework>
<PackageTargetFallback>portable-net452</PackageTargetFallback>
<RoslynProjectType>UnitTestDesktop</RoslynProjectType>
<NoWarn>$(NoWarn);40057;42016</NoWarn>
<NoWarn>$(NoWarn);40057</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
......
......@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
ContinueWith("Dim y As Integer = 2").
ContinueWith("?x + y")
Assert.Equal(3, s.ReturnValue)
Assert.Equal(3, CType(s.ReturnValue, Integer))
End Function
<Fact>
......@@ -27,7 +27,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
Dim source = "
?1 _
"
Assert.Equal(1, VisualBasicScript.EvaluateAsync(source).Result)
Assert.Equal(1, CType(VisualBasicScript.EvaluateAsync(source).Result, Integer))
End Sub
<Fact>
......@@ -35,7 +35,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
Dim source = "
?1
"
Assert.Equal(1, VisualBasicScript.EvaluateAsync(source).Result)
Assert.Equal(1, CType(VisualBasicScript.EvaluateAsync(source).Result, Integer))
End Sub
<Fact>
......@@ -61,7 +61,7 @@ End If
?x + 1
"
Assert.Equal(6, VisualBasicScript.EvaluateAsync(source).Result)
Assert.Equal(6, CType(VisualBasicScript.EvaluateAsync(source).Result, Integer))
End Sub
<Fact>
......@@ -81,7 +81,7 @@ Dim d = New With { Key .F = 777 }
& "" "" & (a.GetType() Is b.GetType()).ToString() _
& "" "" & (b.GetType() is d.GetType()).ToString()
")
Assert.Equal("True False True", script.EvaluateAsync().Result)
Assert.Equal("True False True", CType(script.EvaluateAsync().Result, String))
End Sub
<Fact>
......@@ -107,7 +107,7 @@ Dim d = Function () As Integer
& "" "" & (b.GetType() is d.GetType()).ToString()
")
Assert.Equal("True False True", script.EvaluateAsync().Result)
Assert.Equal("True False True", CType(script.EvaluateAsync().Result, String))
End Sub
End Class
......
......@@ -22,14 +22,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
<Fact>
Public Sub TestEvalScript()
Dim value = VisualBasicScript.EvaluateAsync("? 1 + 2", s_defaultOptions)
Assert.Equal(3, value.Result)
Dim value = CType(VisualBasicScript.EvaluateAsync("? 1 + 2", s_defaultOptions).Result, Integer)
Assert.Equal(3, value)
End Sub
<Fact>
Public Async Function TestRunScript() As Task
Dim state = Await VisualBasicScript.RunAsync("? 1 + 2", s_defaultOptions)
Assert.Equal(3, state.ReturnValue)
Assert.Equal(3, CType(state.ReturnValue, Integer))
End Function
<Fact>
......@@ -37,13 +37,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests
Dim script = VisualBasicScript.Create("? 1 + 2", s_defaultOptions)
Dim state = Await script.RunAsync()
Assert.Same(script, state.Script)
Assert.Equal(3, state.ReturnValue)
Assert.Equal(3, CType(state.ReturnValue, Integer))
End Function
<Fact>
Public Async Function TestRunScriptWithSpecifiedReturnType() As Task
Dim state = Await VisualBasicScript.RunAsync("? 1 + 2", s_defaultOptions)
Assert.Equal(3, state.ReturnValue)
Assert.Equal(3, CType(state.ReturnValue, Integer))
End Function
<Fact>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册