Merge branch 'master' of git://github.com/ironruby/ironruby

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/BuiltinsOps.cs

@@ -23,6 +23,7 @@
 using Microsoft.Scripting.Runtime;
 using System.Runtime.InteropServices;
 using Microsoft.Scripting.Generation;
+using Microsoft.Scripting.Utils;
 using System.Collections.Generic;
 using System.Globalization;
 

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/IronRuby.Libraries.Yaml.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.20624</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AA18A245-E342-4368-A474-83178311A742}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -25,15 +24,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\..\Main\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;$(SignedSym)</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;$(SignedSym);CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\..\Main\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;$(SignedSym)</DefineConstants>
+    <DefineConstants>TRACE;$(SignedSym);CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -95,7 +94,6 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-
     <ProjectReference Include="..\..\..\..\..\..\ndp\fx\src\Core\Microsoft\Scripting\Microsoft.Scripting.Core.csproj" Condition="'$(TargetFrameworkVersion)' != 'v4.0'">
       <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
       <Name>Microsoft.Scripting.Core</Name>
@@ -109,9 +107,13 @@
       <Name>Ruby %28Languages\Ruby\Ruby%29</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\Main\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj">
-      <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
+      <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
       <Name>Microsoft.Scripting</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Main\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
+      <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
+      <Name>Microsoft.Dynamic</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Engine\resolver_scanner.rl" />

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/Properties/AssemblyInfo.cs

@@ -38,6 +38,6 @@
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: SecurityTransparent]
 
-#if CLR4
+#if !CLR2
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/RubyConstructor.cs

@@ -24,6 +24,7 @@
 using Microsoft.Scripting;
 using Microsoft.Scripting.Runtime;
 using Microsoft.Scripting.Generation;
+using Microsoft.Scripting.Utils;
 
 namespace IronRuby.StandardLibrary.Yaml {
 

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/RubyRepresenter.cs

@@ -20,6 +20,7 @@
 using IronRuby.Runtime.Calls;
 using Microsoft.Scripting;
 using Microsoft.Scripting.Runtime;
+using Microsoft.Scripting.Utils;
 using System.Collections;
 using System.Collections.Generic;
 

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/language/return_tags.txt

@@ -1,3 +1 @@
-fails:The return keyword in a Thread raises a ThreadError if used to exit a thread
-fails:The return keyword when passed a splat calls 'to_a' on the splatted value first
-fails:The return keyword when passed a splat calls 'to_ary' on the splatted value first
+fails:The return keyword in a Thread raises a ThreadError if used to exit a thread

Merlin/Main/Config/Signed/App.config

@@ -6,7 +6,7 @@
 
   <microsoft.scripting>
     <languages>
-      <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6 Alpha" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby" type="IronRuby.Runtime.RubyContext, IronRuby, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     </languages>
 

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: SecurityTransparent]
-#if CLR4
+#if !CLR2
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif
 

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/CompilerServices/DebugLambdaInfo.cs

@@ -13,8 +13,13 @@
  *
  * ***************************************************************************/
 
-using System.Collections.Generic;
+#if !CLR2
 using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
