xueye/markdown
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Improved strong/emph parsers to avoid exponential blowup. [jgm/peg-markdown]

Browse Source 
See https://github.com/jgm/peg-markdown/commit/c59e682
This commit is contained in:
Michael Teichgräber 2013-01-23 22:24:50 +01:00
parent f42048b731
commit 54cb06d41a
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
parser.leg
View File

@ -529,44 +529,48 @@ UlOrStarLine = (UlLine | StarLine) { $$ = p.mkString(yytext) }
StarLine = < "****" '*'* > | < Spacechar '*'+ &Spacechar >
UlLine = < "____" '_'* > | < Spacechar '_'+ &Spacechar >
SpaceInline = a:StartList
( (b:Space | b:Endline) { a = cons(b, a) } )+
c:Inline { a = cons(c, a); $$ = p.mkList(LIST, a) }
NonspaceInline = !Spacechar !Newline Inline
Emph = EmphStar | EmphUl
OneStarOpen = !StarLine '*' !Spacechar !Newline
OneStarClose = !Spacechar !Newline a:Inline '*' { $$ = a }
EmphStar = OneStarOpen
EmphStar = '*'
a:StartList
( !OneStarClose Inline { a = cons($$, a) } )*
OneStarClose { a = cons($$, a) }
( !'*' b:NonspaceInline { a = cons(b, a) }
| b:SpaceInline { a = cons(b, a) }
| b:StrongStar { a = cons(b, a) }
)+
'*'
{ $$ = p.mkList(EMPH, a) }
OneUlOpen = !UlLine '_' !Spacechar !Newline
OneUlClose = !Spacechar !Newline a:Inline '_' !Alphanumeric { $$ = a }
EmphUl = OneUlOpen
EmphUl = '_'
a:StartList
( !OneUlClose Inline { a = cons($$, a) } )*
OneUlClose { a = cons($$, a) }
( !'_' b:NonspaceInline { a = cons(b, a) }
| b:SpaceInline { a = cons(b, a) }
| b:StrongUl { a = cons(b, a) }
)+
'_'
{ $$ = p.mkList(EMPH, a) }
Strong = StrongStar | StrongUl
TwoStarOpen = !StarLine "**" !Spacechar !Newline
TwoStarClose = !Spacechar !Newline a:Inline "**" { $$ = a }
StrongStar = TwoStarOpen
StrongStar = "**"
a:StartList
( !TwoStarClose Inline { a = cons($$, a) } )*
TwoStarClose { a = cons($$, a) }
( !"**" b:NonspaceInline { a = cons(b, a) }
| b:SpaceInline { a = cons(b, a) }
)+
"**"
{ $$ = p.mkList(STRONG, a) }
TwoUlOpen = !UlLine "__" !Spacechar !Newline
TwoUlClose = !Spacechar !Newline a:Inline "__" !Alphanumeric { $$ = a }
StrongUl = TwoUlOpen
StrongUl = "__"
a:StartList
( !TwoUlClose Inline { a = cons($$, a) } )*
TwoUlClose { a = cons($$, a) }
( !"__" b:NonspaceInline { a = cons(b, a) }
| b:SpaceInline { a = cons(b, a) }
)+
"__"
{ $$ = p.mkList(STRONG, a) }
Image = '!' ( ExplicitLink | ReferenceLink )

2
portid
View File

@ -1 +1 @@
179
191