2009-11-26 Marek Safar <marek.safar@gmail.com>

	* Updated to r35702.


svn path=/trunk/mcs/; revision=147001

4 files changed, 52 insertions, 17 deletions

diff --git a/mcs/class/dlr/ChangeLog b/mcs/class/dlr/ChangeLog
index ac91ac2861c..33c0efe6661 100644
--- a/mcs/class/dlr/ChangeLog
+++ b/mcs/class/dlr/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-26  Marek Safar  <marek.safar@gmail.com>
+
+	* Updated to r35702.
+
 2009-11-09  Marek Safar  <marek.safar@gmail.com>
 
 	* Makefile: Add dist only Makefile.
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.Build.csproj b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.Build.csproj
index 003f5788f42..687efe40f09 100644
--- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.Build.csproj
+++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.Build.csproj
@@ -308,9 +308,7 @@
       <!--                               -->

       <!--          Interpreter          -->

       <!--                               -->

-      <Compile Include="Interpreter\DynamicInstructions.cs" />

-      <Compile Include="Interpreter\DynamicInstructions.Generated.cs" />

-      <Compile Include="Interpreter\Instruction.cs" />

+      <Compile Include="Interpreter\BranchLabel.cs" />

       <Compile Include="Interpreter\InterpretedFrame.cs" />

       <Compile Include="Interpreter\Interpreter.cs" />

       <Compile Include="Interpreter\LastFaultingLineExpression.cs" />

@@ -322,6 +320,30 @@
       <Compile Include="Interpreter\RuntimeVariables.cs" />

     </ItemGroup>

     <ItemGroup>

+      <!--                                            -->

+      <!--          Interpreter.Instructions          -->

+      <!--                                            -->

+      <Compile Include="Interpreter\Instructions\AddInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\ArrayOperations.cs" />

+      <Compile Include="Interpreter\Instructions\CallInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\CallInstruction.Generated.cs" />

+      <Compile Include="Interpreter\Instructions\ControlFlowInstructions.cs" />

+      <Compile Include="Interpreter\Instructions\DynamicInstructionN.cs" />

+      <Compile Include="Interpreter\Instructions\DynamicInstructions.Generated.cs" />

+      <Compile Include="Interpreter\Instructions\EqualInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\FieldOperations.cs" />

+      <Compile Include="Interpreter\Instructions\GreaterThanInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\Instruction.cs" />

+      <Compile Include="Interpreter\Instructions\InstructionFactory.cs" />

+      <Compile Include="Interpreter\Instructions\InstructionList.cs" />

+      <Compile Include="Interpreter\Instructions\LessThanInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\LocalAccess.cs" />

+      <Compile Include="Interpreter\Instructions\NotEqualInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\NumericConvertInstruction.cs" />

+      <Compile Include="Interpreter\Instructions\StackOperations.cs" />

+      <Compile Include="Interpreter\Instructions\TypeOperations.cs" />

+    </ItemGroup>

+    <ItemGroup>

       <!--                        -->

       <!--          Math          -->

       <!--                        -->

@@ -424,8 +446,6 @@
       <Compile Include="Utils\Publisher.cs" />

       <Compile Include="Utils\ReadOnlyDictionary.cs" />

       <Compile Include="Utils\ReferenceEqualityComparer.cs" />

-      <Compile Include="Utils\ReflectedCaller.cs" />

-      <Compile Include="Utils\ReflectedCaller.Generated.cs" />

       <Compile Include="Utils\ReflectionUtils.cs" />

       <Compile Include="Utils\StringUtils.cs" />

       <Compile Include="Utils\SynchronizedDictionary.cs" />

diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj
index 32daf44a52c..27e163520ee 100644
--- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj
+++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj
@@ -21,7 +21,6 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <Silverlight3Path>$(ProgramFiles)\Microsoft Silverlight\3.0.40818.0</Silverlight3Path>
     <Silverlight4Path>..\..\Utilities\Silverlight\v4-x86fre</Silverlight4Path>
