-Added IJsonLineInfo. Implemented by JsonTextReader, JsonTokenReader, JsonValidatingReader, JToken

-Added line details to JsonTextReader exception messages and JsonValidatingReader errors
-Change JsonSchemaGenerator to disable additional properties on sealed classes
-Fixed JsonSchemaGenerator to not output enum values and options for flag enums
This commit is contained in:
JamesNK
2009-01-04 05:26:26 +00:00
parent 0319263756
commit 399033059b
26 changed files with 520 additions and 193 deletions
+33 -1
View File
@@ -38,12 +38,15 @@ namespace Newtonsoft.Json.Linq
/// <summary>
/// Represents an abstract JSON token.
/// </summary>
public abstract class JToken : IJEnumerable<JToken>
public abstract class JToken : IJEnumerable<JToken>, IJsonLineInfo
{
private JContainer _parent;
internal JToken _next;
private static JTokenEqualityComparer _equalityComparer;
private int? _lineNumber;
private int? _linePosition;
/// <summary>
/// Gets a comparer that can compare two tokens for value equality.
/// </summary>
@@ -797,5 +800,34 @@ namespace Newtonsoft.Json.Linq
// TODO: loading constructor and parameters?
throw new Exception("Error reading JToken from JsonReader. Unexpected token: {0}".FormatWith(CultureInfo.InvariantCulture, reader.TokenType));
}
internal void SetLineInfo(IJsonLineInfo lineInfo)
{
if (lineInfo == null || !lineInfo.HasLineInfo())
return;
SetLineInfo(lineInfo.LineNumber, lineInfo.LinePosition);
}
internal void SetLineInfo(int lineNumber, int linePosition)
{
_lineNumber = lineNumber;
_linePosition = linePosition;
}
bool IJsonLineInfo.HasLineInfo()
{
return (_lineNumber != null && _linePosition != null);
}
int IJsonLineInfo.LineNumber
{
get { return _lineNumber ?? 0; }
}
int IJsonLineInfo.LinePosition
{
get { return _linePosition ?? 0; }
}
}
}