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

Unified Diff: client/dom/scripts/systemwrapping.py

Issue 9432024: Do not rename idl types to dart types at top level - this info is needed for native bindings genera… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Update html frog system. Created 8 years, 10 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 | « client/dom/scripts/systemnative.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/dom/scripts/systemwrapping.py
diff --git a/client/dom/scripts/systemwrapping.py b/client/dom/scripts/systemwrapping.py
index 53d79a5cbe66930c387abe44cbdf8ee497e32edb..83a9fb6147fb35327687f0e929f670b77d3befde 100644
--- a/client/dom/scripts/systemwrapping.py
+++ b/client/dom/scripts/systemwrapping.py
@@ -171,7 +171,7 @@ class WrappingInterfaceGenerator(object):
'\n'
' $TYPE get $NAME() { return $METHOD(this); }\n'
' static $TYPE $METHOD(var _this) native;\n',
- NAME=attr.id, TYPE=attr.type.id, METHOD=method_name)
+ NAME=attr.id, TYPE=DartType(attr.type.id), METHOD=method_name)
def _AddSetter(self, attr):
# FIXME: See comment on getter.
@@ -180,7 +180,7 @@ class WrappingInterfaceGenerator(object):
'\n'
' void set $NAME($TYPE value) { $METHOD(this, value); }\n'
' static void $METHOD(var _this, $TYPE value) native;\n',
- NAME=attr.id, TYPE=attr.type.id, METHOD=method_name)
+ NAME=attr.id, TYPE=DartType(attr.type.id), METHOD=method_name)
def AddSecondaryAttribute(self, interface, getter, setter):
self._SecondaryContext(interface)
@@ -217,25 +217,26 @@ class WrappingInterfaceGenerator(object):
#
# class YImpl extends ListBase<T> { copies of transitive XImpl methods; }
#
+ dart_element_type = DartType(element_type)
if self._HasNativeIndexGetter(self._interface):
- self._EmitNativeIndexGetter(self._interface, element_type)
+ self._EmitNativeIndexGetter(self._interface, dart_element_type)
else:
self._members_emitter.Emit(
'\n'
' $TYPE operator[](int index) {\n'
' return item(index);\n'
' }\n',
- TYPE=element_type)
+ TYPE=dart_element_type)
if self._HasNativeIndexSetter(self._interface):
- self._EmitNativeIndexSetter(self._interface, element_type)
+ self._EmitNativeIndexSetter(self._interface, dart_element_type)
else:
self._members_emitter.Emit(
'\n'
' void operator[]=(int index, $TYPE value) {\n'
' throw new UnsupportedOperationException("Cannot assign element of immutable List.");\n'
' }\n',
- TYPE=element_type)
+ TYPE=dart_element_type)
self._members_emitter.Emit(
'\n'
@@ -324,24 +325,24 @@ class WrappingInterfaceGenerator(object):
' Iterator<$TYPE> iterator() {\n'
' return new _FixedSizeListIterator<$TYPE>(this);\n'
' }\n',
- TYPE=element_type)
+ TYPE=dart_element_type)
def _HasNativeIndexGetter(self, interface):
return ('IndexedGetter' in interface.ext_attrs or
'NumericIndexedGetter' in interface.ext_attrs)
- def _EmitNativeIndexGetter(self, interface, element_type):
+ def _EmitNativeIndexGetter(self, interface, dart_element_type):
method_name = '_index'
self._members_emitter.Emit(
'\n'
' $TYPE operator[](int index) { return $METHOD(this, index); }\n'
' static $TYPE $METHOD(var _this, int index) native;\n',
- TYPE=element_type, METHOD=method_name)
+ TYPE=dart_element_type, METHOD=method_name)
def _HasNativeIndexSetter(self, interface):
return 'CustomIndexedSetter' in interface.ext_attrs
- def _EmitNativeIndexSetter(self, interface, element_type):
+ def _EmitNativeIndexSetter(self, interface, dart_element_type):
method_name = '_set_index'
self._members_emitter.Emit(
'\n'
@@ -349,7 +350,7 @@ class WrappingInterfaceGenerator(object):
' return $METHOD(this, index, value);\n'
' }\n'
' static $METHOD(_this, index, value) native;\n',
- TYPE=element_type, METHOD=method_name)
+ TYPE=dart_element_type, METHOD=method_name)
def AddOperation(self, info):
"""
@@ -464,9 +465,9 @@ class WrappingInterfaceGenerator(object):
# precise type than the first. E.g.,
# void foo(Node x);
# void foo(Element x);
- type = first_overload.arguments[position].type.id
+ type = DartType(first_overload.arguments[position].type.id)
test = TypeCheck(param_name, type)
- pred = lambda op: len(op.arguments) > position and op.arguments[position].type.id == type
+ pred = lambda op: len(op.arguments) > position and DartType(op.arguments[position].type.id) == type
else:
type = None
test = NullCheck(param_name)
« no previous file with comments | « client/dom/scripts/systemnative.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698