Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: tools/dom/scripts/htmldartgenerator.py

Issue 14976004: Remove more question marks. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sdk/lib/web_gl/dartium/web_gl_dartium.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/dom/scripts/htmldartgenerator.py
diff --git a/tools/dom/scripts/htmldartgenerator.py b/tools/dom/scripts/htmldartgenerator.py
index 26aab5a3faa007afdde7b28ac064c5385ba56cbe..05e0b21029df712dffacc9abf08476e7ea8266e7 100644
--- a/tools/dom/scripts/htmldartgenerator.py
+++ b/tools/dom/scripts/htmldartgenerator.py
@@ -239,22 +239,22 @@ class HtmlDartGenerator(object):
def GenerateChecksAndCall(signature_index, argument_count):
checks = []
- for i in range(0, argument_count):
+ for i in reversed(range(0, argument_count)):
argument = signatures[signature_index][i]
parameter_name = parameter_names[i]
test_type = self._DartType(argument.type.id)
if test_type in ['dynamic', 'Object']:
- checks.append('?%s' % parameter_name)
+ checks.append('%s != null' % parameter_name)
elif not can_omit_type_check(test_type, i):
checks.append('(%s is %s || %s == null)' % (
parameter_name, test_type, parameter_name))
elif i >= number_of_required_in_dart:
- checks.append('?%s' % parameter_name)
+ checks.append('%s != null' % parameter_name)
# There can be multiple presence checks. We need them all since a later
# optional argument could have been passed by name, leaving 'holes'.
- checks.extend(['!?%s' % name for name in parameter_names[argument_count:]])
+ checks.extend(['%s == null' % name for name in parameter_names[argument_count:]])
GenerateCall(signature_index, argument_count, checks)
@@ -292,7 +292,7 @@ class HtmlDartGenerator(object):
argument_count = len(signature)
for argument_position, argument in list(enumerate(signature))[::-1]:
if is_optional(0, argument):
- check = '?%s' % parameter_names[argument_position]
+ check = '%s != null' % parameter_names[argument_position]
# argument_count instead of argument_position + 1 is used here to cover one
# complicated case with the effectively optional argument in the middle.
# Consider foo(x, optional y, [Default=NullString] optional z)
@@ -375,10 +375,8 @@ class HtmlDartGenerator(object):
if not factory_constructor_name:
factory_constructor_name = '_create'
factory_parameters = constructor_info.ParametersAsArgumentList()
- has_factory_provider = True
else:
factory_parameters = ', '.join(constructor_info.factory_parameters)
- has_factory_provider = False
if constructor_info.pure_dart_constructor:
# TODO(antonm): use common dispatcher generation for this case as well.
« no previous file with comments | « sdk/lib/web_gl/dartium/web_gl_dartium.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698