aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen/GlobalGen.py
diff options
context:
space:
mode:
authorSankha Narayan Guria <sankha93@gmail.com>2014-02-27 03:31:05 +0530
committerSankha Narayan Guria <sankha93@gmail.com>2014-02-27 03:31:05 +0530
commit1e9fec9172364346937f375e315e1ce745662611 (patch)
treea55173568e6dd6a8b4cb4dfcc42ed81204d49874 /src/components/script/dom/bindings/codegen/GlobalGen.py
parent47e6e6ec8f2dfbd56e50f9f2ec2762b85087d948 (diff)
parentda16e54243e256dee927f720ce6b9903b62ec14e (diff)
downloadservo-1e9fec9172364346937f375e315e1ce745662611.tar.gz
servo-1e9fec9172364346937f375e315e1ce745662611.zip
Merge master into this branch
Diffstat (limited to 'src/components/script/dom/bindings/codegen/GlobalGen.py')
-rw-r--r--src/components/script/dom/bindings/codegen/GlobalGen.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/GlobalGen.py b/src/components/script/dom/bindings/codegen/GlobalGen.py
index 9f46c786065..bd8b3d70793 100644
--- a/src/components/script/dom/bindings/codegen/GlobalGen.py
+++ b/src/components/script/dom/bindings/codegen/GlobalGen.py
@@ -83,12 +83,14 @@ def main():
# Generate the type list.
generate_file(config, 'InterfaceTypes', 'declare+define')
+ # Generate the type list.
+ generate_file(config, 'InheritTypes', 'declare+define')
+
# Generate the module declarations.
generate_file(config, 'BindingDeclarations', 'declare+define')
- #XXXjdm No union support yet
- #generate_file(config, 'UnionTypes', 'declare')
- #generate_file(config, 'UnionConversions', 'declare')
+ generate_file(config, 'UnionTypes', 'declare+define')
+ generate_file(config, 'UnionConversions', 'declare+define')
if __name__ == '__main__':
main()