Changeset 1814 for proto/u8u16


Ignore:
Timestamp:
Dec 28, 2011, 1:36:02 PM (7 years ago)
Author:
cameron
Message:

Update: bitutil. => pablo.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/u8u16/u8u16_pablo_straight.py

    r851 r1814  
    6969
    7070      #
    71         u8.scope22 = bitutil.Advance(u8.prefix2)
    72         u8.scope32 = bitutil.Advance(u8.prefix3)
    73         u8.scope33 = bitutil.Advance(u8.scope32)
    74         u8.scope42 = bitutil.Advance(u8.prefix4)
    75         u8.scope43 = bitutil.Advance(u8.scope42)
    76         u8.scope44 = bitutil.Advance(u8.scope43)
     71        u8.scope22 = pablo.Advance(u8.prefix2)
     72        u8.scope32 = pablo.Advance(u8.prefix3)
     73        u8.scope33 = pablo.Advance(u8.scope32)
     74        u8.scope42 = pablo.Advance(u8.prefix4)
     75        u8.scope43 = pablo.Advance(u8.scope42)
     76        u8.scope44 = pablo.Advance(u8.scope43)
    7777        u8lastscope = u8.scope22 | u8.scope33 | u8.scope44
    7878        u8anyscope = u8lastscope | u8.scope32 | u8.scope42 | u8.scope43
    7979
    80         adv_bit2 = bitutil.Advance(bit[2])
    81         adv_bit3 = bitutil.Advance(bit[3])
    82         adv_bit4 = bitutil.Advance(bit[4])
    83         adv_bit5 = bitutil.Advance(bit[5])
    84         adv_bit6 = bitutil.Advance(bit[6])
    85         adv_bit7 = bitutil.Advance(bit[7])
     80        adv_bit2 = pablo.Advance(bit[2])
     81        adv_bit3 = pablo.Advance(bit[3])
     82        adv_bit4 = pablo.Advance(bit[4])
     83        adv_bit5 = pablo.Advance(bit[5])
     84        adv_bit6 = pablo.Advance(bit[6])
     85        adv_bit7 = pablo.Advance(bit[7])
    8686             
    8787        # C0-C1 and F5-FF are illegal
    8888        error_mask = u8.badprefix
    8989             
    90         error_mask |= bitutil.Advance(xE0) & x80_x9F
    91         error_mask |= bitutil.Advance(xED) & xA0_xBF
    92         error_mask |= bitutil.Advance(xF0) & x80_x8F
    93         error_mask |= bitutil.Advance(xF4) & x90_xBF
     90        error_mask |= pablo.Advance(xE0) & x80_x9F
     91        error_mask |= pablo.Advance(xED) & xA0_xBF
     92        error_mask |= pablo.Advance(xF0) & x80_x8F
     93        error_mask |= pablo.Advance(xF4) & x90_xBF
    9494             
    9595        error_mask |= u8anyscope ^ u8.suffix
     
    108108        u16hi[6] = u8lastscope & adv_bit4
    109109        u16hi[7] = u8lastscope & adv_bit5
    110         advadv_bit6 = bitutil.Advance(adv_bit6)
    111         advadv_bit7 = bitutil.Advance(adv_bit7)
    112         u16hi[0] = u8.scope33 & bitutil.Advance(adv_bit4)
    113         u16hi[1] = u8.scope33 & bitutil.Advance(adv_bit5)
    114         u16hi[2] = u8.scope33 & bitutil.Advance(adv_bit6)
    115         u16hi[3] = u8.scope33 & bitutil.Advance(adv_bit7)
     110        advadv_bit6 = pablo.Advance(adv_bit6)
     111        advadv_bit7 = pablo.Advance(adv_bit7)
     112        u16hi[0] = u8.scope33 & pablo.Advance(adv_bit4)
     113        u16hi[1] = u8.scope33 & pablo.Advance(adv_bit5)
     114        u16hi[2] = u8.scope33 & pablo.Advance(adv_bit6)
     115        u16hi[3] = u8.scope33 & pablo.Advance(adv_bit7)
    116116        u16hi[4] = u8.scope33 & adv_bit2
    117117
Note: See TracChangeset for help on using the changeset viewer.