Changeset 1356 for branches/New Persistence Exploration/Persistence/Persistence/XmlParser.cs

Timestamp:

03/18/09 15:15:48 (15 years ago)

Author:

epitzer

Message:

Unify token classes for parsing and formatting, make format specification mandatory. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/XmlParser.cs (modified) (3 diffs)

branches/New Persistence Exploration/Persistence/Persistence/XmlParser.cs

@@ -8 +8 @@
 
 
-  public class XmlParser : IEnumerable<IParseToken> {
+  public class XmlParser : IEnumerable<ISerializationToken> {
 
     private readonly XmlReader reader;
-    private delegate IEnumerator<IParseToken> Handler();
+    private delegate IEnumerator<ISerializationToken> Handler();
     private readonly Dictionary<string, Handler> handlers;
 
@@ -28 +28 @@
                    };
     }
-    public IEnumerator<IParseToken> GetEnumerator() {
+    public IEnumerator<ISerializationToken> GetEnumerator() {
       while (reader.Read()) {
         if (!reader.IsStartElement()) {
           break;
         }
-        IEnumerator<IParseToken> iterator;
+        IEnumerator<ISerializationToken> iterator;
         try {
           iterator = handlers[reader.Name].Invoke();
@@ -47 +47 @@
       }
     }
-    private IEnumerator<IParseToken> ParsePrimitive() {
+    private IEnumerator<ISerializationToken> ParsePrimitive() {
       int? id = null;
       string idString = reader.GetAttribute("id");
       if (idString != null)
         id = int.Parse(idString);
-      yield return new Primitive(
+      yield return new PrimitiveToken(
         reader.GetAttribute("name"),
-        reader.GetAttribute("typeId"),        
+        int.Parse(reader.GetAttribute("typeId")),
         reader.ReadString(),
         id);
     }
-    private IEnumerator<IParseToken> ParseComposite() {
-      string name = reader.GetAttribute("name");      
-      string typeId = reader.GetAttribute("typeId");
+    private IEnumerator<ISerializationToken> ParseComposite() {
+      string name = reader.GetAttribute("name");            
       string idString = reader.GetAttribute("id");
       int? id = null;
+      int? typeId = null;
       if (idString != null)
-        id = int.Parse(idString);      
-      yield return new CompositeStart(name, typeId, id);
-      IEnumerator<IParseToken> iterator = GetEnumerator();
+        id = int.Parse(idString);
+        typeId = int.Parse(reader.GetAttribute("typeId"));
+      yield return new BeginToken(name, typeId, id);
+      IEnumerator<ISerializationToken> iterator = GetEnumerator();
       while (iterator.MoveNext())
         yield return iterator.Current;
-      yield return new CompositeEnd(name, typeId, id);
+      yield return new EndToken(name, typeId, id);
     }
-    private IEnumerator<IParseToken> ParseReference() {
-      yield return new Reference(
+    private IEnumerator<ISerializationToken> ParseReference() {
+      yield return new ReferenceToken(
         reader.GetAttribute("name"),
         int.Parse(reader.GetAttribute("ref")));
     }
-    private IEnumerator<IParseToken> ParseNull() {
-      yield return new Null(reader.GetAttribute("name"));
+    private IEnumerator<ISerializationToken> ParseNull() {
+      yield return new NullReferenceToken(reader.GetAttribute("name"));
     }
     IEnumerator IEnumerable.GetEnumerator() {