Code review fixes

amazon-ion · Jan 10, 2020 · 8288ecc · 8288ecc
1 parent 5aabb4b
commit 8288ecc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/IonDotnet/Internals/Tree/SystemTreeReader.cs b/IonDotnet/Internals/Tree/SystemTreeReader.cs
@@ -10,8 +10,6 @@ namespace IonDotnet.Internals.Tree
 {
  internal class SystemTreeReader : IIonReader
  {
-
- protected readonly IIonValue _value;
  protected readonly ISymbolTable _systemSymbols;
  protected IEnumerator<IIonValue> _iter;
  protected IIonValue _parent;
@@ -119,7 +117,7 @@ public IEnumerable<SymbolToken> GetTypeAnnotations()
 
  public int IntValue()
  {
- return _next.IntValue;
+ return _current.IntValue;
  }
 
  public long LongValue()
@@ -168,13 +166,13 @@ private bool IsContainer()
 
  private void Push()
  {
- int oldlen = _stack.Length;
- if (_top + 1 >= oldlen)
+ int oldLen = _stack.Length;
+ if (_top + 1 >= oldLen)
  {
  // we're going to do a "+2" on top so we need extra space
- int newlen = oldlen * 2;
- Object[] temp = new Object[newlen];
- Array.Copy(_stack, 0, temp, 0, oldlen);
+ int newLen = oldLen * 2;
+ Object[] temp = new Object[newLen];
+ Array.Copy(_stack, 0, temp, 0, oldLen);
  _stack = temp;
  }
  _stack[_top++] = _parent;

diff --git a/IonDotnet/Internals/Tree/UserTreeReader.cs b/IonDotnet/Internals/Tree/UserTreeReader.cs
@@ -8,9 +8,11 @@ namespace IonDotnet.Internals.Tree
  internal class UserTreeReader : SystemTreeReader
  {
  /// The ID of system symbol {@value #ION_1_0}, as defined by Ion 1.0.
- public static readonly int ION_1_0_SID = 2;
+ private const int ION_1_0_SID = 2;
  private readonly ICatalog _catalog;
  private ISymbolTable _currentSymtab;
+ private int _symbol_table_top = 0;
+ private ISymbolTable[] _symbol_table_stack = new ISymbolTable[3]; // 3 is rare, IVM followed by a local sym tab with open content
 
  public UserTreeReader(IIonValue value, ICatalog catalog) : base(value)
  {
@@ -101,8 +103,6 @@ bool NextHelperUser()
  return (next_type != IonType.Null);
  }
 
- private int _symbol_table_top = 0;
- private ISymbolTable[] _symbol_table_stack = new ISymbolTable[3]; // 3 is rare, IVM followed by a local sym tab with open content
  private void ClearSystemValueStack()
  {
  while (_symbol_table_top > 0)