Changeset 260

Timestamp:

03/10/2008 14:07:59 (8 months ago)

Author:

jgarber

Message:

Refactor how extended blocks are ended; fixes problem with block picking up next block's attributes.

Location:

branches/superredcloth/ext/superredcloth_scan

Files:

• superredcloth.h (modified) (1 diff)
• superredcloth_scan.rl (modified) (5 diffs)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -35 +35 @@
   regs = rb_hash_new()
 #define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(rb_formatter, regs, block, refs)); CLEAR(block);
+#define END_EXTENDED()     extend = Qnil; regs = rb_hash_new();
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block); regs = rb_hash_new()
 #define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block);

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -33 +33 @@
   btype = ( "p" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "div" ) ;
   block_start = ( btype >A %{ STORE(type) } A C :> "." ( "." %extend | "" ) " "+ ) ;
-  next_block_start = ( btype A C :> "." ) ;
+  next_block_start = ( btype A C :> "."+ " " ) >A @{ p = reg - 1; } ;
   double_return = CRLF{2,} ;
   block_end = ( double_return | EOF );
-  extended_block_end = double_return . next_block_start >A @{ p = reg - 1; } ;
   ftype = ( "fn" >A %{ STORE(type) } digit+ >A %{ STORE(id) } ) ;
   footnote_start = ( ftype A C :> dotspace ) ;
@@ -75 +74 @@
   pre_block := |*
     EOF                { ADD_BLOCKCODE(); fgoto main; };
-    extended_block_end { ADD_BLOCKCODE(); fgoto main; };
     double_return      { if (NIL_P(extend)) { ADD_BLOCKCODE(); fgoto main; } else { ADD_EXTENDED_BLOCKCODE(); } };
+    next_block_start   { END_EXTENDED(); fgoto main; };
     default => esc_pre;
   *|;
@@ -87 +86 @@
   notextile_block := |*
     EOF                { DONE(block); fgoto main; };
-    extended_block_end { DONE(block); fgoto main; };
     double_return      { if (NIL_P(extend)) { DONE(block); fgoto main; } else { DONE(block); } };
+    next_block_start   { END_EXTENDED(); fgoto main; };
     default => cat;
   *|;
@@ -99 +98 @@
   bc := |*
     EOF                { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; };
-    extended_block_end { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; };
     double_return      { if (NIL_P(extend)) { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; } else { ADD_EXTENDED_BLOCKCODE(); } };
+    next_block_start   { INLINE(html, bc_close); plain_block = rb_str_new2("p");  END_EXTENDED(); fgoto main; };
     default => esc_pre;
   *|;
@@ -106 +105 @@
   bq := |*
     EOF                { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; };
-    extended_block_end { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; };
     double_return      { if (NIL_P(extend)) { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; } else { ADD_EXTENDED_BLOCK(); } };
     default => cat;
+    next_block_start   { INLINE(html, bq_close); END_EXTENDED(); fgoto main; };
   *|;
 
   block := |*
     EOF                { ADD_BLOCK(); fgoto main; };
-    extended_block_end { ADD_BLOCK(); fgoto main; };
     double_return      { if (NIL_P(extend)) { ADD_BLOCK(); fgoto main; } else { ADD_EXTENDED_BLOCK(); } };
+    next_block_start   { END_EXTENDED(); fgoto main; };
     default => cat;
   *|;