[gxml] XdParser: renamed from GParser



commit b713116fc07eb7f8755a508aebc40e1900e33ea4
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jul 4 23:43:14 2019 -0500

    XdParser: renamed from GParser

 gxml/XDocument.vala                     |  8 ++---
 gxml/{GXmlParser.vala => XdParser.vala} | 55 +++++++++++++++++----------------
 gxml/meson.build                        |  2 +-
 3 files changed, 34 insertions(+), 31 deletions(-)
---
diff --git a/gxml/XDocument.vala b/gxml/XDocument.vala
index 04cfde2..3176882 100644
--- a/gxml/XDocument.vala
+++ b/gxml/XDocument.vala
@@ -55,17 +55,17 @@ public class GXml.XDocument : GXml.XNode,
   public XDocument.from_file (GLib.File file, int options = 0, Cancellable? cancel = null) throws GLib.Error 
{
     if (!file.query_exists ())
       throw new DomDocumentError.INVALID_DOCUMENT_ERROR (_("File doesn't exist"));
-    var parser = new GParser (this);
+    var parser = new XdParser (this);
     parser.cancellable = cancel;
     parser.read_stream (file.read ());
   }
 
   public XDocument.from_string (string str, int options = 0) throws GLib.Error {
-    var parser = new GParser (this);
+    var parser = new XdParser (this);
     parser.read_string (str);
   }
   public XDocument.from_stream (GLib.InputStream istream) throws GLib.Error {
-    var parser = new GParser (this);
+    var parser = new XdParser (this);
     parser.read_stream (istream);
   }
   public XDocument.from_doc (Xml.Doc doc) { this.doc = doc; }
@@ -74,7 +74,7 @@ public class GXml.XDocument : GXml.XNode,
     if (_parser != null) {
       return _parser;
     }
-    return new GParser (this);
+    return new XdParser (this);
   }
   public void set_xml_parser (Parser parser) {
     _parser = parser;
diff --git a/gxml/GXmlParser.vala b/gxml/XdParser.vala
similarity index 77%
rename from gxml/GXmlParser.vala
rename to gxml/XdParser.vala
index 7e702fe..3e3460d 100644
--- a/gxml/GXmlParser.vala
+++ b/gxml/XdParser.vala
@@ -20,12 +20,15 @@
  *      Daniel Espinosa <esodan gmail com>
  */
 
-
-private class GXml.GParser : Object, Parser {
+/**
+ * Parser implementation of {@link Parser} to parse {@link XDocument}
+ * documents.
+ */
+private class GXml.XdParser : Object, Parser {
   private XDocument document;
   private DomNode _node;
 
-  public GParser (XDocument doc) {
+  public XdParser (XDocument doc) {
     document = doc;
     _node = doc;
   }
@@ -51,37 +54,37 @@ private class GXml.GParser : Object, Parser {
        public void read_element (GXml.DomElement element) throws GLib.Error {}
        public void read_stream (GLib.InputStream stream) throws GLib.Error
        {
-  var b = new MemoryOutputStream.resizable ();
-  b.splice (stream, 0);
-  if (b.data == null)
-    throw new ParserError.INVALID_STREAM_ERROR (_("stream doesn't provide data"));
-  read_string ((string) b.data);
+    var b = new MemoryOutputStream.resizable ();
+    b.splice (stream, 0);
+    if (b.data == null)
+      throw new ParserError.INVALID_STREAM_ERROR (_("stream doesn't provide data"));
+    read_string ((string) b.data);
        }
        public async void read_stream_async (GLib.InputStream stream) throws GLib.Error
        {
          Idle.add (read_stream_async.callback);
-  yield;
-  read_stream (stream);
+    yield;
+    read_stream (stream);
        }
        public void read_string (string str) throws GLib.Error
        {
-  Xml.reset_last_error ();
-  document.doc = Xml.Parser.parse_memory (str, (int) str.length);
-  var e = Xml.get_last_error ();
-  if (e != null) {
-    var errmsg = _("Parser Error for string");
-    string s = XNode.libxml2_error_to_string (e);
-    if (s != null)
-      errmsg = ".  ";
-    throw new GXml.Error.PARSER (errmsg);
-  }
-  if (document.doc == null)
-    document.doc = new Xml.Doc ();
+    Xml.reset_last_error ();
+    document.doc = Xml.Parser.parse_memory (str, (int) str.length);
+    var e = Xml.get_last_error ();
+    if (e != null) {
+      var errmsg = _("Parser Error for string");
+      string s = XNode.libxml2_error_to_string (e);
+      if (s != null)
+        errmsg = ".  ";
+      throw new GXml.Error.PARSER (errmsg);
+    }
+    if (document.doc == null)
+      document.doc = new Xml.Doc ();
        }
        public async void read_string_async (string str) throws GLib.Error
        {
          Idle.add (read_string_async.callback);
-  yield;
+    yield;
          read_string (str);
        }
        public string read_unparsed () throws GLib.Error {
@@ -98,12 +101,12 @@ private class GXml.GParser : Object, Parser {
          yield stream.splice_async (istream, OutputStreamSpliceFlags.CLOSE_SOURCE, 0, cancellable);
        }
        public string write_string () throws GLib.Error {
-  return document.libxml_to_string ();
+    return document.libxml_to_string ();
        }
        public async string write_string_async () throws GLib.Error {
          Idle.add (write_string_async.callback);
-  yield;
-  return write_string ();
+    yield;
+    return write_string ();
        }
        public bool backup { get; set; }
        public bool indent { get; set; }
diff --git a/gxml/meson.build b/gxml/meson.build
index b0337c0..23dbfa0 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -70,7 +70,6 @@ valasources = files ([
        'gxml-init.vala',
        'GXmlListNamespaces.vala',
        'GXmlNamespace.vala',
-       'GXmlParser.vala',
        'GXPathObject.vala',
        'Namespace.vala',
        'NodeType.vala',
@@ -81,6 +80,7 @@ valasources = files ([
        'XChildNode.vala',
        'XComment.vala',
        'XDocument.vala',
+       'XdParser.vala',
        'XElement.vala',
        'XHashMapAttr.vala',
        'XListChildren.vala',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]