Index: client/dom/scripts/systeminterface.py |
diff --git a/client/dom/scripts/systeminterface.py b/client/dom/scripts/systeminterface.py |
index fb798f688e2ea35c1e39045b8c887d4ac962fae4..71652084be92194e4281af35916c9351c3d0b28d 100644 |
--- a/client/dom/scripts/systeminterface.py |
+++ b/client/dom/scripts/systeminterface.py |
@@ -98,7 +98,7 @@ class DartInterfaceGenerator(object): |
# TODO(vsm): Remove source_filter. |
if MatchSourceFilter(self._source_filter, parent): |
# Parent is a DOM type. |
- extends.append(parent.type.id) |
+ extends.append(DartType(parent.type.id)) |
elif '<' in parent.type.id: |
# Parent is a Dart collection type. |
# TODO(vsm): Make this check more robust. |
@@ -149,8 +149,8 @@ class DartInterfaceGenerator(object): |
' $CTOR.fromList(List<$TYPE> list);\n' |
'\n' |
' $CTOR.fromBuffer(ArrayBuffer buffer);\n', |
- CTOR=self._interface.id, |
- TYPE=element_type) |
+ CTOR=self._interface.id, |
+ TYPE=DartType(element_type)) |
def FinishInterface(self): |
@@ -176,17 +176,17 @@ class DartInterfaceGenerator(object): |
def _EmitConstant(self, emitter, constant): |
emitter.Emit('\n static final $TYPE $NAME = $VALUE;\n', |
NAME=constant.id, |
- TYPE=constant.type.id, |
+ TYPE=DartType(constant.type.id), |
VALUE=constant.value) |
def AddAttribute(self, getter, setter): |
if getter and setter and getter.type.id == setter.type.id: |
self._members_emitter.Emit('\n $TYPE $NAME;\n', |
- NAME=getter.id, TYPE=getter.type.id); |
+ NAME=getter.id, TYPE=DartType(getter.type.id)); |
return |
if getter and not setter: |
self._members_emitter.Emit('\n final $TYPE $NAME;\n', |
- NAME=getter.id, TYPE=getter.type.id); |
+ NAME=getter.id, TYPE=DartType(getter.type.id)); |
return |
raise Exception('Unexpected getter/setter combination %s %s' % |
(getter, setter)) |