diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Constructor.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Constructor.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Constructor.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Constructor.cs 2007-04-03 19:19:05.000000000 +0300 @@ -40,7 +40,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; this.region = Class.GetRegion(); this.bodyRegion = Class.GetRegion(); this._member = null; @@ -79,7 +79,7 @@ mod |= ModifierEnum.Extern; modifiers = mod; - this.FullyQualifiedName = "this"; + this.Name = "this"; returnType = new ReturnType ((NCC.MType)tinfo.ReturnType); this.region = Class.GetRegion (tinfo.Location); diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Event.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Event.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Event.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Event.cs 2007-04-03 19:19:05.000000000 +0300 @@ -33,7 +33,7 @@ ModifierEnum mod = (ModifierEnum)0; modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType(tinfo.EventHandlerType); this.region = Class.GetRegion(); this.bodyRegion = Class.GetRegion(); @@ -71,7 +71,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType (tinfo.GetMemType ()); this.region = Class.GetRegion (tinfo.Location); if (tinfo is NCC.MemberBuilder) diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Field.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Field.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Field.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Field.cs 2007-04-03 19:19:05.000000000 +0300 @@ -41,7 +41,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType(tinfo.FieldType); this.region = Class.GetRegion(); @@ -85,7 +85,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType (tinfo.GetMemType ()); this.region = Class.GetRegion (tinfo.Location); diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Indexer.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Indexer.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Indexer.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Indexer.cs 2007-04-03 19:19:05.000000000 +0300 @@ -37,7 +37,7 @@ ModifierEnum mod = (ModifierEnum)0; modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType(tinfo.PropertyType); this.region = Class.GetRegion(); this.bodyRegion = Class.GetRegion(); @@ -79,7 +79,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType (tinfo.GetMemType ()); this.region = Class.GetRegion (tinfo.Location); if (tinfo is NCC.MemberBuilder) diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Local.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Local.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Local.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Local.cs 2007-04-03 19:19:05.000000000 +0300 @@ -27,7 +27,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType (tinfo.Type.Fix ()); this.region = Class.GetRegion (); } diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Method.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Method.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Method.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Method.cs 2007-04-03 19:19:05.000000000 +0300 @@ -167,45 +167,45 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; - if (tinfo.Name == "op_Addition") this.FullyQualifiedName = "@+"; - else if (tinfo.Name == "op_Subtraction") this.FullyQualifiedName = "@-"; - else if (tinfo.Name == "op_Multiply") this.FullyQualifiedName = "@*"; - else if (tinfo.Name == "op_Division") this.FullyQualifiedName = "@/"; - else if (tinfo.Name == "op_Modulus") this.FullyQualifiedName = "@%"; - else if (tinfo.Name == "op_ExclusiveOr") this.FullyQualifiedName = "@^"; - else if (tinfo.Name == "op_BitwiseAnd") this.FullyQualifiedName = "@&"; - else if (tinfo.Name == "op_BitwiseOr") this.FullyQualifiedName = "@|"; - else if (tinfo.Name == "op_LogicalAnd") this.FullyQualifiedName = "@&&"; - else if (tinfo.Name == "op_LogicalOr") this.FullyQualifiedName = "@||"; - else if (tinfo.Name == "op_Assign") this.FullyQualifiedName = "@="; - else if (tinfo.Name == "op_LeftShift") this.FullyQualifiedName = "@<<"; - else if (tinfo.Name == "op_RightShift") this.FullyQualifiedName = "@>>"; - else if (tinfo.Name == "op_Equality") this.FullyQualifiedName = "@=="; - else if (tinfo.Name == "op_GreaterThan") this.FullyQualifiedName = "@>"; - else if (tinfo.Name == "op_LessThan") this.FullyQualifiedName = "@<"; - else if (tinfo.Name == "op_Inequality") this.FullyQualifiedName = "@!="; - else if (tinfo.Name == "op_GreaterThanOrEqual") this.FullyQualifiedName = "@>="; - else if (tinfo.Name == "op_LessThanOrEqual") this.FullyQualifiedName = "@<="; - else if (tinfo.Name == "op_MultiplicationAssignment") this.FullyQualifiedName = "@*="; - else if (tinfo.Name == "op_SubtractionAssignment") this.FullyQualifiedName = "@-="; - else if (tinfo.Name == "op_ExclusiveOrAssignment") this.FullyQualifiedName = "@^="; - else if (tinfo.Name == "op_LeftShiftAssignment") this.FullyQualifiedName = "@<<="; - else if (tinfo.Name == "op_ModulusAssignment") this.FullyQualifiedName = "@%="; - else if (tinfo.Name == "op_AdditionAssignment") this.FullyQualifiedName = "@+="; - else if (tinfo.Name == "op_BitwiseAndAssignment") this.FullyQualifiedName = "@&="; - else if (tinfo.Name == "op_BitwiseOrAssignment") this.FullyQualifiedName = "@|="; - else if (tinfo.Name == "op_Comma") this.FullyQualifiedName = "@,"; - else if (tinfo.Name == "op_DivisionAssignment") this.FullyQualifiedName = "@/="; - else if (tinfo.Name == "op_Implicit") this.FullyQualifiedName = "@:"; - else if (tinfo.Name == "op_Explicit") this.FullyQualifiedName = "@:>"; - else if (tinfo.Name == "op_UnaryPlus") this.FullyQualifiedName = "@+"; - else if (tinfo.Name == "op_UnaryNegation") this.FullyQualifiedName = "@-"; - else if (tinfo.Name == "op_Decrement") this.FullyQualifiedName = "@--"; - else if (tinfo.Name == "op_Increment") this.FullyQualifiedName = "@++"; - else if (tinfo.Name == "op_OnesComplement") this.FullyQualifiedName = "@~"; - else if (tinfo.Name == "op_LogicalNot") this.FullyQualifiedName = "@!"; + if (tinfo.Name == "op_Addition") this.Name = "@+"; + else if (tinfo.Name == "op_Subtraction") this.Name = "@-"; + else if (tinfo.Name == "op_Multiply") this.Name = "@*"; + else if (tinfo.Name == "op_Division") this.Name = "@/"; + else if (tinfo.Name == "op_Modulus") this.Name = "@%"; + else if (tinfo.Name == "op_ExclusiveOr") this.Name = "@^"; + else if (tinfo.Name == "op_BitwiseAnd") this.Name = "@&"; + else if (tinfo.Name == "op_BitwiseOr") this.Name = "@|"; + else if (tinfo.Name == "op_LogicalAnd") this.Name = "@&&"; + else if (tinfo.Name == "op_LogicalOr") this.Name = "@||"; + else if (tinfo.Name == "op_Assign") this.Name = "@="; + else if (tinfo.Name == "op_LeftShift") this.Name = "@<<"; + else if (tinfo.Name == "op_RightShift") this.Name = "@>>"; + else if (tinfo.Name == "op_Equality") this.Name = "@=="; + else if (tinfo.Name == "op_GreaterThan") this.Name = "@>"; + else if (tinfo.Name == "op_LessThan") this.Name = "@<"; + else if (tinfo.Name == "op_Inequality") this.Name = "@!="; + else if (tinfo.Name == "op_GreaterThanOrEqual") this.Name = "@>="; + else if (tinfo.Name == "op_LessThanOrEqual") this.Name = "@<="; + else if (tinfo.Name == "op_MultiplicationAssignment") this.Name = "@*="; + else if (tinfo.Name == "op_SubtractionAssignment") this.Name = "@-="; + else if (tinfo.Name == "op_ExclusiveOrAssignment") this.Name = "@^="; + else if (tinfo.Name == "op_LeftShiftAssignment") this.Name = "@<<="; + else if (tinfo.Name == "op_ModulusAssignment") this.Name = "@%="; + else if (tinfo.Name == "op_AdditionAssignment") this.Name = "@+="; + else if (tinfo.Name == "op_BitwiseAndAssignment") this.Name = "@&="; + else if (tinfo.Name == "op_BitwiseOrAssignment") this.Name = "@|="; + else if (tinfo.Name == "op_Comma") this.Name = "@,"; + else if (tinfo.Name == "op_DivisionAssignment") this.Name = "@/="; + else if (tinfo.Name == "op_Implicit") this.Name = "@:"; + else if (tinfo.Name == "op_Explicit") this.Name = "@:>"; + else if (tinfo.Name == "op_UnaryPlus") this.Name = "@+"; + else if (tinfo.Name == "op_UnaryNegation") this.Name = "@-"; + else if (tinfo.Name == "op_Decrement") this.Name = "@--"; + else if (tinfo.Name == "op_Increment") this.Name = "@++"; + else if (tinfo.Name == "op_OnesComplement") this.Name = "@~"; + else if (tinfo.Name == "op_LogicalNot") this.Name = "@!"; returnType = new ReturnType(tinfo.ReturnType); this.region = Class.GetRegion(); @@ -248,7 +248,7 @@ mod |= ModifierEnum.Extern; modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; if (tinfo.GetHeader().typarms.Length > 0) { @@ -259,43 +259,43 @@ } } - if (tinfo.Name == "op_Addition") this.FullyQualifiedName = "@+"; - else if (tinfo.Name == "op_Subtraction") this.FullyQualifiedName = "@-"; - else if (tinfo.Name == "op_Multiply") this.FullyQualifiedName = "@*"; - else if (tinfo.Name == "op_Division") this.FullyQualifiedName = "@/"; - else if (tinfo.Name == "op_Modulus") this.FullyQualifiedName = "@%"; - else if (tinfo.Name == "op_ExclusiveOr") this.FullyQualifiedName = "@^"; - else if (tinfo.Name == "op_BitwiseAnd") this.FullyQualifiedName = "@&"; - else if (tinfo.Name == "op_BitwiseOr") this.FullyQualifiedName = "@|"; - else if (tinfo.Name == "op_LogicalAnd") this.FullyQualifiedName = "@&&"; - else if (tinfo.Name == "op_LogicalOr") this.FullyQualifiedName = "@||"; - else if (tinfo.Name == "op_Assign") this.FullyQualifiedName = "@="; - else if (tinfo.Name == "op_LeftShift") this.FullyQualifiedName = "@<<"; - else if (tinfo.Name == "op_RightShift") this.FullyQualifiedName = "@>>"; - else if (tinfo.Name == "op_Equality") this.FullyQualifiedName = "@=="; - else if (tinfo.Name == "op_GreaterThan") this.FullyQualifiedName = "@>"; - else if (tinfo.Name == "op_LessThan") this.FullyQualifiedName = "@<"; - else if (tinfo.Name == "op_Inequality") this.FullyQualifiedName = "@!="; - else if (tinfo.Name == "op_GreaterThanOrEqual") this.FullyQualifiedName = "@>="; - else if (tinfo.Name == "op_LessThanOrEqual") this.FullyQualifiedName = "@<="; - else if (tinfo.Name == "op_MultiplicationAssignment") this.FullyQualifiedName = "@*="; - else if (tinfo.Name == "op_SubtractionAssignment") this.FullyQualifiedName = "@-="; - else if (tinfo.Name == "op_ExclusiveOrAssignment") this.FullyQualifiedName = "@^="; - else if (tinfo.Name == "op_LeftShiftAssignment") this.FullyQualifiedName = "@<<="; - else if (tinfo.Name == "op_ModulusAssignment") this.FullyQualifiedName = "@%="; - else if (tinfo.Name == "op_AdditionAssignment") this.FullyQualifiedName = "@+="; - else if (tinfo.Name == "op_BitwiseAndAssignment") this.FullyQualifiedName = "@&="; - else if (tinfo.Name == "op_BitwiseOrAssignment") this.FullyQualifiedName = "@|="; - else if (tinfo.Name == "op_Comma") this.FullyQualifiedName = "@,"; - else if (tinfo.Name == "op_DivisionAssignment") this.FullyQualifiedName = "@/="; - else if (tinfo.Name == "op_Implicit") this.FullyQualifiedName = "@:"; - else if (tinfo.Name == "op_Explicit") this.FullyQualifiedName = "@:>"; - else if (tinfo.Name == "op_UnaryPlus") this.FullyQualifiedName = "@+"; - else if (tinfo.Name == "op_UnaryNegation") this.FullyQualifiedName = "@-"; - else if (tinfo.Name == "op_Decrement") this.FullyQualifiedName = "@--"; - else if (tinfo.Name == "op_Increment") this.FullyQualifiedName = "@++"; - else if (tinfo.Name == "op_OnesComplement") this.FullyQualifiedName = "@~"; - else if (tinfo.Name == "op_LogicalNot") this.FullyQualifiedName = "@!"; + if (tinfo.Name == "op_Addition") this.Name = "@+"; + else if (tinfo.Name == "op_Subtraction") this.Name = "@-"; + else if (tinfo.Name == "op_Multiply") this.Name = "@*"; + else if (tinfo.Name == "op_Division") this.Name = "@/"; + else if (tinfo.Name == "op_Modulus") this.Name = "@%"; + else if (tinfo.Name == "op_ExclusiveOr") this.Name = "@^"; + else if (tinfo.Name == "op_BitwiseAnd") this.Name = "@&"; + else if (tinfo.Name == "op_BitwiseOr") this.Name = "@|"; + else if (tinfo.Name == "op_LogicalAnd") this.Name = "@&&"; + else if (tinfo.Name == "op_LogicalOr") this.Name = "@||"; + else if (tinfo.Name == "op_Assign") this.Name = "@="; + else if (tinfo.Name == "op_LeftShift") this.Name = "@<<"; + else if (tinfo.Name == "op_RightShift") this.Name = "@>>"; + else if (tinfo.Name == "op_Equality") this.Name = "@=="; + else if (tinfo.Name == "op_GreaterThan") this.Name = "@>"; + else if (tinfo.Name == "op_LessThan") this.Name = "@<"; + else if (tinfo.Name == "op_Inequality") this.Name = "@!="; + else if (tinfo.Name == "op_GreaterThanOrEqual") this.Name = "@>="; + else if (tinfo.Name == "op_LessThanOrEqual") this.Name = "@<="; + else if (tinfo.Name == "op_MultiplicationAssignment") this.Name = "@*="; + else if (tinfo.Name == "op_SubtractionAssignment") this.Name = "@-="; + else if (tinfo.Name == "op_ExclusiveOrAssignment") this.Name = "@^="; + else if (tinfo.Name == "op_LeftShiftAssignment") this.Name = "@<<="; + else if (tinfo.Name == "op_ModulusAssignment") this.Name = "@%="; + else if (tinfo.Name == "op_AdditionAssignment") this.Name = "@+="; + else if (tinfo.Name == "op_BitwiseAndAssignment") this.Name = "@&="; + else if (tinfo.Name == "op_BitwiseOrAssignment") this.Name = "@|="; + else if (tinfo.Name == "op_Comma") this.Name = "@,"; + else if (tinfo.Name == "op_DivisionAssignment") this.Name = "@/="; + else if (tinfo.Name == "op_Implicit") this.Name = "@:"; + else if (tinfo.Name == "op_Explicit") this.Name = "@:>"; + else if (tinfo.Name == "op_UnaryPlus") this.Name = "@+"; + else if (tinfo.Name == "op_UnaryNegation") this.Name = "@-"; + else if (tinfo.Name == "op_Decrement") this.Name = "@--"; + else if (tinfo.Name == "op_Increment") this.Name = "@++"; + else if (tinfo.Name == "op_OnesComplement") this.Name = "@~"; + else if (tinfo.Name == "op_LogicalNot") this.Name = "@!"; returnType = new ReturnType ((NCC.MType)tinfo.ReturnType); this.region = Class.GetRegion (tinfo.Location); Только в Extras/NemerleBinding/Parser/SharpDevelopTree: Modifier.cs Только в Extras/NemerleBinding/Parser/SharpDevelopTree: Parameter.cs diff -ur Extras/NemerleBinding/Parser/SharpDevelopTree/Property.cs Extras/NemerleBinding/Parser/SharpDevelopTree/Property.cs --- Extras/NemerleBinding/Parser/SharpDevelopTree/Property.cs 2007-03-08 01:02:15.000000000 +0200 +++ Extras/NemerleBinding/Parser/SharpDevelopTree/Property.cs 2007-04-03 19:19:05.000000000 +0300 @@ -32,7 +32,7 @@ ModifierEnum mod = (ModifierEnum)0; modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType(tinfo.PropertyType); this.region = Class.GetRegion(); this.bodyRegion = Class.GetRegion(); @@ -70,7 +70,7 @@ modifiers = mod; - this.FullyQualifiedName = tinfo.Name; + this.Name = tinfo.Name; returnType = new ReturnType (tinfo.GetMemType ()); this.region = Class.GetRegion (tinfo.Location); if (tinfo is NCC.MemberBuilder)