Ignore:
Timestamp:
Jul 4, 2013, 7:49:34 PM (6 years ago)
Author:
ksherdy
Message:

Partial checkin marked for reversion. Minor fix.

Location:
proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/infoSet/PropertyInfoSet.java

    r3384 r3385  
    22
    33import java.util.ArrayList;
     4import java.util.List;
    45
    56public class PropertyInfoSet {
     
    1516    private int lookBehind;
    1617
    17     private ArrayList<Integer> carry1InitialValues;
     18    private List<Integer> carry1InitialValues;
    1819   
    1920    public PropertyInfoSet(int carry1Position, int carryNPosition) { 
     
    2930        this(carry1Position, carryNPosition, carry1Count, carryNCount, lookAhead, lookBehind, new ArrayList<Integer>());
    3031       
    31         this.carry1InitialValues(new ArrayList<Integer>());
    3232    }
    3333   
    34     public PropertyInfoSet(int carry1Position, int carryNPosition, int carry1Count, int carryNCount, int lookAhead, int lookBehind, ArrayList<Integer> carry1InitialValues) { 
     34    public PropertyInfoSet(int carry1Position, int carryNPosition, int carry1Count, int carryNCount, int lookAhead, int lookBehind, List<Integer> carry1InitialValues) { 
    3535        this.carry1Position(carry1Position);
    3636        this.carryNPosition(carryNPosition);
     
    9494    }
    9595   
    96     public ArrayList<Integer> carry1InitialValues() {
     96    public List<Integer> carry1InitialValues() {
    9797        return carry1InitialValues;
    9898    }
    9999
    100     private void carry1InitialValues(ArrayList<Integer> carry1InitialValues) {
     100    private void carry1InitialValues(List<Integer> carry1InitialValues) {
    101101        this.carry1InitialValues = carry1InitialValues;
    102102    }
  • proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/infoSet/PropertyInfoSetMapBuilder.java

    r3384 r3385  
    5353       
    5454        public void visitLeave(FuncDefNode node) {
    55             PropertyInfoSet propInfoSet = new PropertyInfoSet(carry1Position, carryNPosition, Carry1Count.forTree(node), CarryNCount.forTree(node));
     55            PropertyInfoSet propInfoSet = new PropertyInfoSet(carry1Position, carryNPosition, Carry1Count.forTree(node), CarryNCount.forTree(node), 0, 0, carry1InitialValues);
    5656            infoSetMap.put(node, propInfoSet);
    5757        }
     
    7777                        carry1Position += 1;
    7878                } else if (BuiltinCallUtil.isCarryN(node)) {
    79                        
    8079                        System.out.println("CarryN node");
    81                         System.out.println(node);
    82                        
    8380                        carryNPosition += 1;
    8481                }
  • proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBXFormer.java

    r3384 r3385  
    9999            PropertyInfoSet propInfoSet, InitDefNode kernelDef) {
    100100       
    101         Integer [] carry1InitValue = arrayFromList(propInfoSet.carry1InitialValues());
    102         for(int i = 0; i < carry1InitValue.length; i++) {   
    103             if(carry1InitValue[i] > 0) {
     101        Integer [] values = arrayFromList(propInfoSet.carry1InitialValues());
     102        for(int i = 0; i < values.length; i++) {   
     103            if(values[i] > 0) {
    104104                FuncCallNode setCarryFuncCall = Generators.makeCarryFlipCall(locator, i, context);
    105105                kernelDef.appendChild(setCarryFuncCall);
Note: See TracChangeset for help on using the changeset viewer.