Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1212027 - part 1 - rename ipdl lowering helpers to reflect intent, not function; r=jld

Browse Source 
The functions:

- _callCxxArrayInsertSorted
- _callCxxArrayRemoveSorted
- _callCxxArrayClear
- _cxxArrayHasElementSorted

are only ever used to touch the managed sub-protocol arrays of a
protocol.  It would be better if they reflected the *intent* of what
they were doing, rather than what C++ function they were calling, since
we're about to change that.
This commit is contained in:
Nathan Froyd 2015-10-06 21:20:07 -04:00
parent f314237861
commit 278e9ff8b1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipc/ipdl/ipdl/lower.py
View File

@ -352,21 +352,21 @@ def _callCxxSwapArrayElements(arr1, arr2, sel='.'):
return ExprCall(ExprSelect(arr1, sel, 'SwapElements'),
args=[ arr2 ])
def _callCxxArrayInsertSorted(arr, elt):
return ExprCall(ExprSelect(arr, '.', 'InsertElementSorted'),
args=[ elt ])
def _callInsertManagedActor(managees, actor):
return ExprCall(ExprSelect(managees, '.', 'InsertElementSorted'),
args=[ actor ])
def _callCxxArrayRemoveSorted(arr, elt):
return ExprCall(ExprSelect(arr, '.', 'RemoveElementSorted'),
args=[ elt ])
def _callRemoveManagedActor(managees, actor):
return ExprCall(ExprSelect(managees, '.', 'RemoveElementSorted'),
args=[ actor ])
def _callCxxArrayClear(arr):
return ExprCall(ExprSelect(arr, '.', 'Clear'))
def _callClearManagedActors(managees):
return ExprCall(ExprSelect(managees, '.', 'Clear'))
def _cxxArrayHasElementSorted(arr, elt):
def _callHasManagedActor(managees, actor):
return ExprBinary(
ExprSelect(arr, '.', 'NoIndex'), '!=',
ExprCall(ExprSelect(arr, '.', 'BinaryIndexOf'), args=[ elt ]))
ExprSelect(managees, '.', 'NoIndex'), '!=',
ExprCall(ExprSelect(managees, '.', 'BinaryIndexOf'), args=[ actor ]))
def _otherSide(side):
if side == 'child': return 'parent'
@ -3497,7 +3497,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
# stragglers, no outside C++ is being invoked (except
# Dealloc(subactor))
foreachdealloc,
StmtExpr(_callCxxArrayClear(p.managedVar(managed, self.side))),
StmtExpr(_callClearManagedActors(p.managedVar(managed, self.side))),
])
deallocsubtree.addstmt(block)
@ -3958,7 +3958,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
_actorChannel(actorvar),
p.channelForSubactor())),
StmtExpr(ExprAssn(_actorState(actorvar), _actorState(ithkid))),
StmtExpr(_callCxxArrayInsertSorted(manageearray, actorvar)),
StmtExpr(_callInsertManagedActor(manageearray, actorvar)),
registerstmt,
StmtExpr(ExprCall(
ExprSelect(actorvar,
@ -4002,10 +4002,10 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
StmtDecl(Decl(manageecxxtype, actorvar.name),
ExprCast(listenervar, manageecxxtype, static=1)),
_abortIfFalse(
_cxxArrayHasElementSorted(manageearray, actorvar),
_callHasManagedActor(manageearray, actorvar),
"actor not managed by this!"),
Whitespace.NL,
StmtExpr(_callCxxArrayRemoveSorted(manageearray, actorvar)),
StmtExpr(_callRemoveManagedActor(manageearray, actorvar)),
StmtExpr(ExprCall(_deallocMethod(manageeipdltype, self.side),
args=[ actorvar ])),
StmtReturn()
@ -4945,7 +4945,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
StmtExpr(ExprAssn(_actorManager(actorvar), ExprVar.THIS)),
StmtExpr(ExprAssn(_actorChannel(actorvar),
self.protocol.channelForSubactor())),
StmtExpr(_callCxxArrayInsertSorted(
StmtExpr(_callInsertManagedActor(
self.protocol.managedVar(md.decl.type.constructedType(),
self.side),
actorvar)),