wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

remove in/out/inout syntax in favor of parent:, child:, and both: labels

Browse Source
This commit is contained in:
Chris Jones 2009-07-10 19:19:54 -05:00
parent ca80c305cb
commit c73832e4e0
6 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dom/ipc/IFrameEmbedding.ipdl
View File

@ -3,12 +3,13 @@ using PRUint32;
rpc protocol IFrameEmbedding
{
rpc out init(MagicWindowHandle parentWidget);
child:
rpc init(MagicWindowHandle parentWidget);
rpc out loadURL(String uri);
rpc loadURL(String uri);
rpc out move(PRUint32 x,
PRUint32 y,
PRUint32 width,
PRUint32 height);
rpc move(PRUint32 x,
PRUint32 y,
PRUint32 width,
PRUint32 height);
};

8
dom/plugins/NPAPI.ipdl
View File

@ -13,14 +13,14 @@ rpc protocol NPAPI
manages NPP;
// manages NPObject;
rpc out NP_Initialize() returns (NPError rv);
child:
rpc NP_Initialize() returns (NPError rv);
rpc out NPP(String aMimeType,
rpc NPP(String aMimeType,
uint16_t aMode,
StringArray aNames,
StringArray aValues) returns (NPError rv);
rpc out ~NPP() returns (NPError rv);
rpc ~NPP() returns (NPError rv);
// rpc in TradeNPPsForSomeReason(NPP n) returns (NPP n2);
};

8
dom/plugins/NPP.ipdl
View File

@ -15,10 +15,12 @@ rpc protocol NPP
// manages NPStream;
rpc out NPP_SetWindow(NPWindow window) returns (NPError rv);
child:
rpc NPP_SetWindow(NPWindow window) returns (NPError rv);
rpc NPP_GetValue(String key) returns (String value);
rpc out NPP_GetValue(String key) returns (String value);
rpc in NPN_GetValue(String key) returns (String value);
parent:
rpc NPN_GetValue(String key) returns (String value);
};
} // namespace plugins

2
ipc/ipdl/ipdl/ast.py
View File

@ -204,7 +204,7 @@ class OUT:
@classmethod
def __str__(cls): return cls.pretty
@staticmethod
def pretty(ss): return _prettyTable['out'][ss.pretty]
def prettySS(ss): return _prettyTable['out'][ss.pretty]
_prettyTable = {
IN : { 'async': 'AsyncRecv',

84
ipc/ipdl/ipdl/parser.py
View File

@ -64,6 +64,7 @@ class Parser:
self.lexer = None
self.parser = None
self.tu = TranslationUnit()
self.direction = None
def parse(self, input, filename, includedirs):
assert os.path.isabs(filename)
@ -88,7 +89,7 @@ class Parser:
Parser.current = self
ast = self.parser.parse(input=input, lexer=self.lexer,
debug=self.debug)
debug=self.debug)
Parser.current = Parser.parseStack.pop()
return ast
@ -124,15 +125,15 @@ def locFromTok(p, num):
reserved = set((
'answer',
'async',
'both',
'call',
'child',
'goto',
'in',
'include',
'inout',
'manager',
'manages',
'namespace',
'out',
'parent',
'protocol',
'recv',
'returns',
@ -276,19 +277,49 @@ def p_ManagesStmt(p):
p[0] = ManagesStmt(locFromTok(p, 1), p[2])
def p_MessageDecls(p):
"""MessageDecls : MessageDecls MessageDecl ';'
| MessageDecl ';'"""
if 3 == len(p):
"""MessageDecls : MessageDecls MessageDeclThing
| MessageDeclThing"""
if 2 == len(p):
p[0] = [ p[1] ]
else:
p[1].append(p[2])
p[0] = p[1]
def p_MessageDeclThing(p):
"""MessageDeclThing : MessageDirectionLabel ':' MessageDecl ';'
| MessageDecl ';'"""
if 3 == len(p):
p[0] = p[1]
else:
p[0] = p[3]
def p_MessageDirectionLabel(p):
"""MessageDirectionLabel : PARENT
| CHILD
| BOTH"""
if p[1] == 'parent':
Parser.current.direction = IN
elif p[1] == 'child':
Parser.current.direction = OUT
elif p[1] == 'both':
Parser.current.direction = INOUT
else:
assert 0
def p_MessageDecl(p):
"""MessageDecl : SendSemanticsQual DirectionQual MessageBody"""
msg = p[3]
msg.sendSemantics = p[1]
msg.direction = p[2]
"""MessageDecl : SendSemanticsQual MessageBody
| MessageBody"""
if Parser.current.direction is None:
p_error(p[1])
if 2 == len(p):
msg = p[1]
msg.sendSemantics = ASYNC
else:
msg = p[2]
msg.sendSemantics = p[1]
msg.direction = Parser.current.direction
p[0] = msg
def p_MessageBody(p):
@ -323,16 +354,21 @@ def p_MessageOutParams(p):
## State machine
def p_TransitionStmts(p):
"""TransitionStmts : TransitionStmts TransitionStmt
| TransitionStmt
"""TransitionStmts : TransitionStmtsNonEmpty
| """
if 2 == len(p):
p[0] = p[1]
else:
p[0] = [ ]
def p_TransitionStmtsNonEmpty(p):
"""TransitionStmtsNonEmpty : TransitionStmtsNonEmpty TransitionStmt
| TransitionStmt"""
if 3 == len(p):
p[1].append(p[2])
p[0] = p[1]
elif 2 == len(p):
p[0] = [ p[1] ]
else:
p[0] = [ ]
def p_TransitionStmt(p):
"""TransitionStmt : State ':' Transitions"""
@ -368,12 +404,7 @@ def p_State(p):
def p_SendSemanticsQual(p):
"""SendSemanticsQual : ASYNC
| RPC
| SYNC
| """
if 1 == len(p):
p[0] = ASYNC
return
| SYNC"""
s = p[1]
if 'async' == s: p[0] = ASYNC
elif 'rpc' == s: p[0] = RPC
@ -381,17 +412,6 @@ def p_SendSemanticsQual(p):
else:
assert 0
def p_DirectionQual(p):
"""DirectionQual : IN
| INOUT
| OUT"""
s = p[1]
if 'in' == s: p[0] = IN
elif 'inout' == s: p[0] = INOUT
elif 'out' == s: p[0] = OUT
else:
assert 0
def p_ParamList(p):
"""ParamList : ParamList ',' Param
| Param

2
ipc/ipdl/ipdl/type.py
View File

@ -796,4 +796,4 @@ class CheckTypes(Visitor):
loc, "%s %s message `%s' is not `%s'd",
mtype.sendSemantics.pretty, mtype.direction.pretty,
t.msg.progname,
trigger))
t.trigger.pretty))