Changeset 3092

Timestamp:

Apr 28, 2013, 2:10:00 PM (6 years ago)

Author:

cameron

Message:

Demo pablo.match for CDATA opener.

Location:

proto/parabix2

Files:

• parabix2_pablo.py (modified) (4 diffs)
• util/post_process.hpp (modified) (1 diff)

proto/parabix2/parabix2_pablo.py

@@ -306 +306 @@
                         
         
-def Parse_CtCDPI(lex, marker, ctCDPI_Callouts, check_streams):
+def Parse_CtCDPI(bytedata, lex, marker, ctCDPI_Callouts, check_streams):
         ctCDPI_Callouts.Ct_starts = 0
         ctCDPI_Callouts.Ct_ends = 0
@@ -367 +367 @@
                 # CDATA section processing
                 if CD_Cursor:
+                        check = CD_Cursor ^ pablo.match(bytedata, "[CDATA[", CD_Cursor)
+                        pablo.assert_0(check, "CDATA error")
                         ctCDPI_Callouts.CD_starts |= CD_Cursor
                         CD_Cursor = pablo.ScanTo(CD_Cursor, CD_closer)
@@ -564 +566 @@
      
     
-def Main(bytedata, basis_bits, lex, u8, xml_char, scope1, ctCDPI_Callouts, ref_Callouts, tag_Callouts, masks, xml_names, check_streams):        
+def Main(basis_bits, lex, u8, xml_char, scope1, ctCDPI_Callouts, ref_Callouts, tag_Callouts, masks, xml_names, check_streams):  
         
         Transpose(bytedata, basis_bits)
@@ -578 +580 @@
 
         # Parse all comments, CDATA sections and processing instructions.
-        Parse_CtCDPI(lex, marker, ctCDPI_Callouts, check_streams)
+        Parse_CtCDPI(bytedata, lex, marker, ctCDPI_Callouts, check_streams)
                 
         # All remaining '<' must be tag start characters; parse tags.

proto/parabix2/util/post_process.hpp

@@ -185 +185 @@
         validate_block(iter, source, block_base, buffer_base, PIName_check, tracker);
     }
-    if (bitblock::any(ctCDPI_Callouts.CD_starts)){
-        iter.init(&ctCDPI_Callouts.CD_starts);
-        validate_block(iter, source, block_base, CD_check, tracker);
-    }
     if(bitblock::any(ref_Callouts.GenRef_starts)){
         iter.init(&ref_Callouts.GenRef_starts);