breakout_parser 0.0.2 → 0.0.3

data/ext/breakout_parser/make_win32.bat

@@ -3,13 +3,15 @@ ruby extconf.rb
 if errorlevel 1 goto err
 nmake
 if errorlevel 1 goto err
-mt.exe -manifest breakout_parser.so.manifest -outputresource:breakout_parser.so;2
+if exist breakout_parser.so.manifest mt.exe -manifest breakout_parser.so.manifest -outputresource:breakout_parser.so;2
 
+echo.
 echo ALL OK!
 goto end
 
 :err
+echo.
 echo ERROR!
 goto end
 
-:end
+:end

data/ext/breakout_parser/parser.l

@@ -77,7 +77,7 @@ extern size_t in_buf_len;
 %}
 
 %option stack
-%x _PRE
+%x _PRE_CODE _PRE _CODE
 %s _BOLD _ITALIC
 
 
@@ -87,14 +87,17 @@ extern size_t in_buf_len;
 \xff                    ; /* EOF mark. should not appear in valid UTF8 text */
 [\r\n\t ]+\xff          ; /* EOF + skip tailing whitespace */
 
-
+ /*
 ([ \t]*\n){2,}          { return BRBR; }
 ([ \t]*\r){2,}          { return BRBR; }
 ([ \t]*\r\n){2,}        { return BRBR; }
+ */
 
 [ \t]*(\r\n|\r|\n)      { return BR; }
 
