+ Iterator iter.remove(), test: ForEachExamples

Author: thoka

README.md

@@ -80,7 +80,7 @@ As demonstrated by the third example above, python scripts can step in, to chang
 - do switch statement right
 - make install
 - do java.typed right for VarArityParam (see LoopStyles)
- 
+- find a way to translate statements to produce no output 
 
 
 ### Pitfalls

j2py/addinit.py

@@ -57,7 +57,7 @@ def add_init(ast):
     add import of System,Object
     """
 
-    imp = decode('Id("from java import Object,System")')
+    imp = decode('Id("from java import *")')
     ast[1].insert(0,imp)
 
     imp = decode('Id("import java")')

j2py/j2py.py

@@ -5,22 +5,23 @@
 import sys
 
 
-from renameids import rename_ids
+import rename 
 from fixnames import fix_names
 from translatepackages import translate_packages
 import fixstradd
 import addinit
 from fixcomments import convert_comments
 from fixenum import fix_enum
-
 import fix_values
+import rename_methods
 
 if __name__ == '__main__':
     ast = aterm.decode(sys.stdin.read())
-    rename_ids(ast)
+    rename.run(ast)
     fix_values.run(ast)
     convert_comments(ast)
     fix_names(ast)
+    rename_methods.run(ast)
     translate_packages(ast)
     fixstradd.run(ast)
 

j2py/java/__init__.py

@@ -6,7 +6,7 @@
 from decorators import init,innerclass,typed,staticclass,overloaded
 from decorators import implements,extends,use_class_init
 
-from objects import Array,Object,String,System, Interface
+from objects import Array,Object,String,System, Interface, Number, Integer, Class
 
 from enum import Enum,enum,EnumItem
 

j2py/java/math/BigDecimal.py

@@ -0,0 +1,6 @@
+from java.math import Number
+    
+class BigDecimal(Number,float):
+    pass
+    
+    

j2py/java/math/__init__.py

@@ -0,0 +1,5 @@
+from java import Object
+
+class Number(Object):
+    pass
+

j2py/java/objects.py

@@ -8,7 +8,7 @@ def __getattr__(self,key):
         raise Exception('key not found') #TODO raise right exception, read docs ...
 
 
-class TypeWrapper(object):
+class Class(object):
     def __init__(self,typ):
         self.typ = typ
 
@@ -26,7 +26,7 @@ class Object(object):
     __interfaces = []
 
     def getClass(self):
-        return TypeWrapper(self.__class__)
+        return Class(self.__class__)
 
 
 String = "".__class__
@@ -49,5 +49,29 @@ class Interface(object):
     @classmethod    
     def getName(self):
         return self.__name__
-            
+        
+class Number(object):
+    pass
+    
+class Integer(int,Number):
+    pass
+    
+        
+class Iterator(object):
+
+    def __init__(self,collection):
+        self.pos = 0
+        self.collection = collection
+
+    def hasNext(self):
+        return self.pos < len(self.collection)
+
+    def next(self):
+        self.pos += 1
+        return self.collection[self.pos-1]
+
+    def remove(self):
+        self.collection.pop(self.pos-1)
+        self.pos -= 1
+                    
 

j2py/java/util.py

@@ -1,31 +1,24 @@
+from objects import Iterator, Object
+from helpers import str
+
+
 class Collection(list):
     def add(self,o):
         self.append(o)
 
     def iterator(self):
         return Iterator(self)
 
+    def __str__(self):
+        return "[%s]" % (', '.join([str(i) for i in self]))
+        
 
 class List(Collection):
     pass
 
-
-class Iterator(object):
-
-    def __init__(self,collection):
-        self.pos = 0
-        self.collection = collection
-
-    def hasNext(self):
-        return self.pos < len(self.collection)
-
-    def next(self):
-        self.pos += 1
-        return self.collection[self.pos-1]
 
-
 class ArrayList(Collection):
-    def __init__(self,typ):
+    def __init__(self,typ = (Object,)):
         self._typ = typ
 
 

j2py/renameids.py renamed to j2py/rename.py

@@ -10,12 +10,13 @@
 
 DEBUG = False
 
+ 
 def rename_ids(ast):
     """
     """
 
     ren = {
-      "String" : AString("java.String")
+      # "String" : AString("String")
     }
 
 
@@ -24,7 +25,7 @@ def rename_ids(ast):
             tn[0][0]=ren[tn[0][0]]
 
     ren = {
-      "class" : "__class__"
+      # "class" : "__class__"
     }
 
     kw = "and,del,elif,from,in,is,not,or,print,str,None".split(',')
@@ -34,10 +35,15 @@ def rename_ids(ast):
             id[0]=AString(ren[id[0]])
         elif id[0] in kw:
             id[0]=AString(id[0]+'_')
-   
+            
+  
+
+def run(ast):
+    rename_ids(ast)
+       
 if __name__ == '__main__':
     ast = decode(sys.stdin.read())
-    rename_ids(ast)
+    run(ast)
     if not DEBUG:
         print ast
 

j2py/rename_methods.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+from aterm import *
+import sys
+
+"""
+TODO write docstring
+"""
+
+DEBUG = False
+ 
+ 
+def rename_methods(ast):
+    
+    ren = {
+        "length" : "__len__"
+      , "substring" : "__slice__"            
+    }    
+
+    #TODO check also for type
+    for id in ast.findall("Id"):
+        if id.up.name in ["Method"]:
+            if id[0] in ren.keys():
+                id[0]=ren[id[0]]    
+  
+def run(ast):
+    rename_methods(ast)
+       
+if __name__ == '__main__':
+    ast = decode(sys.stdin.read())
+    run(ast)
+    if not DEBUG:
+        print ast
+
+

j2py/test/j2py/ForEachExamples.java

@@ -0,0 +1,54 @@
+import java.util.*;
+import java.math.BigDecimal;
+
+public final class ForEachExamples {
+
+  public static void main(String... aArgs){
+    List<Number> numbers = new ArrayList<Number>();
+    numbers.add(new Integer(42));
+    numbers.add(new Integer(-30));
+    numbers.add(new BigDecimal("654.2"));
+
+    //typical for-each loop
+    //processes each item, without changing the collection or array.
+    for ( Number number : numbers ){
+      log(number);
+    }
+
+    //use with an array
+    String[] names = {"Ethan Hawke", "Julie Delpy"};
+    for( String name : names ){
+      log("Name : " + name);
+    }
+
+    //removal of items requires an explicit iterator :
+    Collection<String> words = new ArrayList<String>();
+    words.add("Il ne lui faut que deux choses: ");
+    words.add("le");
+    words.add("pain");
+    words.add("et");
+    words.add("le");
+    words.add("temps.");
+    words.add("- Alfred de Vigny.");
+    for(Iterator<String> iter = words.iterator(); iter.hasNext();){
+      if (iter.next().length() == 4){
+        iter.remove();
+      }
+    }
+    log("Edited words: " + words.toString());
+
+    //if used with a non-parameterized type, then Object must be used
+    Collection stuff = new ArrayList();
+    stuff.add("blah");
+    for (Object thing : stuff){
+      String item = (String)thing;
+      log("Thing : " + item);
+    }
+  }
+
+  // PRIVATE //
+  private static void log(Object aThing){
+    System.out.println(aThing);
+  }
+}
+