-
     <!-- The following two lines prevent csc.rsp and Microsoft.NETFramework.props from adding additional assembly references -->
     <NoConfig>true</NoConfig>
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
@@ -266,14 +265,31 @@
     <Compile Include="Hosting\Shell\Remote\RemoteConsoleCommandLine.cs" />
     <Compile Include="Hosting\Shell\Remote\RemoteConsoleHost.cs" />
     <Compile Include="Hosting\Shell\Remote\RemoteRuntimeServer.cs" />
+    <Compile Include="Interpreter\BranchLabel.cs" />
+    <Compile Include="Interpreter\Instructions\AddInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\ArrayOperations.cs" />
+    <Compile Include="Interpreter\Instructions\CallInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\CallInstruction.Generated.cs" />
+    <Compile Include="Interpreter\Instructions\ControlFlowInstructions.cs" />
+    <Compile Include="Interpreter\Instructions\EqualInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\FieldOperations.cs" />
+    <Compile Include="Interpreter\Instructions\GreaterThanInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\InstructionFactory.cs" />
+    <Compile Include="Interpreter\Instructions\LessThanInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\LocalAccess.cs" />
+    <Compile Include="Interpreter\Instructions\InstructionList.cs" />
+    <Compile Include="Interpreter\Instructions\NotEqualInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\NumericConvertInstruction.cs" />
+    <Compile Include="Interpreter\Instructions\StackOperations.cs" />
+    <Compile Include="Interpreter\Instructions\TypeOperations.cs" />
     <Compile Include="Interpreter\LightDelegateCreator.cs" />
     <Compile Include="Interpreter\LightLambda.Generated.cs" />
     <Compile Include="Interpreter\Interpreter.cs" />
-    <Compile Include="Interpreter\DynamicInstructions.Generated.cs" />
-    <Compile Include="Interpreter\DynamicInstructions.cs" />
+    <Compile Include="Interpreter\Instructions\DynamicInstructions.Generated.cs" />
+    <Compile Include="Interpreter\Instructions\DynamicInstructionN.cs" />
     <Compile Include="Interpreter\LightLambdaClosureVisitor.cs" />
     <Compile Include="Interpreter\LightLambda.cs" />
-    <Compile Include="Interpreter\Instruction.cs" />
+    <Compile Include="Interpreter\Instructions\Instruction.cs" />
     <Compile Include="Interpreter\LightCompiler.cs" />
     <Compile Include="Interpreter\RuntimeVariables.cs" />
     <Compile Include="Interpreter\InterpretedFrame.cs" />
@@ -373,8 +389,6 @@
     <Compile Include="Utils\Publisher.cs" />
     <Compile Include="Utils\ReadOnlyDictionary.cs" />
     <Compile Include="Utils\ReferenceEqualityComparer.cs" />
-    <Compile Include="Utils\ReflectedCaller.Generated.cs" />
-    <Compile Include="Utils\ReflectedCaller.cs" />
     <Compile Include="Utils\HashSet.cs" />
     <Compile Include="Utils\SynchronizedDictionary.cs" />
     <Compile Include="Utils\ThreadLocal.cs" />
@@ -470,11 +484,11 @@
     <Reference Include="System.Core" Condition=" '$(TargetFrameworkVersion)' == 'v4.0' " />
   </ItemGroup>
   <ItemGroup Condition=" '$(SilverlightBuild)' == 'true' ">
-    <Reference Include="mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" >
+    <Reference Include="mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SilverlightPath)\mscorlib.dll</HintPath>
     </Reference>
-    <Reference Include="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" >
+    <Reference Include="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SilverlightPath)\System.dll</HintPath>
     </Reference>
@@ -505,8 +519,5 @@
   <ItemGroup>
     <Content Include="Microsoft.Scripting.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Hosting\Providers\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition=" '$(SilverlightTreeBuild)' != 'true' " />
 </Project>
diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs
index b4319beda9c..2c1b1ef6036 100644
--- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs
+++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs
@@ -159,7 +159,7 @@ namespace System.Linq.Expressions {
         /// </remarks>

         protected internal virtual Expression VisitChildren(ExpressionVisitor visitor) {

             if (!CanReduce) throw Error.MustBeReducible();

-            return visitor.Visit(ReduceExtensions());

+            return visitor.Visit(ReduceAndCheck());

         }

 

         /// <summary>