Updated Html5 from IDL definitions with fixed generator

Sebastian Loncar · Sebastian Loncar · commit edb0348e3634 · 2014-11-30T17:19:59.000+01:00
diff --git a/DefGenerators/WebIDLParser/generator/Types.cs b/DefGenerators/WebIDLParser/generator/Types.cs
@@ -313,7 +313,7 @@ public void checkGenerateEnumerator()
                 if (attr is TNameAttribute)
                 {
                     var nameAttr = attr as TNameAttribute;
-                    if (nameAttr.name == "IndexedGetter")
+                    if (nameAttr.name == "IndexedGetter" || nameAttr.name == "NamedGetter")
                     {
 
                         var typeName = "";
@@ -330,7 +330,11 @@ public void checkGenerateEnumerator()
                         jsAttributes.Add("NativeEnumerator", "false");
                         jsAttributes.Add("NativeArrayEnumerator", "true");
 
-                        baseType.Add(new TType() { name = "IJsArrayEnumerable", genericType = new TType() { name = typeName }, canCorrect = false });
+                        var iface = new TType() { name = "IJsArrayEnumerable", genericType = new TType() { name = typeName }, canCorrect = false };
+                        if (parentHasNamedAttribute("IndexedGetter") || parentHasNamedAttribute("NamedGetter"))
+                            break;
+
+                        baseType.Add(iface);
                         var str = @"
 	{TYPE} IJsArrayEnumerable<{TYPE}>.this[JsNumber index] {
 		get { throw new NotImplementedException(); }
@@ -350,11 +354,48 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
 ";
                         str = str.Replace("{TYPE}", typeName);
                         members.Add(new TFragmentMember(this) { text = str });
+
+                        break;
                     }
                 }
             }
         }
 
+        //public bool hasBaseType(TType t)
+        //{
+        //    foreach (var bt in baseType) {
+        //        if (bt.isSameType(t))
+        //        {
+        //            return true;
+        //        }
+        //        var ft = Generator.findType(bt.name);
+        //        if (ft != null)
+        //            if (ft.hasBaseType(t))
+        //                return true;
+        //    }
+        //    return false;
+        //}
+
+        public bool parentHasNamedAttribute(string name)
+        {
+            foreach (var bt in baseType)
+            {
+                var ft = Generator.findType(bt.name);
+                if (ft != null)
+                {
+                    foreach (var attr in ft.attributes)
+                        if (attr is TNameAttribute)
+                        {
+                            if ((attr as TNameAttribute).name == name)
+                                return true;
+                        }
+                    if (ft.parentHasNamedAttribute(name))
+                        return true;
+                }
+            }
+            return false;
+        }
+
         public void createSubConstructors()
         {
             var subTypes = Generator.findByBaseType(name);
@@ -471,7 +512,9 @@ public override void write(StringBuilder sb, bool impl = false)
 
     public class TMethod : TMember
     {
-        public TMethod(TFileType parentType) : base(parentType) {
+        public TMethod(TFileType parentType)
+            : base(parentType)
+        {
             //if (parentType == null) throw new ArgumentException("parentType");
         }
 
@@ -766,6 +809,19 @@ public void correctType()
             }
         }
 
+        public bool isSameType(TType t)
+        {
+            if (t == null) return false;
+            if (t.name == name) return false;
+            if (t.genericType != null || genericType != null)
+            {
+                if (t.genericType == null && genericType == null) return false;
+                if (t.genericType != null && genericType != null) return false;
+                if (!t.genericType.isSameType(genericType)) return false;
+            }
+            return true;
+        }
+
         private void trySetNewTypes()
         {
             var dict = new Dictionary<string, string>();
diff --git a/Defs/Html/generated/dom/PropertyNodeList.cs b/Defs/Html/generated/dom/PropertyNodeList.cs
@@ -69,28 +69,12 @@ namespace SharpKit.Html
 using SharpKit.Html.workers;
 
 [JsType(JsMode.Prototype, NativeEnumerator = false, NativeArrayEnumerator = true, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "PropertyNodeList")]
-public partial class PropertyNodeList : NodeList, IJsArrayEnumerable<Node>
+public partial class PropertyNodeList : NodeList
 {
 	public  MicroDataItemValue getValues() { return default(MicroDataItemValue); }
 	[JsProperty(NativeIndexer = true)]
 	public  Node this[int index] {get { return default(Node); } set {}}
 	public  int length {get; set; }
-
-	Node IJsArrayEnumerable<Node>.this[JsNumber index] {
-		get { throw new NotImplementedException(); }
-	}
-
-	JsNumber IJsArrayEnumerable<Node>.length {
-		get { throw new NotImplementedException(); }
-	}
-
-	System.Collections.Generic.IEnumerator<Node> System.Collections.Generic.IEnumerable<Node>.GetEnumerator() {
-		throw new NotImplementedException();
-	}
-
-	System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
-		throw new NotImplementedException();
-	}
 }
 
 }
