Changeset 3269 for proto/pabloj/trunk


Ignore:
Timestamp:
Jun 5, 2013, 1:28:30 PM (6 years ago)
Author:
ksherdy
Message:

Harmonize constructor argument order.

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

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/carry/CarryIntroXFormer.java

    r3262 r3269  
    7171    public static ASTNode apply(ASTNode root, BuiltinEncoder builtinEncoder, CarrySetEncoder carrySetEncoder,
    7272                                boolean finalBlockMode, boolean ciMode, int carrySetDepth) {
    73         Context context = new Context(ciMode, finalBlockMode, builtinEncoder, carrySetEncoder, carrySetDepth);
     73        Context context = new Context(builtinEncoder, carrySetEncoder, ciMode, finalBlockMode, carrySetDepth);
    7474        return apply(root, context);
    7575    }
  • proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/carry/Context.java

    r3262 r3269  
    1717        final private int carrySetDepth;
    1818       
    19         public Context(boolean carryInMode, boolean finalBlockMode,
    20                         BuiltinEncoder builtinEncoder, CarrySetEncoder carrySetEncoder,
     19        public Context(BuiltinEncoder builtinEncoder, CarrySetEncoder carrySetEncoder,
     20                        boolean carryInMode, boolean finalBlockMode,
    2121                        int carrySetDepth) {
    2222                super();
     
    4747        // getters - directly computed from fields
    4848        public final String getCarrySetIdentifier() {
    49                 return CarrySetEncoder.CARRYSET_BASENAME_PREFIX + carrySetDepth;
     49                return CarrySetEncoder.CARRYSET_NAME_PREFIX + carrySetDepth;
    5050        }
    5151       
     
    6363        // create new Contexts
    6464        public final Context incrementDepth() {
    65                 return new Context(carryInMode, finalBlockMode,
    66                                 builtinEncoder, carrySetEncoder,
     65                return new Context(builtinEncoder, carrySetEncoder,
     66                                carryInMode, finalBlockMode,
    6767                                carrySetDepth + 1);
    6868        }
    6969        public final Context clearCarryIn() {
    70                 return new Context(false, finalBlockMode,
    71                                 builtinEncoder, carrySetEncoder,
     70                return new Context(builtinEncoder, carrySetEncoder,
     71                                false, finalBlockMode,
    7272                                carrySetDepth);
    7373        }
Note: See TracChangeset for help on using the changeset viewer.