Include source line column info in MDB files
authorMarek Safar <marek.safar@gmail.com>
Wed, 13 Jun 2012 14:17:35 +0000 (15:17 +0100)
committerMarek Safar <marek.safar@gmail.com>
Wed, 13 Jun 2012 14:18:44 +0000 (15:18 +0100)
40 files changed:
mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/CSharpBinaryOperationBinder.cs
mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
mcs/class/Mono.CompilerServices.SymbolWriter/SourceMethodBuilder.cs
mcs/mcs/anonymous.cs
mcs/mcs/assign.cs
mcs/mcs/async.cs
mcs/mcs/const.cs
mcs/mcs/cs-parser.jay
mcs/mcs/expression.cs
mcs/mcs/field.cs
mcs/mcs/property.cs
mcs/mcs/settings.cs
mcs/mcs/statement.cs
mcs/tests/test-debug-01-ref.xml
mcs/tests/test-debug-02-ref.xml
mcs/tests/test-debug-02.cs
mcs/tests/test-debug-03-ref.xml
mcs/tests/test-debug-04-ref.xml
mcs/tests/test-debug-05-ref.xml
mcs/tests/test-debug-06-ref.xml
mcs/tests/test-debug-07-ref.xml
mcs/tests/test-debug-08-ref.xml
mcs/tests/test-debug-09-ref.xml
mcs/tests/test-debug-10-ref.xml
mcs/tests/test-debug-11-ref.xml
mcs/tests/test-debug-12-ref.xml
mcs/tests/test-debug-13-ref.xml
mcs/tests/test-debug-14-ref.xml
mcs/tests/test-debug-15-ref.xml
mcs/tests/test-debug-16-ref.xml
mcs/tests/test-debug-17-ref.xml
mcs/tests/test-debug-18-ref.xml
mcs/tests/test-debug-19-ref.xml
mcs/tests/test-debug-20-ref.xml
mcs/tests/test-debug-21-ref.xml
mcs/tests/test-debug-22-ref.xml
mcs/tests/test-debug-23-ref.xml
mcs/tests/ver-il-net_4_5.xml
mcs/tools/compiler-tester/compiler-tester.cs

index e06b7226ed7eb229d88228cba6efe3ad4887814e..9ebae70b1bc071525ac5a2ebd4c28d5e6eaaaf11 100644 (file)
@@ -140,7 +140,7 @@ namespace Microsoft.CSharp.RuntimeBinder
 
                        if (is_compound) {
                                var target_expr = new Compiler.RuntimeValueExpression (target, ctx.ImportType (target.LimitType));
-                               expr = new Compiler.CompoundAssign (oper, target_expr, right, left, Compiler.Location.Null);
+                               expr = new Compiler.CompoundAssign (oper, target_expr, right, left);
                        } else {
                                expr = new Compiler.Binary (oper, left, right, Compiler.Location.Null);
                        }
index 664cdf0cf8035c7b082ab18d0901a79db722c22d..9b83bf3bed9be0160004302851d1e50d9c2d462d 100644 (file)
@@ -53,7 +53,7 @@ namespace Mono.CompilerServices.SymbolWriter
                }
        }
 
-       internal class MyBinaryWriter : BinaryWriter
+       sealed class MyBinaryWriter : BinaryWriter
        {
                public MyBinaryWriter (Stream stream)
                        : base (stream)
index c9beaa0d4388f7f48aefa0d887537b88e1f4a0a7..0e093ab375007f965e0b1a6d0a9ff79c0521f4d3 100644 (file)
@@ -183,6 +183,7 @@ namespace Mono.CompilerServices.SymbolWriter
        {
                #region This is actually written to the symbol file
                public readonly int Row;
+               public int Column;
                public readonly int File;
                public readonly int Offset;
                public readonly bool IsHidden;  // Obsolete is never used
@@ -195,28 +196,35 @@ namespace Mono.CompilerServices.SymbolWriter
                        public int Compare (LineNumberEntry l1, LineNumberEntry l2)
                        {
                                return l1.Row == l2.Row ?
-                                       l1.Offset.CompareTo (l2.Offset) :
+                                       l1.Column.CompareTo (l2.Column) :
                                        l1.Row.CompareTo (l2.Row);
                        }
                }
 
-               public static readonly LineNumberEntry Null = new LineNumberEntry (0, 0, 0);
+               public static readonly LineNumberEntry Null = new LineNumberEntry (0, 0, 0, 0);
+
+               public LineNumberEntry (int file, int row, int column, int offset)
+                       : this (file, row, offset, column, false)
+               {
+               }
 
                public LineNumberEntry (int file, int row, int offset)
-                       : this (file, row, offset, false)
-               { }
+                       : this (file, row, -1, offset, false)
+               {
+               }
 
-               public LineNumberEntry (int file, int row, int offset, bool is_hidden)
+               public LineNumberEntry (int file, int row, int column, int offset, bool is_hidden)
                {
                        this.File = file;
                        this.Row = row;
+                       this.Column = column;
                        this.Offset = offset;
                        this.IsHidden = is_hidden;
                }
 
                public override string ToString ()
                {
-                       return String.Format ("[Line {0}:{1}:{2}]", File, Row, Offset);
+                       return String.Format ("[Line {0}:{1,2}:{3}]", File, Row, Column, Offset);
                }
        }
 
@@ -791,7 +799,6 @@ namespace Mono.CompilerServices.SymbolWriter
                public const int Default_LineRange = 8;
                public const byte Default_OpcodeBase = 9;
 
-               public const bool SuppressDuplicates = true;
 #endregion
 
                public const byte DW_LNS_copy = 1;
@@ -822,7 +829,7 @@ namespace Mono.CompilerServices.SymbolWriter
                        this._line_numbers = lines;
                }
 
-               internal void Write (MonoSymbolFile file, MyBinaryWriter bw)
+               internal void Write (MonoSymbolFile file, MyBinaryWriter bw, bool readColumnsInfo)
                {
                        int start = (int) bw.BaseStream.Position;
 
@@ -832,11 +839,6 @@ namespace Mono.CompilerServices.SymbolWriter
                                int line_inc = LineNumbers [i].Row - last_line;
                                int offset_inc = LineNumbers [i].Offset - last_offset;
 
-                               if (SuppressDuplicates && (i+1 < LineNumbers.Length)) {
-                                       if (LineNumbers [i+1].Equals (LineNumbers [i]))
-                                               continue;
-                               }
-
                                if (LineNumbers [i].File != last_file) {
                                        bw.Write (DW_LNS_set_file);
                                        bw.WriteLeb128 (LineNumbers [i].File);
@@ -884,17 +886,23 @@ namespace Mono.CompilerServices.SymbolWriter
                        bw.Write ((byte) 1);
                        bw.Write (DW_LNE_end_sequence);
 
+                       for (int i = 0; i < LineNumbers.Length; i++) {
+                               var ln = LineNumbers [i];
+                               if (ln.Row >= 0)
+                                       bw.WriteLeb128 (ln.Column);
+                       }
+
                        file.ExtendedLineNumberSize += (int) bw.BaseStream.Position - start;
                }
 
-               internal static LineNumberTable Read (MonoSymbolFile file, MyBinaryReader br)
+               internal static LineNumberTable Read (MonoSymbolFile file, MyBinaryReader br, bool readColumnsInfo)
                {
                        LineNumberTable lnt = new LineNumberTable (file);
-                       lnt.DoRead (file, br);
+                       lnt.DoRead (file, br, readColumnsInfo);
                        return lnt;
                }
 
-               void DoRead (MonoSymbolFile file, MyBinaryReader br)
+               void DoRead (MonoSymbolFile file, MyBinaryReader br, bool includesColumns)
                {
                        var lines = new List<LineNumberEntry> ();
 
@@ -911,7 +919,7 @@ namespace Mono.CompilerServices.SymbolWriter
                                        if (opcode == DW_LNE_end_sequence) {
                                                if (modified)
                                                        lines.Add (new LineNumberEntry (
-                                                               stm_file, stm_line, stm_offset, is_hidden));
+                                                               stm_file, stm_line, -1, stm_offset, is_hidden));
                                                break;
                                        } else if (opcode == DW_LNE_MONO_negate_is_hidden) {
                                                is_hidden = !is_hidden;
@@ -929,7 +937,7 @@ namespace Mono.CompilerServices.SymbolWriter
                                        switch (opcode) {
                                        case DW_LNS_copy:
                                                lines.Add (new LineNumberEntry (
-                                                       stm_file, stm_line, stm_offset, is_hidden));
+                                                       stm_file, stm_line, -1, stm_offset, is_hidden));
                                                modified = false;
                                                break;
                                        case DW_LNS_advance_pc:
@@ -959,13 +967,20 @@ namespace Mono.CompilerServices.SymbolWriter
                                        stm_offset += opcode / LineRange;
                                        stm_line += LineBase + (opcode % LineRange);
                                        lines.Add (new LineNumberEntry (
-                                               stm_file, stm_line, stm_offset, is_hidden));
+                                               stm_file, stm_line, -1, stm_offset, is_hidden));
                                        modified = false;
                                }
                        }
 
-                       _line_numbers = new LineNumberEntry [lines.Count];
-                       lines.CopyTo (_line_numbers, 0);
+                       _line_numbers = lines.ToArray ();
+
+                       if (includesColumns) {
+                               for (int i = 0; i < _line_numbers.Length; ++i) {
+                                       var ln = _line_numbers[i];
+                                       if (ln.Row >= 0)
+                                               ln.Column = br.ReadLeb128 ();
+                               }
+                       }
                }
 
                public bool GetMethodBounds (out LineNumberEntry start, out LineNumberEntry end)
@@ -1022,7 +1037,8 @@ namespace Mono.CompilerServices.SymbolWriter
                [Flags]
                public enum Flags
                {
-                       LocalNamesAmbiguous     = 1
+                       LocalNamesAmbiguous     = 1,
+                       ColumnsInfoIncluded = 1 << 1
                }
 
                public const int Size = 12;
@@ -1176,7 +1192,7 @@ namespace Mono.CompilerServices.SymbolWriter
                        }
 
                        LineNumberTableOffset = (int) bw.BaseStream.Position;
-                       lnt.Write (file, bw);
+                       lnt.Write (file, bw, (flags & Flags.ColumnsInfoIncluded) != 0);
 
                        DataOffset = (int) bw.BaseStream.Position;
 
@@ -1204,7 +1220,7 @@ namespace Mono.CompilerServices.SymbolWriter
                                long old_pos = reader.BaseStream.Position;
                                reader.BaseStream.Position = LineNumberTableOffset;
 
-                               lnt = LineNumberTable.Read (SymbolFile, reader);
+                               lnt = LineNumberTable.Read (SymbolFile, reader, (flags & Flags.ColumnsInfoIncluded) != 0);
 
                                reader.BaseStream.Position = old_pos;
                                return lnt;
index 1ff399cdcd9fb171b29500f0d02770ff9deda2fc..b45bf8a1fb54d430a31c4c40001db0feff26d40f 100644 (file)
@@ -64,7 +64,7 @@ namespace Mono.CompilerServices.SymbolWriter
                public void MarkSequencePoint (int offset, SourceFileEntry file, int line, int column, bool is_hidden)
                {
                        int file_idx = file != null ? file.Index : 0;
-                       var lne = new LineNumberEntry (file_idx, line, offset, is_hidden);
+                       var lne = new LineNumberEntry (file_idx, line, column, offset, is_hidden);
 
                        if (method_lines.Count > 0) {
                                var prev = method_lines[method_lines.Count - 1];
@@ -185,7 +185,7 @@ namespace Mono.CompilerServices.SymbolWriter
                {
                        MethodEntry entry = new MethodEntry (
                                file, _comp_unit.Entry, token, ScopeVariables,
-                               Locals, method_lines.ToArray (), Blocks, null, 0, ns_id);
+                               Locals, method_lines.ToArray (), Blocks, null, MethodEntry.Flags.ColumnsInfoIncluded, ns_id);
 
                        file.AddMethod (entry);
                }
index 0b7a645c46140a6ff2aa97c978754c8d0fd0f954..0b2e4532e8a26d8cb351ad3398a4c4542aad257c 100644 (file)
@@ -815,7 +815,7 @@ namespace Mono.CSharp {
                sealed class HoistedFieldAssign : CompilerAssign
                {
                        public HoistedFieldAssign (Expression target, Expression source)
-                               : base (target, source, source.Location)
+                               : base (target, source, target.Location)
                        {
                        }
 
@@ -2100,19 +2100,19 @@ namespace Mono.CSharp {
                        var hash_variable = new LocalVariableReference (li_hash, loc);
                        hashcode_block.AddStatement (new StatementExpression (
                                new CompoundAssign (Binary.Operator.Addition, hash_variable,
-                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 13, loc), loc), loc)));
+                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 13, loc), loc))));
                        hashcode_block.AddStatement (new StatementExpression (
                                new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
-                                       new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 7, loc), loc), loc)));
+                                       new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 7, loc), loc))));
                        hashcode_block.AddStatement (new StatementExpression (
                                new CompoundAssign (Binary.Operator.Addition, hash_variable,
-                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 3, loc), loc), loc)));
+                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 3, loc), loc))));
                        hashcode_block.AddStatement (new StatementExpression (
                                new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
-                                       new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 17, loc), loc), loc)));
+                                       new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 17, loc), loc))));
                        hashcode_block.AddStatement (new StatementExpression (
                                new CompoundAssign (Binary.Operator.Addition, hash_variable,
-                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 5, loc), loc), loc)));
+                                       new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (Compiler.BuiltinTypes, 5, loc), loc))));
 
                        hashcode_block.AddStatement (new Return (hash_variable, loc));
                        hashcode.Block = hashcode_top;
