Ignore:
Timestamp:
Aug 9, 2012, 9:00:02 PM (7 years ago)
Author:
ksherdy
Message:

Additional symbol table modifications for integration with current ICXML structure.

Location:
trunk/symbol_table/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/templates/group_strms.template.hpp

    r2291 r2292  
    1010@group_strms_stream_stmts
    1111
    12 static IDISA_ALWAYS_INLINE void group_strms_do_block(Marker & marker, Groups & groups) {
    13         // groups.starts = markers.starts;
    14         // groups.follows = markers.follows;
     12static IDISA_ALWAYS_INLINE void group_strms_do_block(BitBlock & starts, BitBlock & follows, Groups & groups) {
     13        groups.starts = starts;
     14         groups.follows = follows;
    1515        // GENERATED
    1616        @group_strms_block_stmts
    1717}
    1818
    19 static IDISA_ALWAYS_INLINE void group_strms_do_final_block(Marker & marker, Groups & groups, BitBlock & EOF_mask) {
    20         // groups.starts = markers.starts;
    21         // groups.follows = markers.follows;
     19static IDISA_ALWAYS_INLINE void group_strms_do_final_block(BitBlock & starts, BitBlock & follows, Groups & groups, BitBlock & EOF_mask) {
     20         groups.starts = starts;
     21         groups.follows = follows;
    2222        // GENERATED
    2323        @group_strms_final_block_stmts
  • trunk/symbol_table/templates/main.template.cpp

    r2291 r2292  
    146146                        marker_do_block(basis_bits[blk], marker[blk]);                              // gen symbol spans, mark starts & follows
    147147                        hash_strms_do_block(basis_bits[blk], hash[blk]);                            // gen hash bit streams
    148                         group_strms_do_block(marker[blk], groups[blk]);                     // sort marker bit stream (identity)
     148                        group_strms_do_block(marker[blk].starts, marker[blk].follows, groups[blk]);                         // sort marker bit stream (identity)
    149149    }
    150150
     
    200200                        marker_do_block(basis_bits[blk], marker[blk]);
    201201                        hash_strms_do_block(basis_bits[blk], hash[blk]);
    202                         group_strms_do_block(marker[blk], groups[blk]);
     202                        group_strms_do_block(marker[blk].starts, marker[blk].follows, groups[blk]);
    203203                        blk++;
    204204                        remaining -= BLOCK_SIZE;
     
    213213                        marker_do_final_block(basis_bits[blk], marker[blk], EOF_mask);
    214214                        hash_strms_do_final_block(basis_bits[blk], hash[blk], EOF_mask);
    215                         group_strms_do_final_block(marker[blk], groups[blk], EOF_mask);
     215                        group_strms_do_final_block(marker[blk].starts, marker[blk].follows, groups[blk], EOF_mask);
    216216                        blk++;
    217217    }
Note: See TracChangeset for help on using the changeset viewer.