breakout_parser 0.0.16 → 0.0.17

data/ChangeLog

@@ -1,3 +1,8 @@
+[ 0.0.17 ]
+    
+    * fix not-closing bold/italics tags when opened before <pre> and/or <code>
+        (https://www.assembla.com/spaces/breakout/tickets/6385)
+
 [ 0.0.16 ]
     
     * make a [[issue:123]] as a synonym to [[ticket:123]]

data/ext/breakout_parser/lex.yy.c

@@ -1530,25 +1530,25 @@ case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
 #line 95 "parser.l"
-{ BEGIN _PRE_CODE;      return PRE_CODE_START; }
+{ yy_push_state(_PRE_CODE);  return PRE_CODE_START; }
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
 #line 96 "parser.l"
-{ BEGIN _PRE;           return PRE_START; }
+{ yy_push_state(_PRE);       return PRE_START; }
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
 #line 97 "parser.l"
-{ BEGIN _NOTEXTILE;     return NOTEXTILE_START; }
+{ yy_push_state(_NOTEXTILE); return NOTEXTILE_START; }
 	YY_BREAK
 case 7:
 /* rule 7 can match eol */
 YY_RULE_SETUP
 #line 98 "parser.l"
-{ yy_push_state(_CODE); return CODE_START; }
+{ yy_push_state(_CODE);      return CODE_START; }
 	YY_BREAK
 case 8:
 *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
@@ -1833,13 +1833,13 @@ case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
 #line 175 "parser.l"
-{ BEGIN INITIAL; return NOTEXTILE_END; }
+{ yy_pop_state(); return NOTEXTILE_END; }
 	YY_BREAK
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
 #line 176 "parser.l"
-{ BEGIN INITIAL; return NOTEXTILE_END; }
+{ yy_pop_state(); return NOTEXTILE_END; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
@@ -1848,19 +1848,19 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(_NOTEXTILE):
 #line 178 "parser.l"
-{ BEGIN INITIAL; return NOTEXTILE_END; }
+{ yy_pop_state(); return NOTEXTILE_END; }
 	YY_BREAK
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
 #line 180 "parser.l"
-{ BEGIN INITIAL; return PRE_CODE_END; }
+{ yy_pop_state(); return PRE_CODE_END; }
 	YY_BREAK
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
 #line 181 "parser.l"
-{ BEGIN INITIAL; return PRE_CODE_END; }
+{ yy_pop_state(); return PRE_CODE_END; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
@@ -1869,19 +1869,19 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(_PRE_CODE):
 #line 183 "parser.l"
-{ BEGIN INITIAL; return PRE_CODE_END; }
+{ yy_pop_state(); return PRE_CODE_END; }
 	YY_BREAK
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
 #line 185 "parser.l"
-{ BEGIN INITIAL; return PRE_END; }
+{ yy_pop_state(); return PRE_END; }
 	YY_BREAK
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
 #line 186 "parser.l"
-{ BEGIN INITIAL; return PRE_END; }
+{ yy_pop_state(); return PRE_END; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
@@ -1890,7 +1890,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(_PRE):
 #line 188 "parser.l"
-{ BEGIN INITIAL; return PRE_END; }
+{ yy_pop_state(); return PRE_END; }
 	YY_BREAK
 case 59:
 /* rule 59 can match eol */

data/ext/breakout_parser/parser.l

@@ -92,10 +92,10 @@ extern size_t in_buf_len;
     [ \t]*(\r\n|\r|\n)      { return BR; }
 }
 
-\<pre>[ \t]*<code>[\r\n]*  { BEGIN _PRE_CODE;      return PRE_CODE_START; }
-\<pre>[\r\n]*              { BEGIN _PRE;           return PRE_START; }
-\<notextile>[\r\n]*        { BEGIN _NOTEXTILE;     return NOTEXTILE_START; }
-\<code>[\r\n \t]*          { yy_push_state(_CODE); return CODE_START; }
+\<pre>[ \t]*<code>[\r\n]*  { yy_push_state(_PRE_CODE);  return PRE_CODE_START; }
+\<pre>[\r\n]*              { yy_push_state(_PRE);       return PRE_START; }
+\<notextile>[\r\n]*        { yy_push_state(_NOTEXTILE); return NOTEXTILE_START; }
+\<code>[\r\n \t]*          { yy_push_state(_CODE);      return CODE_START; }
 
 ^\*/[^ \t\r\n*.]          { yylval.ivalue=0; yy_push_state(_BOLD); return BOLD_START; }
 [ \t]+\*/[^ \t\r\n*.]     { yylval.ivalue=1; yy_push_state(_BOLD); return BOLD_START; }
@@ -172,20 +172,20 @@ extern size_t in_buf_len;
     .                       { yylval.ivalue = yytext[0]; return T_CHAR; }
 }
 
-<_NOTEXTILE>[ \t\r\n]*<\/notextile>         { BEGIN INITIAL; return NOTEXTILE_END; }
-<_NOTEXTILE>[ \t\r\n]*\xff                  { BEGIN INITIAL; return NOTEXTILE_END; }
+<_NOTEXTILE>[ \t\r\n]*<\/notextile>         { yy_pop_state(); return NOTEXTILE_END; }
+<_NOTEXTILE>[ \t\r\n]*\xff                  { yy_pop_state(); return NOTEXTILE_END; }
 <_NOTEXTILE>(?s:.)                          { yylval.ivalue = yytext[0]; return T_CHAR; }
-<_NOTEXTILE><<EOF>>                         { BEGIN INITIAL; return NOTEXTILE_END; }
+<_NOTEXTILE><<EOF>>                         { yy_pop_state(); return NOTEXTILE_END; }
 
-<_PRE_CODE>[ \t\r\n]*<\/code>[ \t]*<\/pre>  { BEGIN INITIAL; return PRE_CODE_END; }
-<_PRE_CODE>[ \t\r\n]*\xff                   { BEGIN INITIAL; return PRE_CODE_END; }
+<_PRE_CODE>[ \t\r\n]*<\/code>[ \t]*<\/pre>  { yy_pop_state(); return PRE_CODE_END; }
+<_PRE_CODE>[ \t\r\n]*\xff                   { yy_pop_state(); return PRE_CODE_END; }
 <_PRE_CODE>(?s:.)                           { yylval.ivalue = yytext[0]; return T_CHAR; }
-<_PRE_CODE><<EOF>>                          { BEGIN INITIAL; return PRE_CODE_END; }
+<_PRE_CODE><<EOF>>                          { yy_pop_state(); return PRE_CODE_END; }
 
-<_PRE>[ \t\r\n]*<\/pre>                     { BEGIN INITIAL; return PRE_END; }
-<_PRE>[ \t\r\n]*\xff                        { BEGIN INITIAL; return PRE_END; }
+<_PRE>[ \t\r\n]*<\/pre>                     { yy_pop_state(); return PRE_END; }
+<_PRE>[ \t\r\n]*\xff                        { yy_pop_state(); return PRE_END; }
 <_PRE>(?s:.)                                { yylval.ivalue = yytext[0]; return T_CHAR; }
-<_PRE><<EOF>>                               { BEGIN INITIAL; return PRE_END; }
+<_PRE><<EOF>>                               { yy_pop_state(); return PRE_END; }
 
 <_CODE>[ \t\r\n]*<\/code>                    { yy_pop_state(); return CODE_END; }
 <_CODE>[ \t\r\n]*\xff                        { yy_pop_state(); return CODE_END; }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Andrey "Zed" Zaikin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +06:00
+date: 2010-07-27 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency