[Jython-checkins] SF.net SVN: jython:[6528] trunk/jython/src/org/python/core/__builtin__.java

[<pj...@us...>]

Revision: 6528
          http://jython.svn.sourceforge.net/jython/?rev=6528&view=rev
Author:   pjenvey
Date:     2009-07-11 22:38:33 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
small refactor

Modified Paths:
--------------
    trunk/jython/src/org/python/core/__builtin__.java

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2009-07-11 06:47:49 UTC (rev 6527)
+++ trunk/jython/src/org/python/core/__builtin__.java	2009-07-11 22:38:33 UTC (rev 6528)
@@ -21,6 +21,7 @@
         super(name, index, minargs, maxargs);
     }
 
+    @Override
     public PyObject __call__() {
         switch (this.index) {
             case 4:
@@ -42,6 +43,7 @@
         }
     }
 
+    @Override
     public PyObject __call__(PyObject arg1) {
         switch (this.index) {
             case 0:
@@ -121,6 +123,7 @@
         }
     }
 
+    @Override
     public PyObject __call__(PyObject arg1, PyObject arg2) {
         switch (this.index) {
             case 2:
@@ -176,6 +179,7 @@
         }
     }
 
+    @Override
     public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3) {
         switch (this.index) {
             case 2:
@@ -244,6 +248,7 @@
         }
     }
 
+    @Override
     public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3, PyObject arg4) {
         switch (this.index) {
             case 44:
@@ -261,6 +266,7 @@
         }
     }
 
+    @Override
     public PyObject fancyCall(PyObject[] args) {
         switch (this.index) {
             case 29:
@@ -272,6 +278,7 @@
         }
     }
 
+    @Override
     public PyObject getModule() {
         return module;
     }
@@ -574,24 +581,20 @@
         }
 
         StringBuilder builder = new StringBuilder();
-        boolean ok;
         for (PyObject item : seq.asIterable()) {
-            ok = false;
             if (func == Py.None) {
-                if (item.__nonzero__()) {
-                    ok = true;
+                if (!item.__nonzero__()) {
+                    continue;
                 }
-            } else if (func.__call__(item).__nonzero__()) {
-                ok = true;
+            } else if (!func.__call__(item).__nonzero__()) {
+                continue;
             }
-            if (ok) {
-                if (!Py.isInstance(item, stringType)) {
-                    String name = stringType.fastGetName();
-                    throw Py.TypeError(String.format("can't filter %s to %s: __getitem__ returned "
-                                                     + "different type", name, name));
-                }
-                builder.append(item.toString());
+            if (!Py.isInstance(item, stringType)) {
+                String name = stringType.fastGetName();
+                throw Py.TypeError(String.format("can't filter %s to %s: __getitem__ returned "
+                                                 + "different type", name, name));
             }
+            builder.append(item.toString());
         }
 
         String result = builder.toString();
@@ -609,20 +612,16 @@
 
         PyList list = new PyList();
         PyObject item;
-        boolean ok;
         for (int i = 0; i < len; i++) {
-            ok = false;
             item = seq.__finditem__(i);
             if (func == Py.None) {
-                if (item.__nonzero__()) {
-                    ok = true;
+                if (!item.__nonzero__()) {
+                    continue;
                 }
-            } else if (func.__call__(item).__nonzero__()) {
-                ok = true;
+            } else if (!func.__call__(item).__nonzero__()) {
+                continue;
             }
-            if (ok) {
-                list.append(item);
-            }
+            list.append(item);
         }
         return PyTuple.fromIterable(list);
     }
@@ -1221,6 +1220,7 @@
               "is the number of parent directories to search relative to the current module.");
     }
 
+    @Override
     public PyObject __call__(PyObject args[], String keywords[]) {
         ArgParser ap = new ArgParser("__import__", args, keywords,
                                      new String[]{"name", "globals", "locals", "fromlist", "level"},
@@ -1436,6 +1436,7 @@
               "This always returns a floating point number.  Precision may be negative.");
     }
 
+    @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         ArgParser ap = new ArgParser("round", args, kwds, new String[] {"number", "ndigits"}, 0);
         PyObject number = ap.getPyObject(0);
@@ -1474,6 +1475,7 @@
               + "in addition to any features explicitly specified.");
     }
 
+    @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         ArgParser ap = new ArgParser("compile", args, kwds,
                                      new String[] {"source", "filename", "mode", "flags",
@@ -1556,6 +1558,7 @@
             "Passing an Input/OutputStream to open is deprecated, use "
             + "org.python.core.util.FileUtil.wrap(stream[, bufsize]) instead.";
 
+    @Override
     public PyObject __call__(PyObject args[], String kwds[]) {
         ArgParser ap = new ArgParser("file", args, kwds, new String[] {"name", "mode", "bufsize"},
                                      1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.