The parent of an Hpricot element is always an IHpricotDataContainer.

nrk · Jul 17, 2010 · 6eea7e8 · 6eea7e8
1 parent 24be749
commit 6eea7e8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/src/Data/BasicData.cs b/src/Data/BasicData.cs
@@ -4,14 +4,14 @@
 namespace IronRuby.Hpricot {
     public class BasicData {
         private Object _tag;
-        private Object _parent;
+        private IHpricotDataContainer _parent;
 
         public Object Tag { 
             get { return _tag; } 
             set { _tag = value; }
         }
 
-        public Object Parent {
+        public IHpricotDataContainer Parent {
             get { return _parent; }
             set { _parent = value; }
         }

diff --git a/src/Elements/BaseEle.cs b/src/Elements/BaseEle.cs
@@ -44,12 +44,12 @@ public BaseElement(RubyContext context)
         }
 
         [RubyMethod("parent")]
-        public static Object GetParent(BaseElement/*!*/ self) {
+        public static IHpricotDataContainer GetParent(BaseElement/*!*/ self) {
             return self._data.Parent;
         }
 
         [RubyMethod("parent=")]
-        public static void SetParent(BaseElement/*!*/ self, Object/*!*/ parent) {
+        public static void SetParent(BaseElement/*!*/ self, IHpricotDataContainer/*!*/ parent) {
             self._data.Parent = parent;
         }
     }

diff --git a/src/HpricotScanner.cs b/src/HpricotScanner.cs
@@ -1163,10 +1163,7 @@ public class HpricotScanner {
                             }
                         }
 
-                        if (he.Parent != null) {
+                        e = hee.Parent;
-                            Debug.Assert(he.Parent is IHpricotDataContainer, "he.Parent is not an instance of IHpricotDataContainer");
-                        }
-                        e = hee.Parent as IHpricotDataContainer;
                     }
 
                     if (match == null) {
@@ -1218,8 +1215,7 @@ public class HpricotScanner {
                         match = e;
                         break;
                     }
-
+                    e = he.Parent;
-                    e = he.Parent as IHpricotDataContainer;
                 }
 
                 if (match == null) {
@@ -1233,8 +1229,7 @@ public class HpricotScanner {
                     // TODO: couldn't find this in the original implementation but it still sounds right.
                     he.ETag = ele;
 
-                    Debug.Assert(he.Parent is IHpricotDataContainer, "he.Parent is not an instance of IHpricotDataContainer");
+                    state.Focus = he.Parent;
-                    state.Focus = he.Parent as IHpricotDataContainer;
                     state.Last = null;
                 }
 

diff --git a/src/Initializers.Generated.cs b/src/Initializers.Generated.cs
@@ -89,13 +89,13 @@ public sealed class HpricotLibraryInitializer : IronRuby.Builtins.LibraryInitial
 
         private static void LoadHpricot__BaseEle_Instance(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "parent", 0x11, 
-                0x00000000U, 
+                0x00000000U,
-                new Func<IronRuby.Hpricot.BaseElement, System.Object>(IronRuby.Hpricot.BaseElement.GetParent)
+                new Func<IronRuby.Hpricot.BaseElement, IronRuby.Hpricot.IHpricotDataContainer>(IronRuby.Hpricot.BaseElement.GetParent)
             );
 
             DefineLibraryMethod(module, "parent=", 0x11, 
-                0x00000000U, 
+                0x00000000U,
-                new Action<IronRuby.Hpricot.BaseElement, System.Object>(IronRuby.Hpricot.BaseElement.SetParent)
+                new Action<IronRuby.Hpricot.BaseElement, IronRuby.Hpricot.IHpricotDataContainer>(IronRuby.Hpricot.BaseElement.SetParent)
             );
 
             DefineLibraryMethod(module, "raw_string", 0x11,