Skip to content

Commit f6f1b9a

Browse files
committed
Fix compilation error because of field became special word of the language
1 parent 051248a commit f6f1b9a

6 files changed

Lines changed: 20 additions & 20 deletions

File tree

Orm/Xtensive.Orm/Orm/Internals/FieldAccessor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace Xtensive.Orm.Internals
1313
{
1414
internal abstract class FieldAccessor
1515
{
16-
private FieldInfo field;
16+
private FieldInfo @field;
1717

1818
public FieldInfo Field {
19-
get { return field; }
19+
get { return @field; }
2020
set {
21-
if (field!=null)
21+
if (@field != null)
2222
throw Exceptions.AlreadyInitialized("Field");
23-
field = value;
23+
@field = value;
2424
}
2525
}
2626

Orm/Xtensive.Orm/Orm/Linq/Expressions/LocalCollectionExpression.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ internal class LocalCollectionExpression : ParameterizedExpression,
2727

2828
public IEnumerable<ColumnExpression> Columns =>
2929
Fields
30-
.SelectMany(field => field.Value is ColumnExpression
31-
? EnumerableUtils.One(field.Value)
32-
: ((LocalCollectionExpression) field.Value).Columns.Cast<IMappedExpression>())
30+
.SelectMany(@field => @field.Value is ColumnExpression
31+
? EnumerableUtils.One(@field.Value)
32+
: ((LocalCollectionExpression) @field.Value).Columns.Cast<IMappedExpression>())
3333
.Cast<ColumnExpression>();
3434

3535
public Expression Remap(int offset, Dictionary<Expression, Expression> processedExpressions)

Orm/Xtensive.Orm/Orm/Model/ColumnInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public sealed class ColumnInfo : Node,
2727
private int? precision;
2828
private object defaultValue;
2929
private string defaultSqlExpression;
30-
private FieldInfo field;
30+
private FieldInfo @field;
3131
private NodeCollection<IndexInfo> indexes;
3232
private CultureInfo cultureInfo = CultureInfo.InvariantCulture;
3333

@@ -123,11 +123,11 @@ public bool IsLazyLoad {
123123
/// </summary>
124124
public FieldInfo Field {
125125
[DebuggerStepThrough]
126-
get { return field; }
126+
get { return @field; }
127127
[DebuggerStepThrough]
128128
set {
129129
EnsureNotLocked();
130-
field = value;
130+
@field = value;
131131
}
132132
}
133133

Orm/Xtensive.Orm/Orm/Model/Stored/StoredFieldInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public IEnumerable<StoredFieldInfo> PrimitiveFields
7070
else {
7171
var queue = new Queue<StoredFieldInfo>();
7272
queue.Enqueue(this);
73-
while (queue.TryDequeue(out var field)) {
74-
if (field.IsPrimitive)
75-
result.Add(field);
73+
while (queue.TryDequeue(out var @field)) {
74+
if (@field.IsPrimitive)
75+
result.Add(@field);
7676
else
77-
foreach (var child in field.Fields)
77+
foreach (var child in @field.Fields)
7878
queue.Enqueue(child);
7979
}
8080
}

Orm/Xtensive.Orm/Orm/Model/TypeDiscriminatorMap.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ public sealed class TypeDiscriminatorMap : Node,
2222
private TypeInfo @default;
2323
private readonly Dictionary<object, TypeInfo> map = new Dictionary<object, TypeInfo>();
2424
private readonly Dictionary<TypeInfo, object> reversedMap = new Dictionary<TypeInfo, object>();
25-
private FieldInfo field;
25+
private FieldInfo @field;
2626

2727
public FieldInfo Field
2828
{
29-
get { return field; }
29+
get { return @field; }
3030
set
3131
{
3232
EnsureNotLocked();
33-
if (field != null)
33+
if (@field != null)
3434
throw new InvalidOperationException(Strings.ExTypeDiscriminatorFieldIsAlreadySet);
35-
field = value;
35+
@field = value;
3636
}
3737
}
3838

Orm/Xtensive.Orm/Orm/Validation/ValidationResult.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class ValidationResult
1818
private readonly IValidator source;
1919
private readonly bool isError;
2020
private readonly string errorMessage;
21-
private readonly FieldInfo field;
21+
private readonly FieldInfo @field;
2222
private readonly object value;
2323

2424
/// <summary>
@@ -39,7 +39,7 @@ public class ValidationResult
3939
/// <summary>
4040
/// Gets field validated field.
4141
/// </summary>
42-
public FieldInfo Field { get { return field; } }
42+
public FieldInfo Field { get { return @field; } }
4343

4444
/// <summary>
4545
/// Gets validated value.

0 commit comments

Comments
 (0)