index 1822ac65eeaa239b90d8de0cb3fa6151b3313b41..e91479ffd92e88d12e05a96fcceb370a8703d686 100644 (file)
@@ -538,11 +538,11 @@ namespace Mono.CSharp {
                ExpressionStatement resolved;
                IMemberContext mc;
 
-               public FieldInitializer (FieldSpec spec, Expression expression, IMemberContext mc)
-                       : base (new FieldExpr (spec, expression.Location), expression, expression.Location)
+               public FieldInitializer (FieldBase mc, Expression expression, Location loc)
+                       : base (new FieldExpr (mc.Spec, expression.Location), expression, loc)
                {
                        this.mc = mc;
-                       if (!spec.IsStatic)
+                       if (!mc.IsStatic)
                                ((FieldExpr)target).InstanceExpression = new CompilerGeneratedThis (mc.CurrentType, expression.Location);
                }
 
@@ -649,15 +649,15 @@ namespace Mono.CSharp {
                Expression right;
                Expression left;
 
-               public CompoundAssign (Binary.Operator op, Expression target, Expression source, Location loc)
-                       : base (target, source, loc)
+               public CompoundAssign (Binary.Operator op, Expression target, Expression source)
+                       : base (target, source, target.Location)
                {
                        right = source;
                        this.op = op;
                }
 
-               public CompoundAssign (Binary.Operator op, Expression target, Expression source, Expression left, Location loc)
-                       : this (op, target, source, loc)
+               public CompoundAssign (Binary.Operator op, Expression target, Expression source, Expression left)
+                       : this (op, target, source)
                {
                        this.left = left;
                }
index 67f11eb90de5a6288337a8e2a58f134f23eb6d7c..47ae75708707c7a4c2382dd7a420ad715df79453 100644 (file)
@@ -221,7 +221,9 @@ namespace Mono.CSharp
                        //
                        // awaiter = expr.GetAwaiter ();
                        //
-                       fe_awaiter.EmitAssign (ec, expr, false, false);
+                       using (ec.With (BuilderContext.Options.OmitDebugInfo, true)) {
+                               fe_awaiter.EmitAssign (ec, expr, false, false);
+                       }
 
                        Label skip_continuation = ec.DefineLabel ();
 
index 883b0d2c23fe1efd45e1a5b61e4fe73317a3b251..7d149aae26ce24758c2c19e1f58d12f6e46468d8 100644 (file)
@@ -59,7 +59,7 @@ namespace Mono.CSharp {
 
                        if ((field_attr & FieldAttributes.InitOnly) != 0)
                                Parent.PartialContainer.RegisterFieldForInitialization (this,
-                                       new FieldInitializer (spec, initializer, this));
+                                       new FieldInitializer (this, initializer, Location));
 
                        if (declarators != null) {
                                var t = new TypeExpression (MemberType, TypeExpression.Location);
index 2e4b2f81c54f8e1d6dbf6da29b57482e0c565f99..8c5d3b26dec4e8e1f40acd8ce07e9ef9fc2af9e2 100644 (file)
@@ -4006,57 +4006,58 @@ conditional_expression
 assignment_expression
        : prefixed_unary_expression ASSIGN expression
          {
-               $$ = new SimpleAssign ((Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new SimpleAssign ((Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_MULT_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.Multiply, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.Multiply, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_DIV_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.Division, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.Division, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_MOD_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.Modulus, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.Modulus, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_ADD_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.Addition, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.Addition, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_SUB_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.Subtraction, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.Subtraction, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_SHIFT_LEFT_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.LeftShift, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.LeftShift, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_SHIFT_RIGHT_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.RightShift, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.RightShift, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_AND_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.BitwiseAnd, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.BitwiseAnd, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_OR_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.BitwiseOr, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.BitwiseOr, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        | prefixed_unary_expression OP_XOR_ASSIGN expression
          {
-               $$ = new CompoundAssign (
-                       Binary.Operator.ExclusiveOr, (Expression) $1, (Expression) $3, GetLocation ($2));
+               $$ = new CompoundAssign (Binary.Operator.ExclusiveOr, (Expression) $1, (Expression) $3);
+               lbag.AddLocation ($$, GetLocation ($2));
          }
        ;
 
@@ -5177,19 +5178,19 @@ while_statement
 do_statement
        : DO embedded_statement WHILE open_parens_any boolean_expression CLOSE_PARENS SEMICOLON
          {
-               $$ = new Do ((Statement) $2, (BooleanExpression) $5, GetLocation ($1));
+               $$ = new Do ((Statement) $2, (BooleanExpression) $5, GetLocation ($1), GetLocation ($3));
                lbag.AddStatement ($$, GetLocation ($3), GetLocation ($4), GetLocation ($6), GetLocation ($7));
          }
        | DO embedded_statement error
          {
                Error_SyntaxError (yyToken);
-               $$ = new Do ((Statement) $2, null, GetLocation ($1));
+               $$ = new Do ((Statement) $2, null, GetLocation ($1), Location.Null);
          }
        | DO embedded_statement WHILE open_parens_any boolean_expression error
          {
                Error_SyntaxError (yyToken);
          
-               $$ = new Do ((Statement) $2, (BooleanExpression) $5, GetLocation ($1));
+               $$ = new Do ((Statement) $2, (BooleanExpression) $5, GetLocation ($1), GetLocation ($3));
                lbag.AddStatement ($$, GetLocation ($3), GetLocation ($4));
          }
        ;
index e1cb5f19ac60993bce6fe3812cd788ad308e1f55..4df85131429f778d440fa3b31897c421653937bb 100644 (file)
@@ -5250,8 +5250,10 @@ namespace Mono.CSharp
                {
                        this.expr = expr;               
                        this.arguments = arguments;
-                       if (expr != null)
-                               loc = expr.Location;
+                       if (expr != null) {
+                               var ma = expr as MemberAccess;
+                               loc = ma != null ? ma.GetLeftExpressionLocation () : expr.Location;
+                       }
                }
 
                #region Properties
@@ -7896,6 +7898,18 @@ namespace Mono.CSharp
                                expr.Error_OperatorCannotBeApplied (rc, loc, ".", type);
                }
 
+               public Location GetLeftExpressionLocation ()
+               {
+                       Expression expr = LeftExpression;
+                       MemberAccess ma = expr as MemberAccess;
+                       while (ma != null && ma.LeftExpression != null) {
+                               expr = ma.LeftExpression;
+                               ma = expr as MemberAccess;
+                       }
+
+                       return expr == null ? Location : expr.Location;
+               }
+
                public static bool IsValidDotExpression (TypeSpec type)
                {
                        const MemberKind dot_kinds = MemberKind.Class | MemberKind.Struct | MemberKind.Delegate | MemberKind.Enum |
@@ -9400,7 +9414,7 @@ namespace Mono.CSharp
 
                        this.left = left;
                        this.spec = spec;
-                       this.loc = spec.Location;
+                       this.loc = left.Location;
                }
 
                public override TypeSpec ResolveAsType (IMemberContext ec)
index a311e0af0a08589651ff7e166bf4e9e8fdfec925..46ca117aa42d80d473808aa27124d603a9f60090 100644 (file)
@@ -636,13 +636,12 @@ namespace Mono.CSharp
                        }
 
                        if (initializer != null) {
-                               Parent.RegisterFieldForInitialization (this,
-                                       new FieldInitializer (spec, initializer, this));
+                               Parent.RegisterFieldForInitialization (this, new FieldInitializer (this, initializer, TypeExpression.Location));
                        }
 
                        if (declarators != null) {
-                               var t = new TypeExpression (MemberType, TypeExpression.Location);
                                foreach (var d in declarators) {
+                                       var t = new TypeExpression (MemberType, d.Name.Location);
                                        var f = new Field (Parent, t, ModFlags, new MemberName (d.Name.Value, d.Name.Location), OptAttributes);
                                        if (d.Initializer != null)
                                                f.initializer = d.Initializer;
index ba42c40b4ccd011c8bd83ba2c50f25fe3ad0f270..863f5556e88016bcc5dca7e8d496d13b0e533a8f 100644 (file)
@@ -947,7 +947,7 @@ namespace Mono.CSharp
                                        Location));
 
                                var body = new ExplicitBlock (block, Location, Location);
-                               block.AddStatement (new Do (body, cond, Location));
+                               block.AddStatement (new Do (body, cond, Location, Location));
 
                                body.AddStatement (new StatementExpression (
                                        new SimpleAssign (new LocalVariableReference (obj2, Location), new LocalVariableReference (obj1, Location))));
index d641189bf8ecfe3c480ad67078b4bf5e3555bd75..1556b5ca5fa9810e8b64554982fc1d4d21fd9677 100644 (file)
@@ -182,10 +182,8 @@ namespace Mono.CSharp {
                        StdLibRuntimeVersion = RuntimeVersion.v4;
                        WarningLevel = 4;
 
-                       if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-                               TabSize = 4;
-                       else
-                               TabSize = 8;
+                       // Default to 1 or mdb files would be platform speficic
+                       TabSize = 1;
 
                        AssemblyReferences = new List<string> ();
                        AssemblyReferencesAliases = new List<Tuple<string, string>> ();
index 4f4ff950a8f7c4e1157ed7495945cdedadac66dc..e918b3f2d2b554aa4d2d13339588892cd8edd769 100644 (file)
@@ -281,11 +281,16 @@ namespace Mono.CSharp {
                public Expression expr;
                public Statement  EmbeddedStatement;
 
-               public Do (Statement statement, BooleanExpression bool_expr, Location l)
+               public Do (Statement statement, BooleanExpression bool_expr, Location doLocation, Location whileLocation)
                {
                        expr = bool_expr;
                        EmbeddedStatement = statement;
-                       loc = l;
+                       loc = doLocation;
+                       WhileLocation = whileLocation;
+               }
+
+               public Location WhileLocation {
+                       get; private set;
                }
 
                public override bool Resolve (BlockContext ec)
@@ -332,7 +337,7 @@ namespace Mono.CSharp {
                        ec.MarkLabel (ec.LoopBegin);
 
                        // Mark start of while condition
-                       ec.Mark (expr.Location);
+                       ec.Mark (WhileLocation);
 
                        //
                        // Dead code elimination
@@ -461,7 +466,7 @@ namespace Mono.CSharp {
                        
                                ec.MarkLabel (ec.LoopBegin);
 
-                               ec.Mark (expr.Location);
+                               ec.Mark (loc);
                                expr.EmitBranchable (ec, while_loop, true);
                                
                                ec.MarkLabel (ec.LoopEnd);
@@ -5710,7 +5715,7 @@ namespace Mono.CSharp {
                        {
                                for (int i = declarators.Count - 1; i >= 0; --i) {
                                        var d = declarators [i];
-                                       var vd = new VariableDeclaration (d.Variable, type_expr.Location);
+                                       var vd = new VariableDeclaration (d.Variable, d.Variable.Location);
                                        vd.Initializer = d.Initializer;
                                        vd.IsNested = true;
                                        vd.dispose_call = CreateDisposeCall (bc, d.Variable);
@@ -5946,7 +5951,7 @@ namespace Mono.CSharp {
                                if (variable_ref == null)
                                        return false;
 
-                               for_each.body.AddScopeStatement (new StatementExpression (new CompilerAssign (variable_ref, access, Location.Null), for_each.variable.Location));
+                               for_each.body.AddScopeStatement (new StatementExpression (new CompilerAssign (variable_ref, access, Location.Null), for_each.type.Location));
 
                                bool ok = true;
 
@@ -6257,7 +6262,7 @@ namespace Mono.CSharp {
                                if (variable_ref == null)
                                        return false;
 
-                               for_each.body.AddScopeStatement (new StatementExpression (new CompilerAssign (variable_ref, current_pe, Location.Null), variable.Location));
+                               for_each.body.AddScopeStatement (new StatementExpression (new CompilerAssign (variable_ref, current_pe, Location.Null), for_each.type.Location));
 
                                var init = new Invocation (get_enumerator_mg, null);
 
index 6dca8238a8d75a2260d73f61f1dc07ad33dd88ba..6d3f12c18465e91e3ac857f651372a7092170454 100644 (file)
@@ -6,8 +6,8 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="4" file_ref="1" hidden="false" />
-        <entry il="0x1" row="5" file_ref="1" hidden="false" />
+        <entry il="0x0" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="5" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index b22032eb28c36c5b2c8b877ab6fdc91dede62d41..98ce07ad2ffb3c9745ff52129cb138ad52920c4e 100644 (file)
@@ -1,67 +1,68 @@
 ï»¿<?xml version="1.0" encoding="utf-8"?>
 <symbols>
   <files>
-    <file id="1" name="test-debug-02.cs" checksum="993e637543aa00430982a2409ade3dc4" />
+    <file id="1" name="test-debug-02.cs" checksum="7b1afc08446a7ea5fc1689915fbf7a22" />
   </files>
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="3" file_ref="1" hidden="false" />
-        <entry il="0x6" row="4" file_ref="1" hidden="false" />
-        <entry il="0x7" row="5" file_ref="1" hidden="false" />
+        <entry il="0x0" row="3" col="9" file_ref="1" hidden="false" />
+        <entry il="0x6" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x7" row="5" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="15" file_ref="1" hidden="false" />
-        <entry il="0x8" row="17" file_ref="1" hidden="false" />
-        <entry il="0xe" row="18" file_ref="1" hidden="false" />
-        <entry il="0xf" row="19" file_ref="1" hidden="false" />
+        <entry il="0x0" row="15" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="15" col="14" file_ref="1" hidden="false" />
+        <entry il="0x10" row="17" col="9" file_ref="1" hidden="false" />
+        <entry il="0x16" row="18" col="2" file_ref="1" hidden="false" />
+        <entry il="0x17" row="19" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="24" file_ref="1" hidden="false" />
-        <entry il="0x8" row="27" file_ref="1" hidden="false" />
-        <entry il="0xe" row="28" file_ref="1" hidden="false" />
-        <entry il="0xf" row="29" file_ref="1" hidden="false" />
+        <entry il="0x0" row="24" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="27" col="5" file_ref="1" hidden="false" />
+        <entry il="0xe" row="28" col="2" file_ref="1" hidden="false" />
+        <entry il="0xf" row="29" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="35" file_ref="1" hidden="false" />
-        <entry il="0x7" row="36" file_ref="1" hidden="false" />
-        <entry il="0x8" row="37" file_ref="1" hidden="false" />
+        <entry il="0x0" row="35" col="5" file_ref="1" hidden="false" />
+        <entry il="0x7" row="36" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="37" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000006">
       <sequencepoints>
-        <entry il="0x0" row="39" file_ref="1" hidden="false" />
-        <entry il="0x6" row="40" file_ref="1" hidden="false" />
-        <entry il="0x7" row="41" file_ref="1" hidden="false" />
+        <entry il="0x0" row="39" col="2" file_ref="1" hidden="false" />
+        <entry il="0x6" row="40" col="2" file_ref="1" hidden="false" />
+        <entry il="0x7" row="41" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="47" file_ref="1" hidden="false" />
-        <entry il="0x1" row="48" file_ref="1" hidden="false" />
+        <entry il="0x0" row="47" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="48" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 42bed427018af15d9970e214c6cbd8475edee327..67261a41deaad78772ebad7d0ce41eb43cba4df5 100644 (file)
@@ -12,7 +12,7 @@ class C1
 
 class C2
 {
-       int a = 55;
+       int a = 55, b = 33;
        
        public C2 ()
        {
index 2a7efc64850e3439bfee739859ef294507e45928..9cc8718343c79c8fee2075a6ab7ca452ea6eab0b 100644 (file)
@@ -6,8 +6,8 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="4" file_ref="1" hidden="false" />
-        <entry il="0x1" row="5" file_ref="1" hidden="false" />
+        <entry il="0x0" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="5" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="9" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="15" file_ref="1" hidden="false" />
-        <entry il="0x7" row="18" file_ref="1" hidden="false" />
-        <entry il="0x8" row="19" file_ref="1" hidden="false" />
+        <entry il="0x0" row="15" col="9" file_ref="1" hidden="false" />
+        <entry il="0x7" row="18" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="19" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -45,8 +45,8 @@
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="25" file_ref="1" hidden="false" />
-        <entry il="0x1" row="26" file_ref="1" hidden="false" />
+        <entry il="0x0" row="25" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="26" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index bf66fc2a71f0b2e967b500acc8ec762fe63145ef..114808d3dffa6b8d6a4b1dbb6ccc47574a08e1da 100644 (file)
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x8" row="9" file_ref="2" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="9" col="2" file_ref="2" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="12" file_ref="1" hidden="false" />
-        <entry il="0x8" row="14" file_ref="2" hidden="false" />
-        <entry il="0x10" row="14" file_ref="1" hidden="false" />
-        <entry il="0x16" row="15" file_ref="1" hidden="false" />
-        <entry il="0x17" row="16" file_ref="1" hidden="false" />
+        <entry il="0x0" row="12" col="2" file_ref="1" hidden="false" />
+        <entry il="0x8" row="14" col="2" file_ref="2" hidden="false" />
+        <entry il="0x10" row="14" col="2" file_ref="1" hidden="false" />
+        <entry il="0x16" row="15" col="2" file_ref="1" hidden="false" />
+        <entry il="0x17" row="16" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="22" file_ref="1" hidden="false" />
-        <entry il="0x1" row="23" file_ref="1" hidden="false" />
+        <entry il="0x0" row="22" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="23" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 749cca84757c6c88bc73a31053192e578e6586ed..0114c98f11855dbc94234bde93caf5d466e4e437 100644 (file)
@@ -7,10 +7,10 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="4" file_ref="1" hidden="false" />
-        <entry il="0x1" row="5" file_ref="1" hidden="false" />
-        <entry il="0x3" row="100" file_ref="2" hidden="false" />
-        <entry il="0x5" row="9" file_ref="1" hidden="false" />
+        <entry il="0x0" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="5" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="100" col="3" file_ref="2" hidden="false" />
+        <entry il="0x5" row="9" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
@@ -20,9 +20,9 @@
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="12" file_ref="1" hidden="false" />
-        <entry il="0x9" row="55" file_ref="1" hidden="false" />
-        <entry il="0xb" row="56" file_ref="1" hidden="false" />
+        <entry il="0x0" row="12" col="2" file_ref="1" hidden="false" />
+        <entry il="0x9" row="55" col="3" file_ref="1" hidden="false" />
+        <entry il="0xb" row="56" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="x" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="59" file_ref="1" hidden="false" />
-        <entry il="0x1" row="60" file_ref="1" hidden="false" />
-        <entry il="0xd" row="29" file_ref="1" hidden="false" />
-        <entry il="0x12" row="30" file_ref="1" hidden="false" />
+        <entry il="0x0" row="59" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="60" col="3" file_ref="1" hidden="false" />
+        <entry il="0xd" row="29" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="30" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="s1" il_index="0" scope_ref="0" />
index 9a12c73719992734f0da8d3c54d6a41ce283606d..9714fb693d75052d70df726075d3e98c3bc77c4f 100644 (file)
@@ -6,21 +6,21 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="6" file_ref="1" hidden="false" />
-        <entry il="0x1" row="7" file_ref="1" hidden="false" />
+        <entry il="0x0" row="6" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="7" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="12" file_ref="1" hidden="false" />
-        <entry il="0x2" row="13" file_ref="1" hidden="false" />
-        <entry il="0x3" row="14" file_ref="1" hidden="false" />
-        <entry il="0x9" row="15" file_ref="1" hidden="false" />
-        <entry il="0xa" row="16" file_ref="1" hidden="false" />
-        <entry il="0x10" row="17" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="12" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="13" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="14" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="15" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="16" col="3" file_ref="1" hidden="false" />
+        <entry il="0x10" row="17" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
-        <entry il="0x1" row="22" file_ref="1" hidden="false" />
-        <entry il="0x2" row="23" file_ref="1" hidden="false" />
-        <entry il="0x3" row="24" file_ref="1" hidden="false" />
-        <entry il="0x9" row="25" file_ref="1" hidden="false" />
-        <entry il="0xa" row="26" file_ref="1" hidden="false" />
-        <entry il="0xc" row="27" file_ref="1" hidden="false" />
-        <entry il="0x12" row="28" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="22" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="23" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="24" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="25" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="26" col="4" file_ref="1" hidden="false" />
+        <entry il="0xc" row="27" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="28" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="e" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="31" file_ref="1" hidden="false" />
-        <entry il="0x1" row="33" file_ref="1" hidden="false" />
-        <entry il="0x2" row="34" file_ref="1" hidden="false" />
-        <entry il="0x3" row="35" file_ref="1" hidden="false" />
-        <entry il="0x9" row="36" file_ref="1" hidden="false" />
-        <entry il="0xa" row="37" file_ref="1" hidden="false" />
-        <entry il="0xc" row="38" file_ref="1" hidden="false" />
-        <entry il="0xd" row="39" file_ref="1" hidden="false" />
-        <entry il="0x13" row="40" file_ref="1" hidden="false" />
-        <entry il="0x14" row="41" file_ref="1" hidden="false" />
-        <entry il="0x19" row="43" file_ref="1" hidden="false" />
+        <entry il="0x0" row="31" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="33" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="34" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="35" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="36" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="37" col="4" file_ref="1" hidden="false" />
+        <entry il="0xc" row="38" col="3" file_ref="1" hidden="false" />
+        <entry il="0xd" row="39" col="3" file_ref="1" hidden="false" />
+        <entry il="0x13" row="40" col="3" file_ref="1" hidden="false" />
+        <entry il="0x14" row="41" col="4" file_ref="1" hidden="false" />
+        <entry il="0x19" row="43" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="e" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="46" file_ref="1" hidden="false" />
-        <entry il="0x1" row="48" file_ref="1" hidden="false" />
-        <entry il="0x2" row="49" file_ref="1" hidden="false" />
-        <entry il="0x8" row="51" file_ref="1" hidden="false" />
-        <entry il="0x9" row="52" file_ref="1" hidden="false" />
-        <entry il="0xb" row="53" file_ref="1" hidden="false" />
+        <entry il="0x0" row="46" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="48" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="49" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="51" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="52" col="3" file_ref="1" hidden="false" />
+        <entry il="0xb" row="53" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000006">
       <sequencepoints>
-        <entry il="0x0" row="56" file_ref="1" hidden="false" />
-        <entry il="0x1" row="58" file_ref="1" hidden="false" />
-        <entry il="0x2" row="59" file_ref="1" hidden="false" />
-        <entry il="0x3" row="60" file_ref="1" hidden="false" />
-        <entry il="0x9" row="61" file_ref="1" hidden="false" />
-        <entry il="0xa" row="62" file_ref="1" hidden="false" />
-        <entry il="0xc" row="63" file_ref="1" hidden="false" />
-        <entry il="0x12" row="65" file_ref="1" hidden="false" />
-        <entry il="0x13" row="66" file_ref="1" hidden="false" />
-        <entry il="0x15" row="67" file_ref="1" hidden="false" />
+        <entry il="0x0" row="56" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="58" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="59" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="60" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="61" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="62" col="4" file_ref="1" hidden="false" />
+        <entry il="0xc" row="63" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="65" col="3" file_ref="1" hidden="false" />
+        <entry il="0x13" row="66" col="3" file_ref="1" hidden="false" />
+        <entry il="0x15" row="67" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="e" il_index="0" scope_ref="0" />
index be8726614cc17c09cc9424c5eae661580462e964..faccf800550c039fb658de3977c664a1346a30a2 100644 (file)
@@ -6,29 +6,29 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="4" file_ref="1" hidden="false" />
-        <entry il="0x1" row="5" file_ref="1" hidden="false" />
-        <entry il="0x6" row="6" file_ref="1" hidden="false" />
+        <entry il="0x0" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="5" col="3" file_ref="1" hidden="false" />
+        <entry il="0x6" row="6" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="9" file_ref="1" hidden="false" />
-        <entry il="0x1" row="10" file_ref="1" hidden="false" />
-        <entry il="0x8" row="11" file_ref="1" hidden="false" />
+        <entry il="0x0" row="9" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="10" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="11" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="14" file_ref="1" hidden="false" />
-        <entry il="0x1" row="15" file_ref="1" hidden="false" />
-        <entry il="0x2" row="16" file_ref="1" hidden="false" />
-        <entry il="0x3" row="17" file_ref="1" hidden="false" />
-        <entry il="0xa" row="20" file_ref="1" hidden="false" />
+        <entry il="0x0" row="14" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="15" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="16" col="4" file_ref="1" hidden="false" />
+        <entry il="0x3" row="17" col="5" file_ref="1" hidden="false" />
+        <entry il="0xa" row="20" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
index 25b2331626753cc0345d76f12643fa0c6a608ed3..c8083e9c1fd778b82e7ade18c0d734eea82e2f83 100644 (file)
@@ -6,7 +6,7 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="16" file_ref="1" hidden="false" />
+        <entry il="0x0" row="16" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="23" file_ref="1" hidden="false" />
+        <entry il="0x0" row="23" col="5" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
index 5429a7fb6031bedffda6453b277d79373dbd62ad..42d40c79d4b0a8500bc0e9518232feb507a8198f 100644 (file)
@@ -16,8 +16,8 @@
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="12" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="12" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index c304d8196258b822437f3d604848545b720a0439..925bc0314519928b24c1f8005eaf34ce06997c8d 100644 (file)
@@ -6,40 +6,40 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="4" file_ref="1" hidden="false" />
-        <entry il="0x1" row="5" file_ref="1" hidden="false" />
-        <entry il="0x7" row="6" file_ref="1" hidden="false" />
+        <entry il="0x0" row="4" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="5" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="6" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="11" file_ref="1" hidden="false" />
-        <entry il="0x8" row="12" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="7" file_ref="1" hidden="false" />
+        <entry il="0x1" row="11" col="4" file_ref="1" hidden="false" />
+        <entry il="0x8" row="12" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="14" file_ref="1" hidden="false" />
-        <entry il="0x1" row="15" file_ref="1" hidden="false" />
+        <entry il="0x0" row="14" col="7" file_ref="1" hidden="false" />
+        <entry il="0x1" row="15" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="21" file_ref="1" hidden="false" />
+        <entry il="0x0" row="21" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 6b19d483301dd1d2c58ec165e38d7c1d50b2d3fb..e4f3be31dc740fa03e421857f9b55f00978d709a 100644 (file)
@@ -6,37 +6,37 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="8" file_ref="1" hidden="false" />
-        <entry il="0x1" row="9" file_ref="1" hidden="false" />
+        <entry il="0x0" row="8" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="9" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="12" file_ref="1" hidden="false" />
-        <entry il="0x1" row="13" file_ref="1" hidden="false" />
-        <entry il="0x6" row="13" file_ref="1" hidden="false" />
-        <entry il="0x16" row="14" file_ref="1" hidden="false" />
+        <entry il="0x0" row="12" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="13" col="3" file_ref="1" hidden="false" />
+        <entry il="0x6" row="13" col="26" file_ref="1" hidden="false" />
+        <entry il="0x16" row="14" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
-        <entry il="0x1" row="21" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="21" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="24" file_ref="1" hidden="false" />
-        <entry il="0x1" row="25" file_ref="1" hidden="false" />
-        <entry il="0x9" row="26" file_ref="1" hidden="false" />
-        <entry il="0xa" row="27" file_ref="1" hidden="false" />
-        <entry il="0x1e" row="28" file_ref="1" hidden="false" />
+        <entry il="0x0" row="24" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="25" col="10" file_ref="1" hidden="false" />
+        <entry il="0x9" row="26" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="27" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1e" row="28" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="s" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="31" file_ref="1" hidden="false" />
-        <entry il="0x1" row="32" file_ref="1" hidden="false" />
-        <entry il="0x9" row="32" file_ref="1" hidden="false" />
-        <entry il="0x11" row="33" file_ref="1" hidden="false" />
-        <entry il="0x12" row="34" file_ref="1" hidden="false" />
-        <entry il="0x39" row="35" file_ref="1" hidden="false" />
+        <entry il="0x0" row="31" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="32" col="10" file_ref="1" hidden="false" />
+        <entry il="0x9" row="32" col="26" file_ref="1" hidden="false" />
+        <entry il="0x11" row="33" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="34" col="3" file_ref="1" hidden="false" />
+        <entry il="0x39" row="35" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="s" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000006">
       <sequencepoints>
-        <entry il="0x0" row="38" file_ref="1" hidden="false" />
-        <entry il="0x1" row="39" file_ref="1" hidden="false" />
-        <entry il="0x10" row="40" file_ref="1" hidden="false" />
-        <entry il="0x11" row="41" file_ref="1" hidden="false" />
-        <entry il="0x34" row="42" file_ref="1" hidden="false" />
+        <entry il="0x0" row="38" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="39" col="10" file_ref="1" hidden="false" />
+        <entry il="0x10" row="40" col="3" file_ref="1" hidden="false" />
+        <entry il="0x11" row="41" col="3" file_ref="1" hidden="false" />
+        <entry il="0x34" row="42" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="s" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="45" file_ref="1" hidden="false" />
-        <entry il="0x1" row="46" file_ref="1" hidden="false" />
-        <entry il="0x7" row="47" file_ref="1" hidden="false" />
-        <entry il="0x8" row="48" file_ref="1" hidden="false" />
-        <entry il="0x12" row="49" file_ref="1" hidden="false" />
-        <entry il="0x25" row="50" file_ref="1" hidden="false" />
+        <entry il="0x0" row="45" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="46" col="10" file_ref="1" hidden="false" />
+        <entry il="0x7" row="47" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="48" col="4" file_ref="1" hidden="false" />
+        <entry il="0x12" row="49" col="3" file_ref="1" hidden="false" />
+        <entry il="0x25" row="50" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="ms" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="53" file_ref="1" hidden="false" />
-        <entry il="0x1" row="54" file_ref="1" hidden="false" />
-        <entry il="0xd" row="55" file_ref="1" hidden="false" />
-        <entry il="0xe" row="56" file_ref="1" hidden="false" />
-        <entry il="0x1e" row="57" file_ref="1" hidden="false" />
+        <entry il="0x0" row="53" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="54" col="3" file_ref="1" hidden="false" />
+        <entry il="0xd" row="55" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="56" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1e" row="57" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000009">
       <sequencepoints>
-        <entry il="0x0" row="60" file_ref="1" hidden="false" />
-        <entry il="0x1" row="61" file_ref="1" hidden="false" />
-        <entry il="0xd" row="62" file_ref="1" hidden="false" />
-        <entry il="0xe" row="63" file_ref="1" hidden="false" />
-        <entry il="0x1d" row="65" file_ref="1" hidden="false" />
+        <entry il="0x0" row="60" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="61" col="3" file_ref="1" hidden="false" />
+        <entry il="0xd" row="62" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="63" col="4" file_ref="1" hidden="false" />
+        <entry il="0x1d" row="65" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x600000a">
       <sequencepoints>
-        <entry il="0x0" row="68" file_ref="1" hidden="false" />
-        <entry il="0x1" row="70" file_ref="1" hidden="false" />
-        <entry il="0x23" row="72" file_ref="1" hidden="false" />
-        <entry il="0x28" row="74" file_ref="1" hidden="false" />
-        <entry il="0x29" row="75" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="78" file_ref="1" hidden="false" />
-        <entry il="0x33" row="81" file_ref="1" hidden="false" />
-        <entry il="0x38" row="83" file_ref="1" hidden="false" />
-        <entry il="0x3d" row="85" file_ref="1" hidden="false" />
+        <entry il="0x0" row="68" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="70" col="3" file_ref="1" hidden="false" />
+        <entry il="0x23" row="72" col="5" file_ref="1" hidden="false" />
+        <entry il="0x28" row="74" col="4" file_ref="1" hidden="false" />
+        <entry il="0x29" row="75" col="5" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="78" col="5" file_ref="1" hidden="false" />
+        <entry il="0x33" row="81" col="5" file_ref="1" hidden="false" />
+        <entry il="0x38" row="83" col="5" file_ref="1" hidden="false" />
+        <entry il="0x3d" row="85" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x600000b">
       <sequencepoints>
-        <entry il="0x0" row="88" file_ref="1" hidden="false" />
-        <entry il="0x1" row="90" file_ref="1" hidden="false" />
-        <entry il="0x29" row="92" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="94" file_ref="1" hidden="false" />
-        <entry il="0x2f" row="95" file_ref="1" hidden="false" />
-        <entry il="0x34" row="98" file_ref="1" hidden="false" />
-        <entry il="0x39" row="100" file_ref="1" hidden="false" />
+        <entry il="0x0" row="88" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="90" col="3" file_ref="1" hidden="false" />
+        <entry il="0x29" row="92" col="5" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="94" col="4" file_ref="1" hidden="false" />
+        <entry il="0x2f" row="95" col="5" file_ref="1" hidden="false" />
+        <entry il="0x34" row="98" col="5" file_ref="1" hidden="false" />
+        <entry il="0x39" row="100" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x600000c">
       <sequencepoints>
-        <entry il="0x0" row="103" file_ref="1" hidden="false" />
-        <entry il="0x1" row="105" file_ref="1" hidden="false" />
-        <entry il="0xb0" row="107" file_ref="1" hidden="false" />
-        <entry il="0xb5" row="109" file_ref="1" hidden="false" />
-        <entry il="0xb6" row="110" file_ref="1" hidden="false" />
-        <entry il="0xbb" row="114" file_ref="1" hidden="false" />
-        <entry il="0xc0" row="116" file_ref="1" hidden="false" />
-        <entry il="0xc5" row="120" file_ref="1" hidden="false" />
-        <entry il="0xca" row="122" file_ref="1" hidden="false" />
-        <entry il="0xcf" row="124" file_ref="1" hidden="false" />
+        <entry il="0x0" row="103" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="105" col="3" file_ref="1" hidden="false" />
+        <entry il="0xb0" row="107" col="5" file_ref="1" hidden="false" />
+        <entry il="0xb5" row="109" col="4" file_ref="1" hidden="false" />
+        <entry il="0xb6" row="110" col="5" file_ref="1" hidden="false" />
+        <entry il="0xbb" row="114" col="5" file_ref="1" hidden="false" />
+        <entry il="0xc0" row="116" col="5" file_ref="1" hidden="false" />
+        <entry il="0xc5" row="120" col="5" file_ref="1" hidden="false" />
+        <entry il="0xca" row="122" col="5" file_ref="1" hidden="false" />
+        <entry il="0xcf" row="124" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x600000d">
       <sequencepoints>
-        <entry il="0x0" row="127" file_ref="1" hidden="false" />
-        <entry il="0x1" row="129" file_ref="1" hidden="false" />
-        <entry il="0x12" row="131" file_ref="1" hidden="false" />
-        <entry il="0x2c" row="133" file_ref="1" hidden="false" />
-        <entry il="0x36" row="135" file_ref="1" hidden="false" />
-        <entry il="0x3b" row="137" file_ref="1" hidden="false" />
+        <entry il="0x0" row="127" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="129" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="131" col="5" file_ref="1" hidden="false" />
+        <entry il="0x2c" row="133" col="5" file_ref="1" hidden="false" />
+        <entry il="0x36" row="135" col="5" file_ref="1" hidden="false" />
+        <entry il="0x3b" row="137" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x600000e">
       <sequencepoints>
-        <entry il="0x0" row="140" file_ref="1" hidden="false" />
-        <entry il="0x1" row="142" file_ref="1" hidden="false" />
-        <entry il="0x2" row="143" file_ref="1" hidden="false" />
-        <entry il="0x4" row="144" file_ref="1" hidden="false" />
-        <entry il="0x5" row="147" file_ref="1" hidden="false" />
-        <entry il="0x6" row="148" file_ref="1" hidden="false" />
-        <entry il="0x8" row="149" file_ref="1" hidden="false" />
-        <entry il="0x9" row="150" file_ref="1" hidden="false" />
+        <entry il="0x0" row="140" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="142" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="143" col="4" file_ref="1" hidden="false" />
+        <entry il="0x4" row="144" col="3" file_ref="1" hidden="false" />
+        <entry il="0x5" row="147" col="3" file_ref="1" hidden="false" />
+        <entry il="0x6" row="148" col="4" file_ref="1" hidden="false" />
+        <entry il="0x8" row="149" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="150" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="1" />
     </method>
     <method token="0x600000f">
       <sequencepoints>
-        <entry il="0x0" row="153" file_ref="1" hidden="false" />
-        <entry il="0x1" row="155" file_ref="1" hidden="false" />
-        <entry il="0x2" row="156" file_ref="1" hidden="false" />
-        <entry il="0x3" row="157" file_ref="1" hidden="false" />
-        <entry il="0x9" row="159" file_ref="1" hidden="false" />
-        <entry il="0xe" row="160" file_ref="1" hidden="false" />
-        <entry il="0xf" row="161" file_ref="1" hidden="false" />
-        <entry il="0x10" row="159" file_ref="1" hidden="false" />
-        <entry il="0x17" row="162" file_ref="1" hidden="false" />
+        <entry il="0x0" row="153" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="155" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="156" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="157" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="159" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="160" col="3" file_ref="1" hidden="false" />
+        <entry il="0xf" row="161" col="3" file_ref="1" hidden="false" />
+        <entry il="0x10" row="159" col="3" file_ref="1" hidden="false" />
+        <entry il="0x17" row="162" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000010">
       <sequencepoints>
-        <entry il="0x0" row="165" file_ref="1" hidden="false" />
-        <entry il="0x1" row="167" file_ref="1" hidden="false" />
-        <entry il="0x2" row="168" file_ref="1" hidden="false" />
-        <entry il="0x4" row="169" file_ref="1" hidden="false" />
-        <entry il="0x5" row="170" file_ref="1" hidden="false" />
+        <entry il="0x0" row="165" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="167" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="168" col="4" file_ref="1" hidden="false" />
+        <entry il="0x4" row="169" col="3" file_ref="1" hidden="false" />
+        <entry il="0x5" row="170" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000011">
       <sequencepoints>
-        <entry il="0x0" row="174" file_ref="1" hidden="false" />
-        <entry il="0x1" row="175" file_ref="1" hidden="false" />
-        <entry il="0x2" row="176" file_ref="1" hidden="false" />
-        <entry il="0x3" row="177" file_ref="1" hidden="false" />
-        <entry il="0xd" row="178" file_ref="1" hidden="false" />
+        <entry il="0x0" row="174" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="175" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="176" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3" row="177" col="4" file_ref="1" hidden="false" />
+        <entry il="0xd" row="178" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000012">
       <sequencepoints>
-        <entry il="0x0" row="182" file_ref="1" hidden="false" />
-        <entry il="0x1" row="183" file_ref="1" hidden="false" />
-        <entry il="0x11" row="184" file_ref="1" hidden="false" />
-        <entry il="0x12" row="185" file_ref="1" hidden="false" />
-        <entry il="0x18" row="187" file_ref="1" hidden="false" />
-        <entry il="0x19" row="188" file_ref="1" hidden="false" />
-        <entry il="0x1a" row="189" file_ref="1" hidden="false" />
+        <entry il="0x0" row="182" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="183" col="3" file_ref="1" hidden="false" />
+        <entry il="0x11" row="184" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="185" col="3" file_ref="1" hidden="false" />
+        <entry il="0x18" row="187" col="3" file_ref="1" hidden="false" />
+        <entry il="0x19" row="188" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1a" row="189" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000013">
       <sequencepoints>
-        <entry il="0x0" row="192" file_ref="1" hidden="false" />
-        <entry il="0x1" row="193" file_ref="1" hidden="false" />
-        <entry il="0x11" row="194" file_ref="1" hidden="false" />
-        <entry il="0x12" row="195" file_ref="1" hidden="false" />
-        <entry il="0x18" row="196" file_ref="1" hidden="false" />
-        <entry il="0x28" row="197" file_ref="1" hidden="false" />
-        <entry il="0x29" row="198" file_ref="1" hidden="false" />
-        <entry il="0x2f" row="200" file_ref="1" hidden="false" />
-        <entry il="0x30" row="201" file_ref="1" hidden="false" />
-        <entry il="0x31" row="202" file_ref="1" hidden="false" />
+        <entry il="0x0" row="192" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="193" col="3" file_ref="1" hidden="false" />
+        <entry il="0x11" row="194" col="3" file_ref="1" hidden="false" />
+        <entry il="0x12" row="195" col="3" file_ref="1" hidden="false" />
+        <entry il="0x18" row="196" col="8" file_ref="1" hidden="false" />
+        <entry il="0x28" row="197" col="3" file_ref="1" hidden="false" />
+        <entry il="0x29" row="198" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2f" row="200" col="3" file_ref="1" hidden="false" />
+        <entry il="0x30" row="201" col="3" file_ref="1" hidden="false" />
+        <entry il="0x31" row="202" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000014">
       <sequencepoints>
-        <entry il="0x0" row="205" file_ref="1" hidden="false" />
-        <entry il="0x1" row="206" file_ref="1" hidden="false" />
-        <entry il="0x8" row="207" file_ref="1" hidden="false" />
-        <entry il="0x9" row="208" file_ref="1" hidden="false" />
-        <entry il="0xf" row="210" file_ref="1" hidden="false" />
-        <entry il="0x10" row="211" file_ref="1" hidden="false" />
-        <entry il="0x11" row="212" file_ref="1" hidden="false" />
+        <entry il="0x0" row="205" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="206" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="207" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="208" col="3" file_ref="1" hidden="false" />
+        <entry il="0xf" row="210" col="3" file_ref="1" hidden="false" />
+        <entry il="0x10" row="211" col="3" file_ref="1" hidden="false" />
+        <entry il="0x11" row="212" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
     </method>
     <method token="0x6000015">
       <sequencepoints>
-        <entry il="0x0" row="215" file_ref="1" hidden="false" />
-        <entry il="0x1" row="216" file_ref="1" hidden="false" />
-        <entry il="0x8" row="219" file_ref="1" hidden="false" />
-        <entry il="0x9" row="220" file_ref="1" hidden="false" />
-        <entry il="0xa" row="218" file_ref="1" hidden="false" />
-        <entry il="0xe" row="217" file_ref="1" hidden="false" />
-        <entry il="0x15" row="222" file_ref="1" hidden="false" />
-        <entry il="0x1a" row="225" file_ref="1" hidden="false" />
-        <entry il="0x1b" row="226" file_ref="1" hidden="false" />
+        <entry il="0x0" row="215" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="216" col="8" file_ref="1" hidden="false" />
+        <entry il="0x8" row="219" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="220" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa" row="218" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="217" col="5" file_ref="1" hidden="false" />
+        <entry il="0x15" row="222" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1a" row="225" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1b" row="226" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000016">
       <sequencepoints>
-        <entry il="0x0" row="230" file_ref="1" hidden="false" />
-        <entry il="0x1" row="231" file_ref="1" hidden="false" />
-        <entry il="0x8" row="232" file_ref="1" hidden="false" />
-        <entry il="0x9" row="233" file_ref="1" hidden="false" />
+        <entry il="0x0" row="230" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="231" col="8" file_ref="1" hidden="false" />
+        <entry il="0x8" row="232" col="3" file_ref="1" hidden="false" />
+        <entry il="0x9" row="233" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
     </method>
     <method token="0x6000017">
       <sequencepoints>
-        <entry il="0x0" row="237" file_ref="1" hidden="false" />
-        <entry il="0x1" row="238" file_ref="1" hidden="false" />
-        <entry il="0x2" row="240" file_ref="1" hidden="false" />
-        <entry il="0xb" row="239" file_ref="1" hidden="false" />
-        <entry il="0xf" row="241" file_ref="1" hidden="false" />
-        <entry il="0x10" row="242" file_ref="1" hidden="false" />
-        <entry il="0x11" row="240" file_ref="1" hidden="false" />
-        <entry il="0x1e" row="243" file_ref="1" hidden="false" />
+        <entry il="0x0" row="237" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="238" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="240" col="6" file_ref="1" hidden="false" />
+        <entry il="0xb" row="239" col="3" file_ref="1" hidden="false" />
+        <entry il="0xf" row="241" col="3" file_ref="1" hidden="false" />
+        <entry il="0x10" row="242" col="3" file_ref="1" hidden="false" />
+        <entry il="0x11" row="240" col="6" file_ref="1" hidden="false" />
+        <entry il="0x1e" row="243" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000018">
       <sequencepoints>
-        <entry il="0x0" row="246" file_ref="1" hidden="false" />
-        <entry il="0x1" row="247" file_ref="1" hidden="false" />
-        <entry il="0x2" row="250" file_ref="1" hidden="false" />
-        <entry il="0xe" row="248" file_ref="1" hidden="false" />
-        <entry il="0x16" row="251" file_ref="1" hidden="false" />
-        <entry il="0x17" row="252" file_ref="1" hidden="false" />
-        <entry il="0x18" row="250" file_ref="1" hidden="false" />
-        <entry il="0x37" row="253" file_ref="1" hidden="false" />
+        <entry il="0x0" row="246" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="247" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="250" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="248" col="4" file_ref="1" hidden="false" />
+        <entry il="0x16" row="251" col="3" file_ref="1" hidden="false" />
+        <entry il="0x17" row="252" col="3" file_ref="1" hidden="false" />
+        <entry il="0x37" row="253" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000019">
       <sequencepoints>
-        <entry il="0x0" row="256" file_ref="1" hidden="false" />
-        <entry il="0x1" row="257" file_ref="1" hidden="false" />
-        <entry il="0x2" row="260" file_ref="1" hidden="false" />
-        <entry il="0xf" row="258" file_ref="1" hidden="false" />
-        <entry il="0x16" row="261" file_ref="1" hidden="false" />
-        <entry il="0x17" row="262" file_ref="1" hidden="false" />
-        <entry il="0x18" row="260" file_ref="1" hidden="false" />
-        <entry il="0x3c" row="263" file_ref="1" hidden="false" />
+        <entry il="0x0" row="256" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="257" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="260" col="3" file_ref="1" hidden="false" />
+        <entry il="0xf" row="258" col="4" file_ref="1" hidden="false" />
+        <entry il="0x16" row="261" col="3" file_ref="1" hidden="false" />
+        <entry il="0x17" row="262" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3c" row="263" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
     </method>
     <method token="0x600001a">
       <sequencepoints>
-        <entry il="0x0" row="266" file_ref="1" hidden="false" />
-        <entry il="0x1" row="267" file_ref="1" hidden="false" />
-        <entry il="0x2" row="269" file_ref="1" hidden="false" />
-        <entry il="0x24" row="268" file_ref="1" hidden="false" />
-        <entry il="0x2f" row="270" file_ref="1" hidden="false" />
-        <entry il="0x30" row="271" file_ref="1" hidden="false" />
-        <entry il="0x31" row="269" file_ref="1" hidden="false" />
-        <entry il="0x4d" row="272" file_ref="1" hidden="false" />
+        <entry il="0x0" row="266" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="267" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2" row="269" col="6" file_ref="1" hidden="false" />
+        <entry il="0x24" row="268" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2f" row="270" col="3" file_ref="1" hidden="false" />
+        <entry il="0x30" row="271" col="3" file_ref="1" hidden="false" />
+        <entry il="0x31" row="269" col="6" file_ref="1" hidden="false" />
+        <entry il="0x4d" row="272" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
index ddc64f6c20019804a96f1408312d600c2e1f3896..338ebab2372853b7ff26877d90ce9ec7b8b65b05 100644 (file)
@@ -6,8 +6,8 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1" row="8" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="8" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index d9bdcf2973133cde08386dda7955ec36521c4e38..5125b202491c51b2c812f7b43be70070ac4e539d 100644 (file)
@@ -6,8 +6,8 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1" row="9" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="9" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -49,9 +49,9 @@
     </method>
     <method token="0x6000009">
       <sequencepoints>
-        <entry il="0x21" row="12" file_ref="1" hidden="false" />
-        <entry il="0x22" row="13" file_ref="1" hidden="false" />
-        <entry il="0x3d" row="14" file_ref="1" hidden="false" />
+        <entry il="0x21" row="12" col="2" file_ref="1" hidden="false" />
+        <entry il="0x22" row="13" col="3" file_ref="1" hidden="false" />
+        <entry il="0x3d" row="14" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -93,8 +93,8 @@
     </method>
     <method token="0x6000011">
       <sequencepoints>
-        <entry il="0x12" row="17" file_ref="1" hidden="false" />
-        <entry il="0x13" row="18" file_ref="1" hidden="false" />
+        <entry il="0x12" row="17" col="2" file_ref="1" hidden="false" />
+        <entry il="0x13" row="18" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index b1f9f78f9fd4812331c4c9447560dda24c0746c5..e550e8ecffac9a0aa5620e70bd55ba4f7f6aba56 100644 (file)
@@ -6,17 +6,17 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="6" file_ref="1" hidden="false" />
-        <entry il="0x1" row="7" file_ref="1" hidden="false" />
+        <entry il="0x0" row="6" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="7" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="11" file_ref="1" hidden="false" />
-        <entry il="0x1f" row="14" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="11" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1f" row="14" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
@@ -25,9 +25,9 @@
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="17" file_ref="1" hidden="false" />
-        <entry il="0x1" row="18" file_ref="1" hidden="false" />
-        <entry il="0x1f" row="23" file_ref="1" hidden="false" />
+        <entry il="0x0" row="17" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="18" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1f" row="23" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
@@ -36,9 +36,9 @@
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="26" file_ref="1" hidden="false" />
-        <entry il="0x1" row="27" file_ref="1" hidden="false" />
-        <entry il="0x1f" row="31" file_ref="1" hidden="false" />
+        <entry il="0x0" row="26" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="27" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1f" row="31" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="0" />
@@ -47,9 +47,9 @@
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0xd" row="34" file_ref="1" hidden="false" />
-        <entry il="0xe" row="35" file_ref="1" hidden="false" />
-        <entry il="0x1b" row="37" file_ref="1" hidden="false" />
+        <entry il="0xd" row="34" col="2" file_ref="1" hidden="false" />
+        <entry il="0xe" row="35" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1b" row="37" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="1" scope_ref="0" />
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="13" file_ref="1" hidden="false" />
+        <entry il="0x0" row="13" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
-        <entry il="0x1" row="21" file_ref="1" hidden="false" />
-        <entry il="0x6" row="22" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1" row="21" col="4" file_ref="1" hidden="false" />
+        <entry il="0x6" row="22" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000009">
       <sequencepoints>
-        <entry il="0x0" row="28" file_ref="1" hidden="false" />
-        <entry il="0x1" row="29" file_ref="1" hidden="false" />
-        <entry il="0x6" row="30" file_ref="1" hidden="false" />
+        <entry il="0x0" row="28" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1" row="29" col="4" file_ref="1" hidden="false" />
+        <entry il="0x6" row="30" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -93,7 +93,7 @@
     </method>
     <method token="0x600000b">
       <sequencepoints>
-        <entry il="0x0" row="36" file_ref="1" hidden="false" />
+        <entry il="0x0" row="36" col="10" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index cce12d1957c89e105470917b87b80580d09d93f9..1e4c752197b5dcf6bfff8a108c935a96d7d69209 100644 (file)
@@ -6,9 +6,9 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="6" file_ref="1" hidden="false" />
-        <entry il="0x1" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1c" row="8" file_ref="1" hidden="false" />
+        <entry il="0x0" row="6" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="7" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1c" row="8" col="5" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -18,9 +18,9 @@
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="11" file_ref="1" hidden="false" />
-        <entry il="0x1" row="12" file_ref="1" hidden="false" />
-        <entry il="0x7" row="13" file_ref="1" hidden="false" />
+        <entry il="0x0" row="11" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="12" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="13" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index f54071b4b8ba681b380a5bf79fd6d43d2717cc51..f34f901bff4f45c5560781da7f4c62934ee7cf74 100644 (file)
@@ -6,19 +6,19 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="11" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="11" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="14" file_ref="1" hidden="false" />
-        <entry il="0x1" row="15" file_ref="1" hidden="false" />
-        <entry il="0x7" row="17" file_ref="1" hidden="false" />
-        <entry il="0x13" row="20" file_ref="1" hidden="false" />
-        <entry il="0x21" row="24" file_ref="1" hidden="false" />
+        <entry il="0x0" row="14" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="15" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="17" col="4" file_ref="1" hidden="false" />
+        <entry il="0x13" row="20" col="4" file_ref="1" hidden="false" />
+        <entry il="0x21" row="24" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="o" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="27" file_ref="1" hidden="false" />
-        <entry il="0x1" row="28" file_ref="1" hidden="false" />
-        <entry il="0x7" row="30" file_ref="1" hidden="false" />
-        <entry il="0x12" row="31" file_ref="1" hidden="false" />
-        <entry il="0x1b" row="33" file_ref="1" hidden="false" />
+        <entry il="0x0" row="27" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="28" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="30" col="4" file_ref="1" hidden="false" />
+        <entry il="0x12" row="31" col="4" file_ref="1" hidden="false" />
+        <entry il="0x1b" row="33" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="user" il_index="0" scope_ref="0" />
index 29fedfd787ed3963acfdd4183522ceef4ce9d2b2..e71763c6366a5a1271b9ca889a7a0883275fa8e0 100644 (file)
@@ -6,18 +6,18 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1" row="8" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="8" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x2a" row="11" file_ref="1" hidden="false" />
-        <entry il="0x2b" row="12" file_ref="1" hidden="false" />
-        <entry il="0x46" row="16" file_ref="1" hidden="false" />
-        <entry il="0x4b" row="17" file_ref="1" hidden="false" />
+        <entry il="0x2a" row="11" col="2" file_ref="1" hidden="false" />
+        <entry il="0x2b" row="12" col="3" file_ref="1" hidden="false" />
+        <entry il="0x46" row="16" col="3" file_ref="1" hidden="false" />
+        <entry il="0x4b" row="17" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="e" il_index="2" scope_ref="0" />
@@ -26,9 +26,9 @@
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
-        <entry il="0x1" row="21" file_ref="1" hidden="false" />
-        <entry il="0x32" row="22" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="21" col="3" file_ref="1" hidden="false" />
+        <entry il="0x32" row="22" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="e" il_index="0" scope_ref="0" />
index 9e9644670cf801cc8d9bb9234954e23f4eba7611..ccb72a21ebb4efdb1acbceff727cd5c6328c95d0 100644 (file)
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="8" file_ref="1" hidden="false" />
-        <entry il="0x1" row="9" file_ref="1" hidden="false" />
+        <entry il="0x0" row="8" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="9" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="12" file_ref="1" hidden="false" />
-        <entry il="0x1" row="13" file_ref="1" hidden="false" />
-        <entry il="0x10" row="14" file_ref="1" hidden="false" />
+        <entry il="0x0" row="12" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="13" col="3" file_ref="1" hidden="false" />
+        <entry il="0x10" row="14" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="17" file_ref="1" hidden="false" />
-        <entry il="0x1" row="18" file_ref="1" hidden="false" />
-        <entry il="0x7" row="19" file_ref="1" hidden="false" />
-        <entry il="0xa3" row="20" file_ref="1" hidden="false" />
-        <entry il="0xa8" row="21" file_ref="1" hidden="false" />
+        <entry il="0x0" row="17" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="18" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="19" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa3" row="20" col="3" file_ref="1" hidden="false" />
+        <entry il="0xa8" row="21" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="d" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000006">
       <sequencepoints>
-        <entry il="0x0" row="24" file_ref="1" hidden="false" />
-        <entry il="0x1" row="25" file_ref="1" hidden="false" />
-        <entry il="0x7" row="26" file_ref="1" hidden="false" />
-        <entry il="0x5a" row="27" file_ref="1" hidden="false" />
+        <entry il="0x0" row="24" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="25" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="26" col="3" file_ref="1" hidden="false" />
+        <entry il="0x5a" row="27" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="d" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="30" file_ref="1" hidden="false" />
-        <entry il="0x1" row="31" file_ref="1" hidden="false" />
-        <entry il="0x7" row="32" file_ref="1" hidden="false" />
-        <entry il="0xe" row="33" file_ref="1" hidden="false" />
-        <entry il="0x14" row="34" file_ref="1" hidden="false" />
-        <entry il="0x81" row="35" file_ref="1" hidden="false" />
+        <entry il="0x0" row="30" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="31" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="32" col="3" file_ref="1" hidden="false" />
+        <entry il="0xe" row="33" col="3" file_ref="1" hidden="false" />
+        <entry il="0x14" row="34" col="3" file_ref="1" hidden="false" />
+        <entry il="0x81" row="35" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="u" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="38" file_ref="1" hidden="false" />
-        <entry il="0x1" row="39" file_ref="1" hidden="false" />
-        <entry il="0x7" row="40" file_ref="1" hidden="false" />
-        <entry il="0x1e4" row="41" file_ref="1" hidden="false" />
+        <entry il="0x0" row="38" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="39" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="40" col="5" file_ref="1" hidden="false" />
+        <entry il="0x1e4" row="41" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="d" il_index="0" scope_ref="0" />
@@ -92,7 +92,7 @@
     </method>
     <method token="0x600000a">
       <sequencepoints>
-        <entry il="0x0" row="40" file_ref="1" hidden="false" />
+        <entry il="0x0" row="40" col="38" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 9581c41d9dcdb53e3239b4dbd3f7e76c3fc2b9d0..4e9c2a3582bdce556d5689d294a4fcef5c70f05b 100644 (file)
@@ -6,8 +6,8 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1" row="8" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="8" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="16" file_ref="1" hidden="false" />
-        <entry il="0x1" row="17" file_ref="1" hidden="false" />
-        <entry il="0x23" row="17" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="21" file_ref="1" hidden="false" />
+        <entry il="0x0" row="16" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="17" col="3" file_ref="1" hidden="false" />
+        <entry il="0x23" row="17" col="23" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="21" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="29" file_ref="1" hidden="false" />
-        <entry il="0x1" row="30" file_ref="1" hidden="false" />
-        <entry il="0x23" row="30" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="31" file_ref="1" hidden="false" />
+        <entry il="0x0" row="29" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="30" col="3" file_ref="1" hidden="false" />
+        <entry il="0x23" row="30" col="23" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="31" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="19" file_ref="1" hidden="false" />
-        <entry il="0x1" row="20" file_ref="1" hidden="false" />
+        <entry il="0x0" row="19" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1" row="20" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000009">
       <sequencepoints>
-        <entry il="0x0" row="30" file_ref="1" hidden="false" />
+        <entry il="0x0" row="30" col="39" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x600000a">
       <sequencepoints>
-        <entry il="0x21" row="11" file_ref="1" hidden="false" />
-        <entry il="0x22" row="12" file_ref="1" hidden="false" />
-        <entry il="0x28" row="12" file_ref="1" hidden="false" />
-        <entry il="0x89" row="13" file_ref="1" hidden="false" />
+        <entry il="0x21" row="11" col="2" file_ref="1" hidden="false" />
+        <entry il="0x22" row="12" col="3" file_ref="1" hidden="false" />
+        <entry il="0x89" row="13" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x600000c">
       <sequencepoints>
-        <entry il="0x21" row="24" file_ref="1" hidden="false" />
-        <entry il="0x22" row="25" file_ref="1" hidden="false" />
-        <entry il="0x28" row="25" file_ref="1" hidden="false" />
-        <entry il="0x8f" row="26" file_ref="1" hidden="false" />
+        <entry il="0x21" row="24" col="2" file_ref="1" hidden="false" />
+        <entry il="0x22" row="25" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8f" row="26" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x600000e">
       <sequencepoints>
-        <entry il="0x21" row="34" file_ref="1" hidden="false" />
-        <entry il="0x22" row="35" file_ref="1" hidden="false" />
-        <entry il="0x2d" row="36" file_ref="1" hidden="false" />
-        <entry il="0x8b" row="37" file_ref="1" hidden="false" />
-        <entry il="0x3ab" row="38" file_ref="1" hidden="false" />
-        <entry il="0x4b9" row="39" file_ref="1" hidden="false" />
+        <entry il="0x21" row="34" col="2" file_ref="1" hidden="false" />
+        <entry il="0x22" row="35" col="3" file_ref="1" hidden="false" />
+        <entry il="0x2d" row="36" col="5" file_ref="1" hidden="false" />
+        <entry il="0x8b" row="37" col="5" file_ref="1" hidden="false" />
+        <entry il="0x3ab" row="38" col="3" file_ref="1" hidden="false" />
+        <entry il="0x4b9" row="39" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000010">
       <sequencepoints>
-        <entry il="0x0" row="37" file_ref="1" hidden="false" />
+        <entry il="0x0" row="37" col="49" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 04e1ca617aa2ebaba58d66d1333cfe7be55a8c2c..ac2dc762dc3c3c1b39c9b2f37c3122064c64b478 100644 (file)
@@ -6,16 +6,16 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="10" file_ref="1" hidden="false" />
-        <entry il="0x1" row="11" file_ref="1" hidden="false" />
+        <entry il="0x0" row="10" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="11" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="17" file_ref="1" hidden="false" />
-        <entry il="0x1" row="18" file_ref="1" hidden="false" />
+        <entry il="0x0" row="17" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="18" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 4db6d5a0f4de8d20be2894c4fca21a7d358e53f5..3b9f00550830d4ec2287d50a18c92db5fb0e6298 100644 (file)
@@ -11,8 +11,8 @@
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="22" file_ref="1" hidden="false" />
-        <entry il="0x1" row="23" file_ref="1" hidden="false" />
+        <entry il="0x0" row="22" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="23" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x27" row="7" file_ref="1" hidden="false" />
-        <entry il="0x28" row="8" file_ref="1" hidden="false" />
-        <entry il="0x32" row="9" file_ref="1" hidden="false" />
-        <entry il="0x41" row="10" file_ref="1" hidden="false" />
-        <entry il="0x42" row="11" file_ref="1" hidden="false" />
-        <entry il="0x5f" row="12" file_ref="1" hidden="false" />
-        <entry il="0x70" row="18" file_ref="1" hidden="false" />
-        <entry il="0x8b" row="19" file_ref="1" hidden="false" />
+        <entry il="0x27" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x28" row="8" col="3" file_ref="1" hidden="false" />
+        <entry il="0x32" row="9" col="3" file_ref="1" hidden="false" />
+        <entry il="0x41" row="10" col="3" file_ref="1" hidden="false" />
+        <entry il="0x42" row="11" col="4" file_ref="1" hidden="false" />
+        <entry il="0x5f" row="12" col="3" file_ref="1" hidden="false" />
+        <entry il="0x70" row="18" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8b" row="19" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -75,9 +75,9 @@
     </method>
     <method token="0x600000c">
       <sequencepoints>
-        <entry il="0x0" row="14" file_ref="1" hidden="false" />
-        <entry il="0x1" row="15" file_ref="1" hidden="false" />
-        <entry il="0xb" row="16" file_ref="1" hidden="false" />
+        <entry il="0x0" row="14" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1" row="15" col="4" file_ref="1" hidden="false" />
+        <entry il="0xb" row="16" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
index 2c5302f464d244a213da477fa56fd1ee3aa86ca8..2b4a8e44532320e5b24cb224c5fa62ae4877524b 100644 (file)
@@ -6,9 +6,9 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="7" file_ref="1" hidden="false" />
-        <entry il="0x1" row="8" file_ref="1" hidden="false" />
-        <entry il="0x8" row="9" file_ref="1" hidden="false" />
+        <entry il="0x0" row="7" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="8" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="9" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="20" file_ref="1" hidden="false" />
-        <entry il="0x1" row="21" file_ref="1" hidden="false" />
+        <entry il="0x0" row="20" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="21" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="25" file_ref="1" hidden="false" />
-        <entry il="0x1" row="26" file_ref="1" hidden="false" />
+        <entry il="0x0" row="25" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="26" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -71,9 +71,9 @@
     </method>
     <method token="0x600000c">
       <sequencepoints>
-        <entry il="0x21" row="15" file_ref="1" hidden="false" />
-        <entry il="0x22" row="16" file_ref="1" hidden="false" />
-        <entry il="0x47" row="17" file_ref="1" hidden="false" />
+        <entry il="0x21" row="15" col="2" file_ref="1" hidden="false" />
+        <entry il="0x22" row="16" col="3" file_ref="1" hidden="false" />
+        <entry il="0x47" row="17" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 0befffc5cb4da6fcc27cb7e18d4642429cc1212e..ed5b7d8530172b162a30b1e5cfdba77668d18b49 100644 (file)
@@ -6,41 +6,41 @@
   <methods>
     <method token="0x6000001">
       <sequencepoints>
-        <entry il="0x0" row="8" file_ref="1" hidden="false" />
-        <entry il="0x1" row="9" file_ref="1" hidden="false" />
-        <entry il="0x7" row="9" file_ref="1" hidden="false" />
-        <entry il="0xd" row="10" file_ref="1" hidden="false" />
+        <entry il="0x0" row="8" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="9" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="9" col="8" file_ref="1" hidden="false" />
+        <entry il="0xd" row="10" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000002">
       <sequencepoints>
-        <entry il="0x0" row="13" file_ref="1" hidden="false" />
-        <entry il="0x1" row="14" file_ref="1" hidden="false" />
-        <entry il="0x7" row="14" file_ref="1" hidden="false" />
-        <entry il="0xd" row="15" file_ref="1" hidden="false" />
+        <entry il="0x0" row="13" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="14" col="3" file_ref="1" hidden="false" />
+        <entry il="0x7" row="14" col="11" file_ref="1" hidden="false" />
+        <entry il="0xd" row="15" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000003">
       <sequencepoints>
-        <entry il="0x0" row="18" file_ref="1" hidden="false" />
-        <entry il="0x1" row="19" file_ref="1" hidden="false" />
-        <entry il="0x6" row="19" file_ref="1" hidden="false" />
-        <entry il="0xc" row="20" file_ref="1" hidden="false" />
+        <entry il="0x0" row="18" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="19" col="3" file_ref="1" hidden="false" />
+        <entry il="0x6" row="19" col="18" file_ref="1" hidden="false" />
+        <entry il="0xc" row="20" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000004">
       <sequencepoints>
-        <entry il="0x0" row="23" file_ref="1" hidden="false" />
-        <entry il="0x1" row="24" file_ref="1" hidden="false" />
-        <entry il="0x1f" row="25" file_ref="1" hidden="false" />
-        <entry il="0x25" row="25" file_ref="1" hidden="false" />
-        <entry il="0x2b" row="26" file_ref="1" hidden="false" />
+        <entry il="0x0" row="23" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="24" col="3" file_ref="1" hidden="false" />
+        <entry il="0x1f" row="25" col="3" file_ref="1" hidden="false" />
+        <entry il="0x25" row="25" col="8" file_ref="1" hidden="false" />
+        <entry il="0x2b" row="26" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="f" il_index="0" scope_ref="0" />
     </method>
     <method token="0x6000005">
       <sequencepoints>
-        <entry il="0x0" row="29" file_ref="1" hidden="false" />
-        <entry il="0x1" row="30" file_ref="1" hidden="false" />
-        <entry il="0x8" row="31" file_ref="1" hidden="false" />
+        <entry il="0x0" row="29" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="30" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="31" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000006">
       <sequencepoints>
-        <entry il="0x0" row="34" file_ref="1" hidden="false" />
-        <entry il="0x1" row="35" file_ref="1" hidden="false" />
-        <entry il="0x8" row="36" file_ref="1" hidden="false" />
+        <entry il="0x0" row="34" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="35" col="3" file_ref="1" hidden="false" />
+        <entry il="0x8" row="36" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000007">
       <sequencepoints>
-        <entry il="0x0" row="39" file_ref="1" hidden="false" />
-        <entry il="0x1" row="40" file_ref="1" hidden="false" />
-        <entry il="0x8" row="41" file_ref="1" hidden="false" />
+        <entry il="0x0" row="39" col="7" file_ref="1" hidden="false" />
+        <entry il="0x1" row="40" col="4" file_ref="1" hidden="false" />
+        <entry il="0x8" row="41" col="3" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="45" file_ref="1" hidden="false" />
-        <entry il="0x1" row="46" file_ref="1" hidden="false" />
+        <entry il="0x0" row="45" col="2" file_ref="1" hidden="false" />
+        <entry il="0x1" row="46" col="2" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
@@ -89,7 +89,7 @@
     </method>
     <method token="0x600000a">
       <sequencepoints>
-        <entry il="0x0" row="24" file_ref="1" hidden="false" />
+        <entry il="0x0" row="24" col="27" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes />
index 72e48eb5e6c9807fcd318b55579200521f0af2b4..eb0e6faf545c973d23300cb4180834c6c5d9f961 100644 (file)
       <method name="Void MoveNext()" attrs="486">\r
         <size>492</size>\r
       </method>\r
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
+        <size>13</size>\r
+      </method>\r
       <method name="Int32 &lt;&gt;m__4()" attrs="145">\r
         <size>9</size>\r
       </method>\r
       <method name="Void MoveNext()" attrs="486">\r
         <size>1229</size>\r
       </method>\r
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
+        <size>13</size>\r
+      </method>\r
       <method name="Int32 &lt;&gt;m__5()" attrs="145">\r
         <size>9</size>\r
       </method>\r
       <method name="Void MoveNext()" attrs="486">\r
         <size>344</size>\r
       </method>\r
+      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
+        <size>13</size>\r
+      </method>\r
       <method name="System.Object &lt;&gt;m__6()" attrs="145">\r
         <size>13</size>\r
       </method>\r
       <method name="Void MoveNext()" attrs="486">\r
         <size>596</size>\r
       </method>\r
-      <method name="System.Object &lt;&gt;m__7()" attrs="145">\r
-        <size>13</size>\r
-      </method>\r
-    </type>\r
-    <type name="Tester+&lt;Add_1&gt;c__async0">\r
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
-        <size>13</size>\r
-      </method>\r
-    </type>\r
-    <type name="Tester+&lt;AssignCompound_1&gt;c__async1">\r
       <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
         <size>13</size>\r
       </method>\r
-    </type>\r
-    <type name="Tester+&lt;Convert_1&gt;c__async2">\r
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
-        <size>13</size>\r
-      </method>\r
-    </type>\r
-    <type name="Tester+&lt;Invocation_1&gt;c__async3">\r
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">\r
+      <method name="System.Object &lt;&gt;m__7()" attrs="145">\r
         <size>13</size>\r
       </method>\r
     </type>\r
     </type>\r
     <type name="C2">\r
       <method name="Void .ctor()" attrs="6278">\r
-        <size>16</size>\r
+        <size>24</size>\r
       </method>\r
     </type>\r
     <type name="C3">\r
index 2402b6019a0ac98882e656fd919ce5a8aff97021..d0a7b06f0d5c6853f09bf1d5efbc15802fabf320 100644 (file)
@@ -935,6 +935,7 @@ namespace TestRunner {
                                                writer.WriteStartElement ("entry");
                                                writer.WriteAttributeString ("il", IntToHex (entry.Offset));
                                                writer.WriteAttributeString ("row", entry.Row.ToString ());
+                                               writer.WriteAttributeString ("col", entry.Column.ToString ());
                                                writer.WriteAttributeString ("file_ref", entry.File.ToString ());
                                                writer.WriteAttributeString ("hidden", BoolToString (entry.IsHidden));
                                                writer.WriteEndElement ();
@@ -1418,18 +1419,13 @@ namespace TestRunner {
                        try {
                                Console.WriteLine ("Loading " + compiler + " ...");
                                tester = new ReflectionTester (Assembly.LoadFile (compiler));
-                       }
-                       catch (Exception) {
-#if NET_2_1
-                               throw;
-#else
+                       } catch (Exception) {
                                Console.Error.WriteLine ("Switching to command line mode (compiler entry point was not found)");
                                if (!File.Exists (compiler)) {
                                        Console.Error.WriteLine ("ERROR: Tested compiler was not found");
                                        return 1;
                                }
                                tester = new ProcessTester (compiler);
-#endif
                        }
 
                        string mode;