Chromium Code Reviews| Index: tools/dom/scripts/generator.py |
| diff --git a/tools/dom/scripts/generator.py b/tools/dom/scripts/generator.py |
| index 2e50632781552a463dd25ecef24913e46e1dac61..f8a77795126d6ddfcebd36eb28997fc73afa5d69 100644 |
| --- a/tools/dom/scripts/generator.py |
| +++ b/tools/dom/scripts/generator.py |
| @@ -819,15 +819,15 @@ dart_annotations = { |
| ], |
| } |
| -def GetComments(interface_name, member_name=None, library_name=None): |
| +def GetComments(library_name, interface_name, member_name=None): |
|
blois
2013/01/31 23:10:25
better!
|
| """ Finds all comments for the interface or member and returns a list. """ |
| # Add documentation from JSON. |
| comments = [] |
| if library_name in _dom_json and interface_name in _dom_json[library_name]: |
| - if member_name and (member_name in |
| - _dom_json[library_name][interface_name]['members']): |
| + if (member_name and 'members' in _dom_json[library_name][interface_name] and |
| + (member_name in _dom_json[library_name][interface_name]['members'])): |
| comments = _dom_json[library_name][interface_name]['members'][member_name] |
| elif 'comment' in _dom_json[library_name][interface_name]: |
| comments = _dom_json[library_name][interface_name]['comment'] |
| @@ -837,16 +837,14 @@ def GetComments(interface_name, member_name=None, library_name=None): |
| return comments |
| -def GetAnnotationsAndComments(interface_name, member_name=None, |
| - library_name=None): |
| - annotations = GetComments(interface_name, member_name, library_name) |
| - annotations = annotations + (FindCommonAnnotations(interface_name, |
| - member_name, |
| - library_name)) |
| +def GetAnnotationsAndComments(library_name, interface_name, member_name=None): |
| + annotations = GetComments(library_name, interface_name, member_name) |
| + annotations = annotations + (FindCommonAnnotations(library_name, interface_name, |
| + member_name)) |
| return annotations |
| -def FindCommonAnnotations(interface_name, member_name=None, library_name=None): |
| +def FindCommonAnnotations(library_name, interface_name, member_name=None): |
| """ Finds annotations common between dart2js and dartium. |
| """ |
| if member_name: |
| @@ -866,13 +864,12 @@ def FindCommonAnnotations(interface_name, member_name=None, library_name=None): |
| return annotations |
| -def FindDart2JSAnnotationsAndComments(idl_type, interface_name, member_name, |
| - library_name=None): |
| +def FindDart2JSAnnotationsAndComments(idl_type, library_name, interface_name, |
| + member_name,): |
| """ Finds all annotations for Dart2JS members- including annotations for |
| both dart2js and dartium. |
| """ |
| - annotations = GetAnnotationsAndComments(interface_name, member_name, |
| - library_name) |
| + annotations = GetAnnotationsAndComments(library_name, interface_name, member_name) |
| ann2 = _FindDart2JSSpecificAnnotations(idl_type, interface_name, member_name) |
| if ann2: |