auto merge of #1910 : Ms2ger/servo/dead-arg-CGAbstractMethod, r=jdm

This commit is contained in:
bors-servo 2014-03-19 18:37:51 -04:00
commit 26f9543e60

View file

@ -2013,7 +2013,7 @@ class CGAbstractMethod(CGThing):
self.templateArgs = templateArgs self.templateArgs = templateArgs
self.pub = pub; self.pub = pub;
self.unsafe = unsafe self.unsafe = unsafe
def _argstring(self, declare): def _argstring(self):
return ', '.join([a.declare() for a in self.args]) return ', '.join([a.declare() for a in self.args])
def _template(self): def _template(self):
if self.templateArgs is None: if self.templateArgs is None:
@ -2042,12 +2042,12 @@ class CGAbstractMethod(CGThing):
def _unsafe_close(self): def _unsafe_close(self):
return "\n }\n" if self.unsafe else "" return "\n }\n" if self.unsafe else ""
def define(self, fromDeclare=False): def define(self):
return self.definition_prologue(fromDeclare) + "\n" + self.definition_body() + self.definition_epilogue() return self.definition_prologue() + "\n" + self.definition_body() + self.definition_epilogue()
def definition_prologue(self, fromDeclare): def definition_prologue(self):
return "%sfn %s%s(%s)%s {%s" % (self._decorators(), self.name, self._template(), return "%sfn %s%s(%s)%s {%s" % (self._decorators(), self.name, self._template(),
self._argstring(fromDeclare), self._returnType(), self._unsafe_open()) self._argstring(), self._returnType(), self._unsafe_open())
def definition_epilogue(self): def definition_epilogue(self):
return "%s}\n" % self._unsafe_close() return "%s}\n" % self._unsafe_close()
def definition_body(self): def definition_body(self):