Permalink
Browse files

fix build, method sort order

  • Loading branch information...
1 parent 47bef67 commit 33824e80ab1f9632955dc736db00d51cd9af16af @jdf committed Aug 27, 2010
View
2 build.xml
@@ -15,7 +15,7 @@
<target name="newversion" depends="bumpversion,clean,dist" />
<target name="dist" depends="jar">
- <property file="src/jycessing/buildnumber.properties"
+ <property file="runtime/src/jycessing/buildnumber.properties"
prefix="jycessing" />
<property name="dist" value="processing.py-${jycessing.buildnumber}" />
<delete dir="dist" />
View
10 buildtime/py/processing_parser.py
@@ -129,11 +129,6 @@ def emit_typecheck_expression(klass, name):
def is_builtin(name):
return name in ('map', 'filter', 'set', 'str')
-def type_to_sort_order(t):
- if t == 'byte':
- return 'z'
- return t
-
class PolymorphicMethod(object):
def __init__(self, name, arity):
self.name = name
@@ -168,8 +163,9 @@ def emit(self):
else:
for i in range(self.arity):
cog.outl('\t\t\t\tfinal PyType t%d = args[%d].getType();' % (i, i))
- self.methods.sort(key=lambda p: [type_to_sort_order(m.getSimpleName())
- for m in p.getParameterTypes()])
+ self.methods.sort(key=lambda p: [m.getSimpleName()
+ for m in p.getParameterTypes()],
+ reverse=True)
for i in range(len(self.methods)):
m = self.methods[i]
if i > 0:
View
6 examples.py/Python/colornames/colorsketch.py
@@ -13,5 +13,7 @@ def setup():
def draw():
background(0)
image(flag, 75, 40 )
- if mouseX >= 0 and mouseX <= width and mouseY >= 0 and mouseY <= height:
- text(namer.name(hex(0x00FFFFFF & get(mouseX, mouseY))[2:]).name, 60, 120)
+ if mouseX >= 0 and mouseX <= width and mouseY >= 0 and mouseY <= height:
+ c = 0x00FFFFFF & get(mouseX, mouseY)
+ fill(c >> 16, c >> 8 & 0xFF, c & 0xFF)
+ text(namer.name(hex(c)[2:]).name, 75, 120)
View
4 runtime/src/jycessing/buildnumber.properties
@@ -1,2 +1,2 @@
-#Fri Aug 20 19:19:55 EDT 2010
-buildnumber=0003
+#Thu Aug 26 23:08:33 EDT 2010
+buildnumber=0005

0 comments on commit 33824e8

Please sign in to comment.