Ignore:
Timestamp:
Mar 12, 2011, 9:51:30 AM (8 years ago)
Author:
cameron
Message:

Eliminate EOF_mask for quote scans; revert for while loops

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/parabix2_pablo.py

    r942 r944  
    342342        CtCDPI_Cursor = 1
    343343        CtCDPI_Cursor = bitutil.ScanTo(CtCDPI_Cursor, CtCDPI_start)
    344 #       CtCDPI_Cursor &= EOF_mask
     344        CtCDPI_Cursor &= EOF_mask
    345345        while CtCDPI_Cursor:
    346346                CtCDPI_starts |= CtCDPI_Cursor
     
    369369                CtCDPI_Cursor = PI_Cursor | CD_Cursor | Ct_Cursor
    370370                CtCDPI_Cursor = bitutil.ScanTo(CtCDPI_Cursor, CtCDPI_start)
    371 #               CtCDPI_Cursor &= EOF_mask
     371                CtCDPI_Cursor &= EOF_mask
    372372       
    373373                ctCDPI_Callouts.CtCDPI_mask = bitutil.Advance(ctCDPI_Callouts.CD_ends | ctCDPI_Callouts.Ct_ends | ctCDPI_Callouts.PI_ends) - CtCDPI_starts             
     
    385385       
    386386        # Delimiters for scans.
    387         DQuoteScan = ~(lex.DQuote | lex.LAngle) & EOF_mask
    388         SQuoteScan = ~(lex.SQuote | lex.LAngle) & EOF_mask
     387        DQuoteDelim = lex.DQuote | lex.LAngle
     388        SQuoteDelim = lex.SQuote | lex.LAngle
    389389        AttListDelim = lex.Slash | lex.RAngle
    390390       
     
    434434                DQuoteAttVal = AttValPos & lex.DQuote
    435435                SQuoteAttVal = AttValPos & lex.SQuote
    436                 DQuoteAttEnd = bitutil.ScanThru(DQuoteAttVal, DQuoteAttVal | DQuoteScan)
    437                 SQuoteAttEnd = bitutil.ScanThru(SQuoteAttVal, SQuoteAttVal | SQuoteScan)
     436                DQuoteAttEnd = bitutil.ScanTo(DQuoteAttVal, DQuoteDelim &~ DQuoteAttVal)
     437                SQuoteAttEnd = bitutil.ScanTo(SQuoteAttVal, SQuoteDelim &~ SQuoteAttVal)
    438438                AttValEnd = DQuoteAttEnd | SQuoteAttEnd
    439439                AttValEnds |= AttValEnd
Note: See TracChangeset for help on using the changeset viewer.