-\<pre>[ \t]*<code>[\r\n]*  { BEGIN _PRE; return PRE_START; }
+\<pre>[ \t]*<code>[\r\n]*  { BEGIN _PRE_CODE;      return PRE_CODE_START; }
+\<pre>[\r\n]*              { BEGIN _PRE;           return PRE_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; }
@@ -145,10 +148,20 @@ https?:\/\/[^ \r\n<>"(){}*]+[^ \r\n<>"(){}*,.\[\]]  { yylval.svalue = yytext; re
 
 
 
-<_PRE>[ \t\r\n]*<\/code>[ \t]*<\/pre>  { BEGIN INITIAL; return PRE_END; }
-<_PRE>[ \t\r\n]*\xff                   { BEGIN INITIAL; return PRE_END; }
-<_PRE>(?s:.)                 { yylval.ivalue = yytext[0]; return T_CHAR; }
-<_PRE><<EOF>>                { BEGIN INITIAL; return PRE_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>(?s:.)                           { yylval.ivalue = yytext[0]; return T_CHAR; }
+<_PRE_CODE><<EOF>>                          { BEGIN INITIAL; 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>(?s:.)                                { yylval.ivalue = yytext[0]; return T_CHAR; }
+<_PRE><<EOF>>                               { BEGIN INITIAL; 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; }
+<_CODE>(?s:.)                                { yylval.ivalue = yytext[0]; return T_CHAR; }
+<_CODE><<EOF>>                               { yy_pop_state(); return CODE_END; }
 
 <_BOLD>[ \t]+\*/[ \t]+       { yylval.svalue = " *"; return T_WORD; } /* skip lone star */
 <_BOLD>\*/[ \t\r\n'.,]       { yy_pop_state(); return BOLD_END; }

data/ext/breakout_parser/parser.tab.c

@@ -178,13 +178,16 @@ void yyerror(const char *msg)
      H5 = 276,
      SPACE = 277,
      BR = 278,
-     BRBR = 279,
-     OLI = 280,
-     ULI = 281,
-     PRE_START = 282,
-     PRE_END = 283,
-     BOLD_END = 284,
-     ITALIC_END = 285
+     OLI = 279,
+     ULI = 280,
+     PRE_CODE_START = 281,
+     PRE_CODE_END = 282,
+     PRE_START = 283,
+     PRE_END = 284,
+     CODE_START = 285,
+     CODE_END = 286,
+     BOLD_END = 287,
+     ITALIC_END = 288
    };
 #endif
 
@@ -204,7 +207,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 208 "parser.tab.c"
+#line 211 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -216,7 +219,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 220 "parser.tab.c"
+#line 223 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -429,22 +432,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  40
+#define YYFINAL  43
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   93
+#define YYLAST   95
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  31
+#define YYNTOKENS  34
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  26
+#define YYNNTS  28
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  56
+#define YYNRULES  59
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  64
+#define YYNSTATES  71
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   285
+#define YYMAXUTOK   288
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -480,7 +483,7 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30
+      25,    26,    27,    28,    29,    30,    31,    32,    33
 };
 
 #if YYDEBUG
@@ -493,25 +496,26 @@ static const yytype_uint8 yyprhs[] =
       42,    45,    49,    51,    54,    57,    61,    63,    66,    68,
       70,    72,    74,    76,    78,    80,    82,    84,    86,    88,
       90,    92,    94,    96,    97,   100,   102,   104,   106,   108,
-     110,   112,   114,   116,   118,   120,   121
+     110,   112,   114,   116,   118,   119,   124,   125,   130,   131
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      32,     0,    -1,    -1,    33,    32,    -1,    54,    -1,    42,
-      -1,    47,    -1,    48,    -1,    49,    -1,    50,    -1,    51,
-      -1,    -1,    -1,    34,    38,    35,    33,    -1,    -1,    -1,
-      36,    40,    37,    33,    -1,    55,    -1,    39,    -1,    38,
-      39,    -1,    53,    42,    -1,    53,    42,    23,    -1,    41,
-      -1,    40,    41,    -1,    52,    42,    -1,    52,    42,    23,
-      -1,    43,    -1,    43,    42,    -1,    45,    -1,    44,    -1,
-       6,    -1,    15,    -1,     4,    -1,    29,    -1,     5,    -1,
-      30,    -1,     7,    -1,     9,    -1,    10,    -1,    13,    -1,
-      14,    -1,    11,    -1,    12,    -1,    -1,    46,    45,    -1,
+      35,     0,    -1,    -1,    36,    35,    -1,    57,    -1,    45,
+      -1,    50,    -1,    51,    -1,    52,    -1,    53,    -1,    54,
+      -1,    -1,    -1,    37,    41,    38,    36,    -1,    -1,    -1,
+      39,    43,    40,    36,    -1,    58,    -1,    42,    -1,    41,
+      42,    -1,    56,    45,    -1,    56,    45,    23,    -1,    44,
+      -1,    43,    44,    -1,    55,    45,    -1,    55,    45,    23,
+      -1,    46,    -1,    46,    45,    -1,    48,    -1,    47,    -1,
+       6,    -1,    15,    -1,     4,    -1,    32,    -1,     5,    -1,
+      33,    -1,     7,    -1,     9,    -1,    10,    -1,    13,    -1,
+      14,    -1,    11,    -1,    12,    -1,    -1,    49,    48,    -1,
        3,    -1,    17,    -1,    18,    -1,    19,    -1,    20,    -1,
-      21,    -1,    25,    -1,    26,    -1,    23,    -1,    24,    -1,
-      -1,    27,    56,    45,    28,    -1
+      21,    -1,    24,    -1,    25,    -1,    23,    -1,    -1,    26,
+      59,    48,    27,    -1,    -1,    28,    60,    48,    29,    -1,
+      -1,    30,    61,    48,    31,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -522,7 +526,7 @@ static const yytype_uint8 yyrline[] =
      100,   101,   103,   104,   106,   107,   109,   110,   112,   113,
      114,   115,   116,   117,   118,   119,   121,   122,   123,   124,
      125,   126,   127,   129,   130,   132,   139,   140,   141,   142,
-     143,   145,   146,   147,   148,   149,   149
+     143,   145,   146,   147,   150,   150,   151,   151,   152,   152
 };
 #endif
 
@@ -535,10 +539,12 @@ static const char *const yytname[] =
   "T_WORD", "TICKET_LINK", "LINK", "SVN_REVISION_LINK",
   "GIT_REVISION_LINK", "WIKI_LINK", "ANCHOR_LINK", "URL_WITH_PROTO_LINK",
   "URL_WITHOUT_PROTO_LINK", "URL", "UL", "H1", "H2", "H3", "H4", "H5",
-  "SPACE", "BR", "BRBR", "OLI", "ULI", "PRE_START", "PRE_END", "BOLD_END",
+  "SPACE", "BR", "OLI", "ULI", "PRE_CODE_START", "PRE_CODE_END",
+  "PRE_START", "PRE_END", "CODE_START", "CODE_END", "BOLD_END",
   "ITALIC_END", "$accept", "text", "textitem", "$@1", "$@2", "$@3", "$@4",
   "ulist", "ulitem", "olist", "olitem", "words", "word", "link", "chars",
-  "char", "h1", "h2", "h3", "h4", "h5", "oli", "uli", "br", "pre", "$@5", 0
+  "char", "h1", "h2", "h3", "h4", "h5", "oli", "uli", "br", "code", "$@5",
+  "$@6", "$@7", 0
 };
 #endif
 
@@ -550,19 +556,19 @@ static const yytype_uint16 yytoknum[] =
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285
+     285,   286,   287,   288
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    31,    32,    32,    33,    33,    33,    33,    33,    33,
-      33,    34,    35,    33,    36,    37,    33,    33,    38,    38,
-      39,    39,    40,    40,    41,    41,    42,    42,    43,    43,
-      43,    43,    43,    43,    43,    43,    44,    44,    44,    44,
-      44,    44,    44,    45,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    54,    56,    55
+       0,    34,    35,    35,    36,    36,    36,    36,    36,    36,
+      36,    37,    38,    36,    39,    40,    36,    36,    41,    41,
+      42,    42,    43,    43,    44,    44,    45,    45,    46,    46,
+      46,    46,    46,    46,    46,    46,    47,    47,    47,    47,
+      47,    47,    47,    48,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    59,    58,    60,    58,    61,    58
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -573,7 +579,7 @@ static const yytype_uint8 yyr2[] =
        2,     3,     1,     2,     2,     3,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     0,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -583,41 +589,43 @@ static const yytype_uint8 yydefact[] =
 {
        2,    45,    32,    34,    30,    36,    37,    38,    41,    42,
       39,    40,    31,    46,    47,    48,    49,    50,    53,    54,
-      55,    33,    35,     0,     2,     0,     0,     5,    26,    29,
-      28,    43,     6,     7,     8,     9,    10,     4,    17,    43,
-       1,     3,    52,    12,    18,    43,    51,    15,    22,    43,
-      27,    44,     0,    11,    19,    20,    11,    23,    24,    56,
-      13,    21,    16,    25
+      56,    58,    33,    35,     0,     2,     0,     0,     5,    26,
+      29,    28,    43,     6,     7,     8,     9,    10,     4,    17,
+      43,    43,    43,     1,     3,    52,    12,    18,    43,    51,
+      15,    22,    43,    27,    44,     0,     0,     0,    11,    19,
+      20,    11,    23,    24,    55,    57,    59,    13,    21,    16,
+      25
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,    23,    24,    25,    53,    26,    56,    43,    44,    47,
-      48,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    49,    45,    37,    38,    39
+      -1,    24,    25,    26,    58,    27,    61,    46,    47,    50,
+      51,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    52,    48,    38,    39,    40,    41,    42
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -25
+#define YYPACT_NINF -37
 static const yytype_int8 yypact[] =
 {
-      28,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,     1,    28,   -24,    -3,   -25,    56,   -25,
-     -25,    23,   -25,   -25,   -25,   -25,   -25,   -25,   -25,    23,
-     -25,   -25,   -25,   -24,   -25,    56,   -25,    -3,   -25,    56,
-     -25,   -25,     8,     0,   -25,     5,     0,   -25,    21,   -25,
-     -25,   -25,   -25,   -25
+      31,   -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37,
+     -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37,
+     -37,   -37,   -37,   -37,     1,    31,   -23,    -8,   -37,    62,
+     -37,   -37,    26,   -37,   -37,   -37,   -37,   -37,   -37,   -37,
+      26,    26,    26,   -37,   -37,   -37,   -23,   -37,    62,   -37,
+      -8,   -37,    62,   -37,   -37,    12,    18,    22,     0,   -37,
+      35,     0,   -37,    37,   -37,   -37,   -37,   -37,   -37,   -37,
+     -37
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -25,    26,    20,   -25,   -25,   -25,   -25,   -25,    13,   -25,
-      17,    44,   -25,   -25,   -23,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25
+     -37,    56,   -36,   -37,   -37,   -37,   -37,   -37,    16,   -37,
+      32,   -21,   -37,   -37,    38,   -37,   -37,   -37,   -37,   -37,
+     -37,   -37,   -37,   -37,   -37,   -37,   -37,   -37
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -627,30 +635,30 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -44
 static const yytype_int8 yytable[] =
 {
-     -43,    40,    42,     1,     2,     3,     4,     5,    51,     6,
-       7,     8,     9,    10,    11,    12,    52,    13,    14,    15,
-      16,    17,    46,    18,    19,   -14,     1,    20,    61,    21,
-      22,     1,     2,     3,     4,     5,    59,     6,     7,     8,
-       9,    10,    11,    12,    63,    13,    14,    15,    16,    17,
-      41,    18,    19,   -14,   -11,    20,    54,    21,    22,     1,
-       2,     3,     4,     5,    57,     6,     7,     8,     9,    10,
-      11,    12,    50,    60,     0,     0,    62,     0,     0,     0,
-       0,     0,     0,     0,     0,    21,    22,     0,     0,    55,
-       0,     0,     0,    58
+     -43,    43,    45,     1,     2,     3,     4,     5,    53,     6,
+       7,     8,     9,    10,    11,    12,    49,    13,    14,    15,
+      16,    17,    67,    18,   -14,    69,    19,    60,    20,     1,
+      21,    63,    22,    23,     1,     2,     3,     4,     5,    64,
+       6,     7,     8,     9,    10,    11,    12,    65,    13,    14,
+      15,    16,    17,    66,    18,   -14,   -11,    19,    68,    20,
+      70,    21,    59,    22,    23,     1,     2,     3,     4,     5,
+      54,     6,     7,     8,     9,    10,    11,    12,    55,    56,
+      57,    44,    62,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    22,    23
 };
 
 static const yytype_int8 yycheck[] =
 {
-       0,     0,    26,     3,     4,     5,     6,     7,    31,     9,
-      10,    11,    12,    13,    14,    15,    39,    17,    18,    19,
-      20,    21,    25,    23,    24,    25,     3,    27,    23,    29,
-      30,     3,     4,     5,     6,     7,    28,     9,    10,    11,
-      12,    13,    14,    15,    23,    17,    18,    19,    20,    21,
-      24,    23,    24,    25,    26,    27,    43,    29,    30,     3,
-       4,     5,     6,     7,    47,     9,    10,    11,    12,    13,
-      14,    15,    28,    53,    -1,    -1,    56,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,    30,    -1,    -1,    45,
-      -1,    -1,    -1,    49
+       0,     0,    25,     3,     4,     5,     6,     7,    29,     9,
+      10,    11,    12,    13,    14,    15,    24,    17,    18,    19,
+      20,    21,    58,    23,    24,    61,    26,    48,    28,     3,
+      30,    52,    32,    33,     3,     4,     5,     6,     7,    27,
+       9,    10,    11,    12,    13,    14,    15,    29,    17,    18,
+      19,    20,    21,    31,    23,    24,    25,    26,    23,    28,
+      23,    30,    46,    32,    33,     3,     4,     5,     6,     7,
+      32,     9,    10,    11,    12,    13,    14,    15,    40,    41,
+      42,    25,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    32,    33
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -658,12 +666,13 @@ static const yytype_int8 yycheck[] =
 static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     9,    10,    11,    12,
-      13,    14,    15,    17,    18,    19,    20,    21,    23,    24,
-      27,    29,    30,    32,    33,    34,    36,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    54,    55,    56,
-       0,    32,    26,    38,    39,    53,    25,    40,    41,    52,
-      42,    45,    45,    35,    39,    42,    37,    41,    42,    28,
-      33,    23,    33,    23
+      13,    14,    15,    17,    18,    19,    20,    21,    23,    26,
+      28,    30,    32,    33,    35,    36,    37,    39,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    57,    58,
+      59,    60,    61,     0,    35,    25,    41,    42,    56,    24,
+      43,    44,    55,    45,    48,    48,    48,    48,    38,    42,
+      45,    40,    44,    45,    27,    29,    31,    36,    23,    36,
+      23
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1722,28 +1731,49 @@ yyreduce:
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 148 "parser.y"
-    {concat("<br /><br />",12);}
+#line 150 "parser.y"
+    {concat("<pre><code>",11);}
     break;
 
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 149 "parser.y"
-    {concat("<pre><code>",11);}
+#line 150 "parser.y"
+    {concat("</code></pre>",13);}
     break;
 
   case 56:
 
 /* Line 1455 of yacc.c  */
-#line 149 "parser.y"
-    {concat("</code></pre>",13);}
+#line 151 "parser.y"
+    {concat("<pre>",5);}
+    break;
+
+  case 57:
+
+/* Line 1455 of yacc.c  */
+#line 151 "parser.y"
+    {concat("</pre>",6);}
+    break;
+
+  case 58:
+
+/* Line 1455 of yacc.c  */
+#line 152 "parser.y"
+    {concat("<code>",6);}
+    break;
+
+  case 59:
+
+/* Line 1455 of yacc.c  */
+#line 152 "parser.y"
+    {concat("</code>",7);}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1747 "parser.tab.c"
+#line 1777 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1955,7 +1985,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 153 "parser.y"
+#line 156 "parser.y"
 
 
 concat_hex_char(char c){

data/ext/breakout_parser/parser.tab.h

@@ -60,13 +60,16 @@
      H5 = 276,
      SPACE = 277,
      BR = 278,
-     BRBR = 279,
-     OLI = 280,
-     ULI = 281,
-     PRE_START = 282,
-     PRE_END = 283,
-     BOLD_END = 284,
-     ITALIC_END = 285
+     OLI = 279,
+     ULI = 280,
+     PRE_CODE_START = 281,
+     PRE_CODE_END = 282,
+     PRE_START = 283,
+     PRE_END = 284,
+     CODE_START = 285,
+     CODE_END = 286,
+     BOLD_END = 287,
+     ITALIC_END = 288
    };
 #endif
 
@@ -86,7 +89,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 90 "parser.tab.h"
+#line 93 "parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/ext/breakout_parser/parser.y

@@ -71,8 +71,8 @@ void yyerror(const char *msg)
 %token <svalue> URL
 %token <svalue> UL
 %token <svalue> H1 H2 H3 H4 H5
-%token SPACE BR BRBR OLI ULI
-%token PRE_START PRE_END 
+%token SPACE BR /*BRBR*/ OLI ULI
+%token PRE_CODE_START PRE_CODE_END PRE_START PRE_END CODE_START CODE_END
 %token BOLD_END ITALIC_END
 
 //%type <dvalue> expression
@@ -92,7 +92,7 @@ textitem: br
      | h5 {concat("</h5>",5)}
      | {concat("<ul>",4)} ulist {concat("</ul>",5)} textitem
      | {concat("<ol>",4)} olist {concat("</ol>",5)} textitem
-     | pre
+     | code
 
 ulist: ulitem        {concat("</li>",5)}
      | ulist ulitem  {concat("</li>",5)}
@@ -141,12 +141,15 @@ h2   : H2          {concat("<h2 id=\"",8); process_header($1)}
 h3   : H3          {concat("<h3 id=\"",8); process_header($1)}
 h4   : H4          {concat("<h4 id=\"",8); process_header($1)}
 h5   : H5          {concat("<h5 id=\"",8); process_header($1)}
-ul   : UL          {concat("<ul>",4)}
+//ul   : UL          {concat("<ul>",4)}
 oli  : OLI         {concat("<li>",4)}
 uli  : ULI         {concat("<li>",4)}
 br   : BR          {concat("<br />",6)}
-     | BRBR        {concat("<br /><br />",12)}
-pre  : PRE_START   {concat("<pre><code>",11)} chars PRE_END {concat("</code></pre>",13)}
+//     | BRBR        {concat("<br /><br />",12)}
+
+code : PRE_CODE_START {concat("<pre><code>",11)} chars PRE_CODE_END {concat("</code></pre>",13)}
+     | PRE_START      {concat("<pre>",5)}        chars PRE_END      {concat("</pre>",6)}
+     | CODE_START     {concat("<code>",6)}       chars CODE_END     {concat("</code>",7)}
 
 //word : T_WORD        { process_word($1); }