implab/ImplabNet Commit - r64:a809805210d1

small refactoring

cin -

r64:a809805210d1 default

parent child

Context file:

r64:a809805210d1

Collapse all files

Implab/JSON/JSONXmlReader.cs +12 -10

                      readonly bool m_flattenArrays;
                      readonly string m_arrayItemName;
                      readonly XmlNameTable m_nameTable;
-                     readonly bool m_disposeParser;
-                     public JSONXmlReader(JSONParser parser, JSONXmlReaderOptions options) {
-                         Safe.ArgumentNotNull(parser, "parser");
+                     JSONXmlReader(JSONParser parser, JSONXmlReaderOptions options) {
                          m_parser = parser;
                          if (options != null) {
                              m_flattenArrays = options.FlattenArrays;
                              m_arrayItemName = options.ArrayItemName ?? "item";
                              m_nameTable = options.NameTable ?? new NameTable();
-                             m_disposeParser = options.DisposeParser;
                          } else {
                              m_prefix = String.Empty;
                              m_namespaceUri = String.Empty;
                              m_flattenArrays = false;
                              m_arrayItemName = "item";
                              m_nameTable = new NameTable();
-                             m_disposeParser = false;
                          }
                      }
                      protected override void Dispose(bool disposing) {
                          if (disposing) {
-                             if (m_disposeParser)
-                                 m_parser.Dispose();
                          }
                          base.Dispose(disposing);
                      }
+                     public static JSONXmlReader Create(string file, JSONXmlReaderOptions options) {
+                         return Create(File.OpenText(file), options);
+                     }
-                     public static JSONXmlReader OpenFile(string file, JSONXmlReaderOptions options) {
-                         var stream = File.OpenText(file);
-                         var parser = new JSONParser(stream, true);
-                         return new JSONXmlReader(parser, options);
+                     public static JSONXmlReader Create(TextReader reader,  JSONXmlReaderOptions options) {
+                         return new JSONXmlReader(new JSONParser(reader, true), options);
+                     }
+                     public static JSONXmlReader Create(Stream stream,  JSONXmlReaderOptions options) {
+                         Safe.ArgumentNotNull(stream, "stream");
+                         // HACK don't dispose StreaReader to keep stream opened
+                         return Create(new StreamReader(stream), options);
                      }
                  }
              }

Implab/JSON/JSONXmlReaderOptions.cs 0 -7

                          set;
                      }
-                     /// <summary>
-                     /// Флаг, означающий, что неужно освободить парсер по окончанию работы.
-                     /// </summary>
-                     public bool DisposeParser {
-                         get;
-                         set;
-                     }
                  }
+             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages