more for statement testing

implemented some array utils

Author: thoka

j2py/java/util.py

@@ -1,5 +1,9 @@
 class Collection(list):
-    pass
+    def add(self,o):
+        self.append(o)
+      
+    def iterator(self):
+        return Iterator(self)
 
 
 class List(Collection):
@@ -24,12 +28,12 @@ class ArrayList(Collection):
     def __init__(self,typ):
         self._typ = typ
 
-    def add(self,o):
-        self.append(o)
-      
-    def iterator(self):
-        return Iterator(self)
-        
-        
-                    
+                
+class Arrays(object):
+    @classmethod
+    def asList(self,*a):
+        res = List()
+        res.extend(a)
+        return res
+                             
 

j2py/test/j2py/IterateNoIndex.java

@@ -0,0 +1,45 @@
+// from http://www.javapractices.com/topic/TopicAction.do?Id=88
+
+import java.util.*;
+
+/** Different iteration styles. */
+public class IterateNoIndex {
+   
+  /** 
+  * Iterating without an index is more compact and less 
+  * error prone. 
+  */
+   public static void withoutIndex(){
+     //for-each loop
+     List<String> trees = Arrays.asList("Maple", "Birch", "Poplar");
+     for(String tree: trees){
+       log(tree);
+     }
+     
+     //with an Iterator
+     Iterator<String> iter = trees.iterator();
+     while (iter.hasNext()) {
+       log(iter.next());
+     }
+   }
+   
+   /** Iterating with an index is more error prone. */
+   public static void withIndex(){
+     //traditional for-loop
+     for(int idx=0; idx < 10; ++idx){
+       log("Iteration...");
+     }
+   }
+   
+   // PRIVATE //
+   private static void log(String aMessage){
+     System.out.println(aMessage);
+   }
+   
+   public static void main( String... aArguments ) {
+        withoutIndex();
+        withIndex();
+   }
+
+}
+

j2py/test/j2py/LoopStyles.java

@@ -4,7 +4,7 @@
 
 public final class LoopStyles {
 
-  public static void main(String... aArguments ) {
+  public static void main( String... aArguments ) {
     List<String> flavours = new ArrayList<String>();
     flavours.add("chocolate");
     flavours.add("strawberry");

tools/pp2py/expression.str

@@ -25,10 +25,10 @@ strategies
 
   expr-to-box: Plus(e)     -> H hs=0 [   "+"  ~e]
   expr-to-box: Minus(e)    -> H hs=0 [   "-"  ~e]
-  expr-to-box: PreIncr(e)  -> H hs=0 [   "++" ~e "###NOTIMPL###"]
-  expr-to-box: PreDecr(e)  -> H hs=0 [   "--" ~e "###NOTIMPL###"]
-  expr-to-box: PostIncr(e) -> H hs=0 [~e "++"    "###NOTIMPL###"]
-  expr-to-box: PostDecr(e) -> H hs=0 [~e "--"    "###NOTIMPL###"]
+  expr-to-box: PreIncr(e)  -> H hs=0 [~e " += 1 ##PreIncr"]
+  expr-to-box: PreDecr(e)  -> H hs=0 [~e " -= 1 ##PreDecr"]
+  expr-to-box: PostIncr(e) -> H hs=0 [~e " += 1 ##PostIntcr"]
+  expr-to-box: PostDecr(e) -> H hs=0 [~e " -= 1 ##PostDecr"]
 
   expr-to-box: Mul(e1, e2)          -> H hs=1 [~e1  "*"   ~e2]
   expr-to-box: Div(e1, e2)          -> H hs=1 [~e1  "/"   ~e2]

tools/pp2py/statement.str

@@ -168,7 +168,7 @@ rules
         H hs=0 [
           "while " ~*bcond ":"
         ]
-        H hs=1 ["    " ~bupdate]  
+        H hs=0 ["    " ~bupdate]  
     ]
 
     where