aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen/GlobalGen.py
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-02-24 20:01:39 -0500
committerbors-servo <release+servo@mozilla.com>2014-02-24 20:01:39 -0500
commitdf993fdaf3c1c031154389a0832914d133bc722a (patch)
tree490a4e28d74ee67ccba2a7b116da3311cbe1e66f /src/components/script/dom/bindings/codegen/GlobalGen.py
parent998710d907964da4d39d80075dc45171ce3adabe (diff)
parent232ca597089cff647fcdef2a3cfd2030393ba84b (diff)
downloadservo-df993fdaf3c1c031154389a0832914d133bc722a.tar.gz
servo-df993fdaf3c1c031154389a0832914d133bc722a.zip
auto merge of #1689 : jdm/servo/unions, r=kmcallister
Seven hours on a train without internet will do this to you. Fixes #541.
Diffstat (limited to 'src/components/script/dom/bindings/codegen/GlobalGen.py')
-rw-r--r--src/components/script/dom/bindings/codegen/GlobalGen.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/GlobalGen.py b/src/components/script/dom/bindings/codegen/GlobalGen.py
index ffbf31a4b48..bd8b3d70793 100644
--- a/src/components/script/dom/bindings/codegen/GlobalGen.py
+++ b/src/components/script/dom/bindings/codegen/GlobalGen.py
@@ -89,9 +89,8 @@ def main():
# 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()