Changeset 1223 for proto/Xerces


Ignore:
Timestamp:
Jul 14, 2011, 6:27:29 AM (8 years ago)
Author:
cameron
Message:

Elim tag_Callouts.LAngleFollow, simd_and

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/Xerces/parabix_xerces.py

    r1217 r1223  
    8383        EmptyTag_marks = 0
    8484        EndTag_marks = 0
    85         LAngleFollow = 0
    8685        error = 0
    8786               
     
    184183        # Start the parallel parsing by inspecting the character
    185184        # after the opening "<" of a tag.
    186         tag_Callouts.LAngleFollow = scope1.LAngle &~ ctCDPI_Callouts.CtCDPI_mask
    187         tag_Callouts.ElemName_starts = tag_Callouts.LAngleFollow & ~lex.Slash
    188         tag_Callouts.EndTag_marks = tag_Callouts.LAngleFollow & lex.Slash
     185        LAngleFollow = scope1.LAngle &~ ctCDPI_Callouts.CtCDPI_mask
     186        tag_Callouts.ElemName_starts = LAngleFollow & ~lex.Slash
     187        tag_Callouts.EndTag_marks = LAngleFollow & lex.Slash
    189188       
    190189        # Start Tag/Empty Element Tag Parsing
     
    223222                # EqExpected = bitutil.ScanThru(AttNameFollow, lex.WS)
    224223                # But use if test to optimize.
    225                 if simd_and(AttNameFollow, lex.WS):
     224                if AttNameFollow & lex.WS:
    226225                        EqExpected = bitutil.ScanThru(AttNameFollow, lex.WS)
    227226                else: EqExpected = AttNameFollow
     
    238237                tag_Callouts.AttVal_ends |= AttValFollow
    239238                #  AfterWS = bitutil.ScanThru(AttValFollow, lex.WS)
    240                 if simd_and(AttValFollow, lex.WS):
     239                if AttValFollow & lex.WS:
    241240                        AfterWS = bitutil.ScanThru(AttValFollow, lex.WS)
    242241                else: AfterWS = AttValFollow
     
    261260
    262261        EndTagEnds = bitutil.ScanThru(tag_Callouts.EndTag_marks, tag_Callouts.EndTag_marks | lex.NameScan)
    263         if simd_and(EndTagEnds, lex.WS):
     262        if EndTagEnds & lex.WS:
    264263                EndTagEnds = bitutil.ScanThru(EndTagEnds, lex.WS)
    265264        ParseError |= EndTagEnds & ~lex.RAngle
     
    307306    check_streams.error_mask = lex.error & EOF_mask | ctCDPI_Callouts.error | tag_Callouts.error | CD_end_error | ref_Callouts.error
    308307
    309     check_streams.tag_marks = tag_Callouts.EmptyTag_marks | tag_Callouts.LAngleFollow | tag_Callouts.AttName_starts
     308    check_streams.tag_marks = tag_Callouts.EmptyTag_marks | tag_Callouts.ElemName_starts | tag_Callouts.EndTag_marks | tag_Callouts.AttName_starts
    310309    check_streams.name_follows = tag_Callouts.ElemName_ends | tag_Callouts.AttName_ends
    311310    check_streams.att_refs = tag_Callouts.AttVal_spans & scope1.RefStart
Note: See TracChangeset for help on using the changeset viewer.