Skip to content

Commit 1fc13e2

Browse files
author
Troy Melhase
committed
Work on better zope interface example.
1 parent c8dd7ad commit 1fc13e2

6 files changed

Lines changed: 96 additions & 25 deletions

File tree

‎java2python/compiler/template.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,15 @@ def parents(self, pred=lambda v:True):
253253
yield self
254254
self = self.parent
255255

256+
def find(self, pred=lambda v:True):
257+
""" Yield each child in the family tree. """
258+
for child in self.children:
259+
if pred(child):
260+
yield child
261+
if hasattr(child, 'find'):
262+
for value in child.find(pred):
263+
yield value
264+
256265
@property
257266
def className(self):
258267
""" Returns the name of the class of this item. """
@@ -403,9 +412,7 @@ class Class(ClassMethodSharedMixin, Base):
403412

404413
def iterBases(self):
405414
""" Yields the base classes for this type. """
406-
for handler in self.configHandlers('Base'):
407-
for base in handler(self):
408-
yield base
415+
return chain(*(h(self) for h in self.configHandlers('Base')))
409416

410417
def iterDecl(self):
411418
""" Yields the declaration for this type. """
@@ -474,13 +481,17 @@ def __init__(self, config, name=None, type=None, parent=None):
474481
super(Method, self).__init__(config, name, type, parent)
475482
self.parameters.append(self.makeParam('self', 'object'))
476483

484+
def iterParams(self):
485+
""" Yields the parameters of this method template. """
486+
return chain(*(h(self) for h in self.configHandlers('Param')))
487+
477488
def iterDecl(self):
478489
""" Yields the declaration for this method template. """
479490
def formatParam(p):
480491
if 'default' in p:
481492
return '{0}={1}'.format(p['name'], p['default'])
482493
return p['name']
483-
params = ', '.join(formatParam(param) for param in self.parameters)
494+
params = ', '.join(formatParam(param) for param in self.iterParams())
484495
yield 'def {0}({1}):'.format(self.name, params)
485496

486497
def iterBody(self):

‎java2python/config/default.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@
4848
basic.simpleDocString,
4949
]
5050

51+
methodParamHandlers = [
52+
basic.defaultParams,
53+
]
54+
5155
classBaseHandlers = [
5256
basic.defaultBases,
5357
]
5458

5559
interfaceBaseHandlers = [
56-
basic.zopeInterfaceBases,
60+
basic.defaultBases,
5761
]
5862

5963
# These generators are called after a class has been completely
@@ -77,7 +81,6 @@
7781

7882

7983
interfacePostWalkMutators = [
80-
basic.zopeInterfaceMethodMutator,
8184
]
8285

8386

‎java2python/mod/basic.py‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,43 @@ def sortBody(group):
166166
obj.children = [item for grp in grpsrt for item in grp]
167167

168168

169+
def defaultParams(obj):
170+
return iter(obj.parameters)
169171

170-
def zopeInterfaceMethodMutator(obj):
171-
for method in [c for c in obj.children if c.isMethod]:
172-
if method.parameters and method.parameters[0]['name'] == 'self':
173-
method.parameters.pop(0)
172+
def zopeInterfaceMethodParams(obj):
173+
if not obj.parent.isInterface:
174+
for param in obj.parameters:
175+
yield param
176+
else:
177+
for index, param in enumerate(obj.parameters):
178+
if index != 0 and param['name'] != 'self':
179+
yield param
180+
181+
182+
normalBases = ('object', )
174183

175184

176185
def defaultBases(obj):
177-
return iter(obj.bases or ['object'])
186+
return iter(obj.bases or normalBases)
178187

179188

180189
def zopeInterfaceBases(obj):
181-
return ['zope.interface.Interface']
190+
return iter(obj.bases or ['zope.interface.Interface'])
191+
192+
193+
def implAny(obj):
194+
for module in obj.parents(lambda x:x.isModule):
195+
for name in obj.bases:
196+
if any(module.find(lambda v:v.name == name)):
197+
return True
198+
199+
200+
201+
def zopeImplementsClassBases(obj):
202+
return iter(normalBases) if implAny(obj) else defaultBases(obj)
203+
204+
205+
def zopeImplementsClassHead(obj):
206+
if implAny(obj):
207+
for cls in obj.bases:
208+
yield 'zope.interface.implements({})'.format(cls)

‎test/Interface3.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ interface C0 extends B0, B1 {
1212
}
1313

1414

15+
class Nothing {};
16+
1517
class Interface3 implements C0 {
1618
public void m(int x) {
1719
System.out.println(x);

‎test/configs/Interface3.py‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,49 @@
1+
##
2+
# This is an example of how to perform per-module configuration
3+
# for translating java interfaces to zope interfaces.
4+
#
15
from java2python.mod import basic
6+
from java2python.config import default
27

38

4-
def setZopeInterface(iface):
5-
print '##### iface.bases:', iface.bases
6-
iface.bases[:] = ['zope.interface.Interface']
7-
print '#### set zope interface', iface.bases
9+
# the j2py default head handlers for interfaces includes ABCMeta as a
10+
# metaclass. we certainly don't want that, so we redefine the list
11+
# here to only the doc string handler:
12+
interfaceHeadHandlers = [
13+
basic.simpleDocString,
14+
]
815

9-
interfacePostWalkHandlers = [
10-
setZopeInterface,
11-
]
1216

17+
# this j2py default is also not what we want, so we redefine it:
18+
methodPrologueHandlers = [
19+
basic.maybeClassMethod,
20+
]
1321

14-
# override, not supplement:
15-
interfaceHeadHandlers = [
16-
# basic.simpleDocString,
17-
]
1822

23+
# instead of the default bases, this handler supplies the base zope
24+
# Interface class for Java interfaces:
25+
interfaceBaseHandlers = [
26+
basic.zopeInterfaceBases,
27+
]
28+
29+
30+
# the parser adds implemented interfaces to the class bases list.
31+
# this handler checks to see if any of those bases are interfaces, and
32+
# if so, supresses them in favor of 'object' as the only base:
33+
classBaseHandlers = [
34+
basic.zopeImplementsClassBases,
35+
]
36+
37+
38+
# this handler adds a line like "zope.interface.implements(IFoo)" for
39+
# each interface implemented by a Java class:
40+
classHeadHandlers = [
41+
basic.zopeImplementsClassHead,
42+
]
1943

20-
methodPrologueHandlers = [
2144

22-
]
45+
# this handler supresses the "self" parameter on method signatures for
46+
# zope Interface definitions:
47+
methodParamHandlers = [
48+
basic.zopeInterfaceMethodParams,
49+
]

‎test/configs/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
modulePrologueHandlers = default.modulePrologueHandlers + [
77
'from configs.overloading import overloaded',
88
'from abc import ABCMeta, abstractmethod',
9+
'import zope.interface',
910
]
1011

1112

0 commit comments

Comments
 (0)