Merge pull request #3073 from Manishearth/macro-getters

Create and use attribute getter macros; r=Ms2ger

src/components/script/dom/htmlimageelement.rs

@@ -16,7 +16,6 @@ use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, NodeHelpers, window_from_node};
 use dom::virtualmethods::VirtualMethods;
-
 use servo_net::image_cache_task;
 use servo_util::atom::Atom;
 use servo_util::geometry::to_px;
@@ -96,40 +95,28 @@ impl LayoutHTMLImageElementHelpers for JS<HTMLImageElement> {
 }
 
 impl<'a> HTMLImageElementMethods for JSRef<'a, HTMLImageElement> {
-    fn Alt(&self) -> DOMString {
+    make_getter!(Alt)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("alt")
-    }
 
     fn SetAlt(&self, alt: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_string_attribute("alt", alt)
     }
 
-    fn Src(&self) -> DOMString {
+    make_getter!(Src)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("src")
-    }
 
     fn SetSrc(&self, src: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_url_attribute("src", src)
     }
 
-    fn UseMap(&self) -> DOMString {
+    make_getter!(UseMap)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("useMap")
-    }
 
     fn SetUseMap(&self, use_map: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_string_attribute("useMap", use_map)
     }
 
-    fn IsMap(&self) -> bool {
+    make_bool_getter!(IsMap)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        from_str::<bool>(element.get_string_attribute("hspace").as_slice()).unwrap()
-    }
 
     fn SetIsMap(&self, is_map: bool) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
@@ -158,60 +145,42 @@ impl<'a> HTMLImageElementMethods for JSRef<'a, HTMLImageElement> {
         elem.set_uint_attribute("height", height)
     }
 
-    fn Name(&self) -> DOMString {
+    make_getter!(Name)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("name")
-    }
 
     fn SetName(&self, name: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_string_attribute("name", name)
     }
 
-    fn Align(&self) -> DOMString {
+    make_getter!(Align)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("align")
-    }
 
     fn SetAlign(&self, align: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_string_attribute("align", align)
     }
 
-    fn Hspace(&self) -> u32 {
+    make_uint_getter!(Hspace)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_uint_attribute("hspace")
-    }
 
     fn SetHspace(&self, hspace: u32) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_uint_attribute("hspace", hspace)
     }
 
-    fn Vspace(&self) -> u32 {
+    make_uint_getter!(Vspace)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_uint_attribute("vspace")
-    }
 
     fn SetVspace(&self, vspace: u32) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_uint_attribute("vspace", vspace)
     }
 
-    fn LongDesc(&self) -> DOMString {
+    make_getter!(LongDesc)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("longdesc")
-    }
 
     fn SetLongDesc(&self, longdesc: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);
         element.set_string_attribute("longdesc", longdesc)
     }
 
-    fn Border(&self) -> DOMString {
+    make_getter!(Border)
-        let element: &JSRef<Element> = ElementCast::from_ref(self);
-        element.get_string_attribute("border")
-    }
 
     fn SetBorder(&self, border: DOMString) {
         let element: &JSRef<Element> = ElementCast::from_ref(self);

src/components/script/dom/macros.rs

@@ -0,0 +1,44 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#![macro_escape]
+
+#[macro_export]
+macro_rules! make_getter(
+    ( $attr:ident ) => (
+        fn $attr(&self) -> DOMString {
+            use dom::element::{Element, AttributeHandlers};
+            use dom::bindings::codegen::InheritTypes::ElementCast;
+            use std::ascii::StrAsciiExt;
+            let element: &JSRef<Element> = ElementCast::from_ref(self);
+            element.get_string_attribute(stringify!($attr).to_ascii_lower().as_slice())
+        }
+    );
+)
+
+#[macro_export]
+macro_rules! make_bool_getter(
+    ( $attr:ident ) => (
+        fn $attr(&self) -> bool {
+            use dom::element::{Element, AttributeHandlers};
+            use dom::bindings::codegen::InheritTypes::ElementCast;
+            use std::ascii::StrAsciiExt;
+            let element: &JSRef<Element> = ElementCast::from_ref(self);
+            element.has_attribute(stringify!($attr).to_ascii_lower().as_slice())
+        }
+    );
+)
+
+#[macro_export]
+macro_rules! make_uint_getter(
+    ( $attr:ident ) => (
+        fn $attr(&self) -> u32 {
+            use dom::element::{Element, AttributeHandlers};
+            use dom::bindings::codegen::InheritTypes::ElementCast;
+            use std::ascii::StrAsciiExt;
+            let element: &JSRef<Element> = ElementCast::from_ref(self);
+            element.get_uint_attribute(stringify!($attr).to_ascii_lower().as_slice())
+        }
+    );
+)

src/components/script/script.rs

@@ -73,6 +73,7 @@ pub mod dom {
 
     #[path="bindings/codegen/InterfaceTypes.rs"]
     pub mod types;
+    pub mod macros;
 
     pub mod attr;
     pub mod attrlist;