Changeset 423 for proto


Ignore:
Timestamp:
Jul 3, 2010, 3:06:27 PM (9 years ago)
Author:
lindanl
Message:

add name prevalidate streams, drop U16

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/parabix2_compilable.py

    r412 r423  
    705705        callouts.EmptyTagMarks = bitutil.Advance(AttListEnd & lex.Slash)
    706706        callouts.Tags = (STagEnds | callouts.EmptyTagMarks) - ElemNamePositions
     707       
     708       
     709        name_stream = callouts.ElemNames | callouts.AttNames
     710        name_start = name_stream &~ bitutil.Advance(name_stream)
     711        name_start_check = name_start & ~lex.ASCII_name_start
     712        name_check = (name_stream &~ name_start | nmtoken_stream) & ~lex.ASCII_name_char & ~u8.suffix
    707713
    708714        # Check for errors.
     
    731737
    732738        # Convert to UTF-16 bit streams.
    733         (u16hi, u16lo, u16delmask) = u8u16.u8u16(u8, bit)
     739        #(u16hi, u16lo, u16delmask) = u8u16.u8u16(u8, bit)
    734740
    735741        # Consolidate and check for errors
     
    737743
    738744        # Consolidate the deletion_masks
    739         delmask = control.CRLF | refs.delmask | u16delmask # | CT_callouts.CDATA_delimiters
    740 
    741         return (CT_callouts, callouts, refs, u16hi, u16lo, delmask, error, lex, u16delmask, EOF_mask)
    742 
     745        #delmask = control.CRLF | refs.delmask | u16delmask # | CT_callouts.CDATA_delimiters
     746        delmask = control.CRLF | refs.delmask  # | CT_callouts.CDATA_delimiters
     747
     748        #return (CT_callouts, callouts, refs, u16hi, u16lo, delmask, error, lex, u16delmask, EOF_mask)
     749        return (CT_callouts, callouts, refs, delmask, error, lex, EOF_mask)
    743750
    744751def demo_parabix(u8data):
Note: See TracChangeset for help on using the changeset viewer.