edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Builtins/Proc.cs;C438696 File: Proc.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Builtins/Proc.cs;C438696 (server) 5/19/2008 1:30 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Builtins/Proc.cs;DlrAstChanges @@ -113,11 +113,11 @@ CallArguments yieldArgs = callActionArgs.RemoveAt(0); // test for proc identity: - rule.AddTest(Ast.Equal(Ast.ReadProperty(procExpression, IdProperty), Ast.Constant(_id))); + rule.AddTest(Ast.Equal(Ast.Property(procExpression, IdProperty), Ast.Constant(_id))); SetProcCallRule(rule, binder, callerContext, procExpression, // proc object - Ast.ReadProperty(procExpression, Proc.SelfProperty), // self captured by the block closure + Ast.Property(procExpression, Proc.SelfProperty), // self captured by the block closure null, // do not pass calling method yieldArgs // user args ); =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/AstFactory.cs;C438696 File: AstFactory.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/AstFactory.cs;C438696 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/AstFactory.cs;DlrAstChanges @@ -78,7 +78,7 @@ ).Filter(typeof(MethodUnwinder), methodUnwinder, AstFactory.Equal(methodUnwinder, MethodUnwinder.TargetFrameField, rfcVariable, null), // return unwinder.ReturnValue; - Ast.Return(Ast.ReadField(methodUnwinder, MethodUnwinder.ReturnValueField)) + Ast.Return(Ast.Field(methodUnwinder, MethodUnwinder.ReturnValueField)) ).Finally( Ast.AssignField(rfcVariable, RuntimeFlowControl.IsActiveMethodField, Ast.False()) @@ -152,7 +152,7 @@ Debug.Assert(leftVariable != null || leftField != null); MSA.Expression lhs = (leftField == null) ? leftVariable : - (MSA.Expression)Ast.ReadField(leftVariable != null ? leftVariable : null, leftField); + (MSA.Expression)Ast.Field(leftVariable != null ? leftVariable : null, leftField); return Ast.Equal(lhs, expression); } @@ -160,7 +160,7 @@ Debug.Assert(rightVariable != null || rightField != null); MSA.Expression rhs = (rightField == null) ? rightVariable : - (MSA.Expression)Ast.ReadField(rightVariable != null ? rightVariable : null, rightField); + (MSA.Expression)Ast.Field(rightVariable != null ? rightVariable : null, rightField); return Equal(leftVariable, leftField, rhs); } @@ -262,11 +262,11 @@ while (consumed < arguments.Length) { paramArray[paramIndex++] = Ast.ConvertHelper(arguments[consumed++], elementType); } - argument = Ast.NewArray(parameter.ParameterType, paramArray); + argument = Ast.NewArrayInit(parameter.ParameterType, paramArray); } } else { // No. Create an empty array. - argument = Ast.NewArray(parameter.ParameterType); + argument = Ast.NewArrayInit(parameter.ParameterType); } } else { if (consumed < arguments.Length) { =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;C429806 File: BlockDefinition.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;C429806 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/BlockDefinition.cs;DlrAstChanges @@ -123,10 +123,10 @@ gen.TransformStatements(_body, ResultOperation.Return) ).Catch(typeof(BlockUnwinder), blockUnwinder, // redo: - Ast.IfThen(Ast.ReadField(blockUnwinder, BlockUnwinder.IsRedoField), Ast.Continue(loopLabel)), + Ast.IfThen(Ast.Field(blockUnwinder, BlockUnwinder.IsRedoField), Ast.Continue(loopLabel)), // next: - Ast.Return(Ast.ReadField(blockUnwinder, BlockUnwinder.ReturnValueField)) + Ast.Return(Ast.Field(blockUnwinder, BlockUnwinder.ReturnValueField)) ) ) ); =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Body.cs;C429806 File: Body.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Body.cs;C429806 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Body.cs;DlrAstChanges @@ -169,7 +169,7 @@ setInRescueFlag, Ast.Try( Ast.If(handlers, Ast.Assign(exceptionRethrowVariable, Ast.True())) - ).Filter(typeof(EvalUnwinder), evalUnwinder, Ast.Equal(Ast.ReadField(evalUnwinder, EvalUnwinder.ReasonField), Ast.Constant(BlockReturnReason.Retry)), + ).Filter(typeof(EvalUnwinder), evalUnwinder, Ast.Equal(Ast.Field(evalUnwinder, EvalUnwinder.ReasonField), Ast.Constant(BlockReturnReason.Retry)), Ast.Assign(retryingVariable, Ast.True()), Ast.Continue(label) ) =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Parameters.cs;C429806 File: Parameters.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Parameters.cs;C429806 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Parameters.cs;DlrAstChanges @@ -85,7 +85,7 @@ } return Ast.Block( - Ast.Assign(singleton, Ast.ReadField(null, RubyOps.DefaultArgumentField)), + Ast.Assign(singleton, Ast.Field(null, RubyOps.DefaultArgumentField)), result ); } =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/CaseExpression.cs;C429806 File: CaseExpression.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/CaseExpression.cs;C429806 (server) 5/19/2008 1:31 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/CaseExpression.cs;DlrAstChanges @@ -115,7 +115,7 @@ AstUtils.While( Ast.Call(enumVariable, typeof(IEnumerator).GetMethod("MoveNext")), Ast.If( - MakeTest(gen, Ast.ReadProperty(enumVariable, typeof(IEnumerator).GetProperty("Current")), value), + MakeTest(gen, Ast.Property(enumVariable, typeof(IEnumerator).GetProperty("Current")), value), Ast.Block( Ast.Assign(resultVariable, Ast.True()), Ast.Break(label) =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/MethodCall.cs;C437564 File: MethodCall.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/MethodCall.cs;C437564 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/MethodCall.cs;DlrAstChanges @@ -136,7 +136,7 @@ Ast.Try( Ast.Assign(resultVariable, invoke) ).Catch(typeof(EvalUnwinder), evalUnwinder, - Ast.Assign(resultVariable, Ast.ReadField(evalUnwinder, EvalUnwinder.ReturnValueField)) + Ast.Assign(resultVariable, Ast.Field(evalUnwinder, EvalUnwinder.ReturnValueField)) ), // if result != RetrySingleton then break end =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/StringConstructor.cs;C438696 File: StringConstructor.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/StringConstructor.cs;C438696 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/StringConstructor.cs;DlrAstChanges @@ -94,8 +94,8 @@ return AstFactory.OpCall(opName, argTypes, merged.ToArray()); } else { return AstFactory.OpCall( - opName + "N", - ArrayUtils.Insert(Ast.NewArray(typeof(object[]), merged), additionalArgs) + opName + "N", + ArrayUtils.Insert(Ast.NewArrayInit(typeof(object[]), merged), additionalArgs) ); } } =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/WhileLoopExpression.cs;C429806 File: WhileLoopExpression.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/WhileLoopExpression.cs;C429806 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Compiler/Ast/Expressions/WhileLoopExpression.cs;DlrAstChanges @@ -106,11 +106,11 @@ ).Catch(typeof(BlockUnwinder), blockUnwinder, // redo = u.IsRedo - Ast.Assign(redoVariable, Ast.ReadField(blockUnwinder, BlockUnwinder.IsRedoField)) + Ast.Assign(redoVariable, Ast.Field(blockUnwinder, BlockUnwinder.IsRedoField)) ).Filter(typeof(EvalUnwinder), evalUnwinder, AstFactory.Equal(evalUnwinder, EvalUnwinder.ReasonField, BlockReturnReason.Break), // result = unwinder.ReturnValue - Ast.Assign(resultVariable, Ast.ReadField(evalUnwinder, EvalUnwinder.ReturnValueField)), + Ast.Assign(resultVariable, Ast.Field(evalUnwinder, EvalUnwinder.ReturnValueField)), Ast.Break(loopLabel) ) ) =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/BlockParam.cs;C438696 File: BlockParam.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/BlockParam.cs;C438696 (server) 5/19/2008 1:31 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/BlockParam.cs;DlrAstChanges @@ -214,10 +214,10 @@ Expression blockParamExpression = Ast.Convert(callActionArgs.Expressions[0], typeof(BlockParam)); Expression selfExpression = isYieldAction ? callActionArgs.Expressions[1] : - Ast.ReadProperty(blockParamExpression, SelfProperty); + Ast.Property(blockParamExpression, SelfProperty); // test for proc identity: - rule.AddTest(Ast.Equal(Ast.ReadProperty(blockParamExpression, IdProperty), Ast.Constant(_proc.Id))); + rule.AddTest(Ast.Equal(Ast.Property(blockParamExpression, IdProperty), Ast.Constant(_proc.Id))); // removes block param, self: CallArguments yieldArgs = callActionArgs.RemoveAt(0); =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/ArgsBuilder.cs;C428685 File: ArgsBuilder.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/ArgsBuilder.cs;C428685 (server) 5/19/2008 1:31 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/ArgsBuilder.cs;DlrAstChanges @@ -147,7 +147,7 @@ listLength = list.Count; listVariable = rule.GetTemporary(type, "#list"); rule.AddTest(Ast.Equal( - Ast.ReadProperty(Ast.Assign(listVariable, Ast.Convert(parameter, type)), type.GetProperty("Count")), + Ast.Property(Ast.Assign(listVariable, Ast.Convert(parameter, type)), type.GetProperty("Count")), Ast.Constant(list.Count)) ); return true; =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyBinder.cs;C442093 File: RubyBinder.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyBinder.cs;C442093 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyBinder.cs;DlrAstChanges @@ -105,8 +105,8 @@ rule.AddTest(Ast.Comma( Ast.Assign(targetVariable, AstFactory.OpCall("GetSuperCallTarget", rule.Context)), - Ast.Equal(Ast.ReadField(targetVariable, infoType.GetField("DeclaringModule")), Ast.RuntimeConstant(currentInfo.DeclaringModule)), - Ast.Equal(Ast.ReadField(targetVariable, infoType.GetField("MethodName")), Ast.RuntimeConstant(currentInfo.MethodName)) + Ast.Equal(Ast.Field(targetVariable, infoType.GetField("DeclaringModule")), Ast.RuntimeConstant(currentInfo.DeclaringModule)), + Ast.Equal(Ast.Field(targetVariable, infoType.GetField("MethodName")), Ast.RuntimeConstant(currentInfo.MethodName)) )); Debug.Assert(currentInfo.DeclaringModule != null); =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyFieldInfo.cs;C402444 File: RubyFieldInfo.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyFieldInfo.cs;C402444 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyFieldInfo.cs;DlrAstChanges @@ -55,7 +55,7 @@ // FieldHandle when we try to emit) expr = Ast.Constant(_fieldInfo.GetValue(null)); } else { - expr = Ast.ReadField(instance, _fieldInfo); + expr = Ast.Field(instance, _fieldInfo); } } } =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodGroupInfo.cs;C437564 File: RubyMethodGroupInfo.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodGroupInfo.cs;C437564 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodGroupInfo.cs;DlrAstChanges @@ -125,7 +125,7 @@ ).Filter(typeof(MethodUnwinder), methodUnwinder, Ast.Call(bfcVariable, BlockParam.GetMethod("IsProcConverterTarget"), methodUnwinder), rule.MakeReturn( binder, - Ast.ReadField(methodUnwinder, MethodUnwinder.ReturnValueField) + Ast.Field(methodUnwinder, MethodUnwinder.ReturnValueField) ) ).Finally( Ast.Call(bfcVariable, BlockParam.GetMethod("LeaveProcConverter")) =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodInfo.cs;C438696 File: RubyMethodInfo.cs =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodInfo.cs;C438696 (server) 5/19/2008 1:32 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMethodInfo.cs;DlrAstChanges @@ -126,7 +126,7 @@ // add optional placeholders: actualArgs.AddForEachMissingArgument(delegate() { - return Ast.ReadField(null, RubyOps.DefaultArgumentField); + return Ast.Field(null, RubyOps.DefaultArgumentField); }); if (_hasParamsArray) { ===================================================================