Charj : Merge branch 'ArraySections' into charm
authorMinas Charalambides <charala1@illinois.edu>
Mon, 20 Sep 2010 19:04:51 +0000 (14:04 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Mon, 20 Sep 2010 19:04:51 +0000 (14:04 -0500)
Conflicts:
src/langs/charj/src/charj/translator/CharjASTModifier2.g

1  2 
src/langs/charj/src/charj/translator/CharjASTModifier2.g

index 5bc90a44b288e84de821d2c285970daf5bb560f4,dd5056c056af3a6c25d05083623e92bb7f7bc8f5..64729c9c7df33fff9991f2b9eefb9d089cf21937
@@@ -45,29 -45,31 +45,6 @@@ package charj.translator
              return false;
          return true;
      }
-       
-       protected String getProxySectionCreationText(ArrayList<ArrayList<Object>> ranges)
 -
 -      int proxySectionCount = 0;
 -
 -      protected String getArraySectionInitString(ArrayList<ArrayList<Object>> ranges)
--    {
--              StringBuffer sb = new StringBuffer();
-               sb.append("CkVec<CkArrayIndex3D> elems_"+(proxySectionCount++)+";\n");
 -              sb.append("CkVec<CkArrayIndex1D> elems_"+(proxySectionCount++)+";\n");
--              int count = 0;
--              for(ArrayList range : ranges)
--              {
--                      Object start = range.get(0);
--                      Object end = range.get(1);
--                      Object step = range.size() > 2 ? range.get(2) : 1;
--                      String iName = "i_"+(count++);
--                      sb.append("for int " + iName + "=" + start + "; " + iName + "<" + end + ";" + iName + "++\n");
--                      for(int i=0; i<count; i++)
--                              sb.append("\t");
--              }
--              sb.append("elems.push_back(CkArrayIndex"+count+"D(i_0");
--              for(int i=1; i<count; i++)
--                      sb.append(", i_" + i);
--              sb.append("));");
--              return sb.toString();
--      }
--
  }
        
  // Starting point for parsing a Charj file.