Formatting cleanup for grammar.

This commit is contained in:
Ian Gulliver
2014-06-29 18:27:46 -07:00
parent 14860b6323
commit 3bc51e27a6
2 changed files with 55 additions and 14 deletions

View File

@@ -1,14 +1,54 @@
var mediawiki = {
'b': rr.Node('b', rr.Sequence(rr.Literal("'''"), rr.Ref('wikichunk'), rr.Literal("'''"))),
'del': rr.Sequence(rr.Literal('<strike>'), rr.Ref('wikichunk'), rr.Literal('</strike>')),
'h2': rr.Sequence(rr.StartOfLine(), rr.Literal('== '), rr.SingleLineText(), rr.Literal(' =='), rr.EndOfLine()),
'h3': rr.Node('h3', rr.Sequence(rr.StartOfLine(), rr.Literal('=== '), rr.SingleLineText(), rr.Literal(' ==='), rr.EndOfLine())),
'h4': rr.Sequence(rr.StartOfLine(), rr.Literal('==== '), rr.SingleLineText(), rr.Literal(' ===='), rr.EndOfLine()),
'h5': rr.Sequence(rr.StartOfLine(), rr.Literal('===== '), rr.SingleLineText(), rr.Literal(' ====='), rr.EndOfLine()),
'h6': rr.Sequence(rr.StartOfLine(), rr.Literal('====== '), rr.SingleLineText(), rr.Literal(' ======'), rr.EndOfLine()),
'hr': rr.Sequence(rr.StartOfLine(), rr.Literal('----'), rr.EndOfLine()),
'i': rr.Sequence(rr.Literal("''"), rr.Ref('wikichunk'), rr.Literal("''")),
'nowiki': rr.Sequence(rr.Literal('<nowiki>'), rr.MultiLineText(), rr.Literal('</nowiki>')),
'b': rr.Node('b', rr.Sequence(
rr.Literal("'''"),
rr.Ref('wikichunk'),
rr.Literal("'''"))),
'del': rr.Node('del', rr.Sequence(
rr.Literal('<strike>'),
rr.Ref('wikichunk'),
rr.Literal('</strike>'))),
'h2': rr.Node('h2', rr.Sequence(
rr.StartOfLine(),
rr.Literal('== '),
rr.SingleLineText(),
rr.Literal(' =='),
rr.EndOfLine())),
'h3': rr.Node('h3', rr.Sequence(
rr.StartOfLine(),
rr.Literal('=== '),
rr.SingleLineText(),
rr.Literal(' ==='),
rr.EndOfLine())),
'h4': rr.Node('h4', rr.Sequence(
rr.StartOfLine(),
rr.Literal('==== '),
rr.SingleLineText(),
rr.Literal(' ===='),
rr.EndOfLine())),
'h5': rr.Node('h5', rr.Sequence(
rr.StartOfLine(),
rr.Literal('===== '),
rr.SingleLineText(),
rr.Literal(' ====='),
rr.EndOfLine())),
'h6': rr.Node('h6', rr.Sequence(
rr.StartOfLine(),
rr.Literal('====== '),
rr.SingleLineText(),
rr.Literal(' ======'),
rr.EndOfLine())),
'hr': rr.Node('hr', rr.Sequence(
rr.StartOfLine(),
rr.Literal('----'),
rr.EndOfLine())),
'i': rr.Node('i', rr.Sequence(
rr.Literal("''"),
rr.Ref('wikichunk'),
rr.Literal("''"))),
'nowiki': rr.Sequence(
rr.Literal('<nowiki>'),
rr.MultiLineText(),
rr.Literal('</nowiki>')),
'text': rr.MultiLineText(),
'wikichunk': rr.Or(
rr.Ref('b'),
@@ -21,7 +61,8 @@ var mediawiki = {
rr.Ref('hr'),
rr.Ref('i'),
rr.Ref('nowiki'),
rr.Ref('text')
),
'wikidoc': rr.Node('wikidoc', rr.Sequence(rr.ZeroOrMore(rr.Ref('wikichunk')), rr.EndOfText())),
rr.Ref('text')),
'wikidoc': rr.Node('wikidoc', rr.Sequence(
rr.ZeroOrMore(rr.Ref('wikichunk')),
rr.EndOfText()))
};

View File

@@ -13,4 +13,4 @@ curl \
echo
gjslint --strict recentrunes.js
gjslint --strict --nojsdoc test.js
gjslint --strict --nojsdoc test.js grammars/mediawiki.js