+using System.Collections.Generic;
 
 namespace Microsoft.Scripting.Debugging.CompilerServices {
     /// <summary>

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/CompilerServices/IDebugCompilerSupport.cs

@@ -13,7 +13,11 @@
  *
  * ***************************************************************************/
 
+#if !CLR2
 using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
 
 namespace Microsoft.Scripting.Debugging.CompilerServices {
     /// <summary>

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/DebugContext.cs

@@ -13,13 +13,18 @@
  *
  * ***************************************************************************/
 
+#if !CLR2
+using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.Scripting.Utils;
-using MSAst = System.Linq.Expressions;
 
 namespace Microsoft.Scripting.Debugging.CompilerServices {
 

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/DebugFrame.cs

@@ -193,10 +193,10 @@ public sealed class DebugFrame {
             set {
                 if (_thrownException != null && value == null) {
                     _thrownException = null;
-                    GetLocalsScope().TryRemoveVariable(_exceptionVariableSymbol);
-                } else if (value != null && !GetLocalsScope().ContainsVariable(_exceptionVariableSymbol)) {
+                    GetLocalsScope().Remove(_exceptionVariableSymbol);
+                } else if (value != null && !GetLocalsScope().ContainsKey(_exceptionVariableSymbol)) {
                     _thrownException = value;
-                    GetLocalsScope().SetVariable(_exceptionVariableSymbol, _thrownException);
+                    GetLocalsScope()[_exceptionVariableSymbol] = _thrownException;
                 }
             }
         }
@@ -279,9 +279,9 @@ public sealed class DebugFrame {
             ((IEnumerator)_generator).MoveNext();
         }
 
-        internal Scope GetLocalsScope() {
+        internal IAttributesCollection GetLocalsScope() {
             ScopeData scopeData = CurrentScopeData;
-            Scope scope = scopeData.Scope;
+            IAttributesCollection scope = scopeData.Scope;
             if (scope == null) {
                 Debug.Assert(_liftedLocals != null);
 
@@ -306,7 +306,7 @@ public sealed class DebugFrame {
 
                 IRuntimeVariables scopedLocals = new ScopedRuntimeVariables(visibleLocals, _liftedLocals);
 
-                scope = new Scope(new LocalsDictionary(scopedLocals, visibleSymbols.ToArray()));
+                scope = new LocalsDictionary(scopedLocals, visibleSymbols.ToArray());
 
                 scopeData.Scope = scope;
             }
@@ -409,7 +409,7 @@ public sealed class DebugFrame {
         private class ScopeData {
             public VariableInfo[] VarInfos;
             public VariableInfo[] VarInfosWithException;
-            public Scope Scope;
+            public IAttributesCollection Scope;
         }
     }
 }

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/DebugInfoRewriter.cs

@@ -13,17 +13,22 @@
  *
  * ***************************************************************************/
 
+#if !CLR2
+using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.Scripting.Debugging.CompilerServices;
 using AstUtils = Microsoft.Scripting.Ast.Utils;
-using MSAst = System.Linq.Expressions;
 
 namespace Microsoft.Scripting.Debugging {
-    using Ast = System.Linq.Expressions.Expression;
+    using Ast = MSAst.Expression;
 
     /// <summary>
     /// Used to rewrite expressions containing DebugInfoExpressions.

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/DebuggableLambdaBuilder.cs

@@ -13,17 +13,22 @@
  *
  * ***************************************************************************/
 
+#if !CLR2
+using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Scripting.Ast;
 using Microsoft.Scripting.Debugging.CompilerServices;
 using Microsoft.Scripting.Utils;
 using AstUtils = Microsoft.Scripting.Ast.Utils;
-using MSAst = System.Linq.Expressions;
 
 namespace Microsoft.Scripting.Debugging {
-    using Ast = System.Linq.Expressions.Expression;
+    using Ast = MSAst.Expression;
 
     /// <summary>
     /// DebuggableLambdaBuilder is used to transform a DLR expression tree into a debuggable lambda expression.

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/DefaultRuntimeVariablesImpl/DefaultDebugThreadFactory.cs

@@ -13,11 +13,16 @@
  *
  * ***************************************************************************/
 
-using System.Collections.Generic;
+#if !CLR2
 using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
+using System.Collections.Generic;
 
 namespace Microsoft.Scripting.Debugging {
-    using Ast = System.Linq.Expressions.Expression;
+    using Ast = MSAst.Expression;
 
     /// <summary>
     /// Default implementation of IDebugThreadFactory, which uses DLR's RuntimeVariablesExpression for lifting locals.

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/InvokeTargets.cs

@@ -13,12 +13,18 @@
  *
  * ***************************************************************************/
 
+#if !CLR2
+using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 
 namespace Microsoft.Scripting.Debugging {
-    using Ast = System.Linq.Expressions.Expression;
+    using Ast = MSAst.Expression;
 
     internal static class InvokeTargets {
         internal static Type GetGeneratorFactoryTarget(Type[] parameterTypes) {

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/LambdaWalker.cs

@@ -13,8 +13,13 @@
  *
  * ***************************************************************************/
 
-using System.Collections.Generic;
+#if !CLR2
 using MSAst = System.Linq.Expressions;
+#else
+using MSAst = Microsoft.Scripting.Ast;
+#endif
+
+using System.Collections.Generic;
 
 namespace Microsoft.Scripting.Debugging {
     /// <summary>

Merlin/Main/Debugging/Microsoft.Scripting.Debugging/Microsoft.Scripting.Debugging.csproj

@@ -27,28 +27,29 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\Bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;$(SignedSym)</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;$(SignedSym);CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
+    <BaseAddress>860880896</BaseAddress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\Bin\Release\</OutputPath>
     <DocumentationFile>..\..\Bin\Release\Microsoft.Scripting.Debugging.xml</DocumentationFile>
-    <DefineConstants>TRACE;$(SignedSym)</DefineConstants>
+    <DefineConstants>TRACE;$(SignedSym);CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- <BaseAddress>1929379840</BaseAddress> -->
+    <BaseAddress>860880896</BaseAddress>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Bin\Silverlight Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;$(SignedSym)</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;$(SignedSym);CLR2</DefineConstants>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -61,7 +62,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight Release|AnyCPU' ">
     <OutputPath>..\..\Bin\Silverlight Release\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;$(SignedSym)</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;$(SignedSym);CLR2</DefineConstants>
     <DocumentationFile>..\..\Bin\Silverlight Release\Microsoft.Scripting.Debugging.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591,618</NoWarn>
@@ -95,6 +96,21 @@
     <NoWarn>1591</NoWarn>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
+    <OutputPath>..\..\Bin\FxCop\</OutputPath>
+    <DefineConstants>TRACE;CODE_ANALYSIS;CLR2;SIGNED</DefineConstants>
+    <DocumentationFile>..\..\Bin\Release\Microsoft.Scripting.Debugging.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleAssemblies>C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleAssemblies>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\ndp\fx\src\Core\Microsoft\Scripting\Microsoft.Scripting.Core.csproj" Condition="'$(TargetFrameworkVersion)' != 'v4.0'">
       <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
@@ -105,9 +121,13 @@
       <Name>Microsoft.Scripting.ExtensionAttribute</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj">
-      <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
+      <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
       <Name>Microsoft.Scripting</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
+      <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
+      <Name>Microsoft.Dynamic</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" Condition=" $(SilverlightBuild) != 'true' " />