diff --git a/Defs/Html/generated/html/HTMLFormControlsCollection.cs b/Defs/Html/generated/html/HTMLFormControlsCollection.cs
@@ -69,26 +69,10 @@ namespace SharpKit.Html
 using SharpKit.Html.workers;
 
 [JsType(JsMode.Prototype, NativeEnumerator = false, NativeArrayEnumerator = true, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLFormControlsCollection")]
-public partial class HtmlFormControlsCollection : HtmlCollection, IJsArrayEnumerable<Node>
+public partial class HtmlFormControlsCollection : HtmlCollection
 {
 	[JsProperty(NativeIndexer = true)]
 	public  Node this[string name] {get { return default(Node); } set {}}
-
-	Node IJsArrayEnumerable<Node>.this[JsNumber index] {
-		get { throw new NotImplementedException(); }
-	}
-
-	JsNumber IJsArrayEnumerable<Node>.length {
-		get { throw new NotImplementedException(); }
-	}
-
-	System.Collections.Generic.IEnumerator<Node> System.Collections.Generic.IEnumerable<Node>.GetEnumerator() {
-		throw new NotImplementedException();
-	}
-
-	System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
-		throw new NotImplementedException();
-	}
 }
 
 }
diff --git a/Defs/Html/generated/html/HTMLOptionsCollection.cs b/Defs/Html/generated/html/HTMLOptionsCollection.cs
@@ -68,7 +68,7 @@ namespace SharpKit.Html
 using SharpKit.Html.svg;
 using SharpKit.Html.workers;
 
-[JsType(JsMode.Prototype, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLOptionsCollection")]
+[JsType(JsMode.Prototype, NativeEnumerator = false, NativeArrayEnumerator = true, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLOptionsCollection")]
 public partial class HtmlOptionsCollection : HtmlCollection
 {
 	public  int selectedIndex {get; set; }
diff --git a/Defs/Html/generated/html/HTMLPropertiesCollection.cs b/Defs/Html/generated/html/HTMLPropertiesCollection.cs
@@ -69,30 +69,14 @@ namespace SharpKit.Html
 using SharpKit.Html.workers;
 
 [JsType(JsMode.Prototype, NativeEnumerator = false, NativeArrayEnumerator = true, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLPropertiesCollection")]
-public partial class HtmlPropertiesCollection : HtmlCollection, IJsArrayEnumerable<Node>
+public partial class HtmlPropertiesCollection : HtmlCollection
 {
 	public  int length {get; set; }
 	[JsProperty(NativeIndexer = true)]
 	public  Node this[int index] {get { return default(Node); } set {}}
 	public  DOMStringList names {get; set; }
 	[JsProperty(NativeIndexer = true)]
 	public  PropertyNodeList this[string name] {get { return default(PropertyNodeList); } set {}}
-
-	Node IJsArrayEnumerable<Node>.this[JsNumber index] {
-		get { throw new NotImplementedException(); }
-	}
-
-	JsNumber IJsArrayEnumerable<Node>.length {
-		get { throw new NotImplementedException(); }
-	}
-
-	System.Collections.Generic.IEnumerator<Node> System.Collections.Generic.IEnumerable<Node>.GetEnumerator() {
-		throw new NotImplementedException();
-	}
-
-	System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
-		throw new NotImplementedException();
-	}
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace SharpKit.Html`
`68`	`68`	`using SharpKit.Html.svg;`
`69`	`69`	`using SharpKit.Html.workers;`
`70`	`70`
`71`		`-[JsType(JsMode.Prototype, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLOptionsCollection")]`
	`71`	`+[JsType(JsMode.Prototype, NativeEnumerator = false, NativeArrayEnumerator = true, Export = false, PropertiesAsFields = true, NativeCasts = true, Name = "HTMLOptionsCollection")]`
`72`	`72`	`public partial class HtmlOptionsCollection : HtmlCollection`
`73`	`73`	`{`
`74`	`74`	`public int selectedIndex {get; set; }`