cleanup

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 45 insertions, 43 deletions

diff --git a/libparser.7 b/libparser.7
index 174bac9..d06e5ab 100644
--- a/libparser.7
+++ b/libparser.7
@@ -37,83 +37,85 @@ input can be described in its own grammar:
 .nf
 (* CHARACTER CLASSES *)
 
-_space           = \(dq \(dq | \(dq\en\(dq | \(dq\et\(dq;
-_alpha           = <\(dqa\(dq, \(dqz\(dq> | <\(dqA\(dq, \(dqZ\(dq>;
-_octal           = <\(dq0\(dq, \(dq7\(dq>;
-_digit           = <\(dq0\(dq, \(dq9\(dq>;
-_xdigit          = _digit | <\(dqa\(dq, \(dqf\(dq> | <\(dqA\(dq, \(dqF\(dq>;
-_nonascii        = <128, 255>;
+_space            = \(dq \(dq | \(dq\en\(dq | \(dq\et\(dq;
+_alpha            = <\(dqa\(dq, \(dqz\(dq> | <\(dqA\(dq, \(dqZ\(dq>;
+_octal            = <\(dq0\(dq, \(dq7\(dq>;
+_digit            = <\(dq0\(dq, \(dq9\(dq>;
+_xdigit           = _digit | <\(dqa\(dq, \(dqf\(dq> | <\(dqA\(dq, \(dqF\(dq>;
+_nonascii         = <128, 255>;
 
 
 (* WHITESPACE/COMMENTS, THE GRAMMAR IS FREE-FORM *)
 
-_comment_char    = _space | !\(dq*\(dq, !\(dq\e\(dq\(dq, <\(dq!\(dq, 0xFF>;
-_comment_tail    = [_comment_char], [_string], (\(dq*)\(dq | [*], _comment_tail | -);
-_comment         = \(dq(*\(dq, _comment_tail;
+_comment_str_esc  = \(dq\e\(dq\(dq, (_space | <\(dq!\(dq, 0xFF>);
+_comment_str_char = _space | !\(dq\e\(dq\(dq, <\(dq!\(dq, 0xFF>;
+_comment_str      = \(dq\e\(dq\(dq, {_comment_str_esc | _comment_str_char}, (\(dq\e\(dq\(dq | -);
+_comment_char     = _space | !\(dq*)\(dq, !\(dq\e\(dq\(dq, <\(dq!\(dq, 0xFF>;
+_comment          = \(dq(*\(dq, {_comment_char | _comment_str}, (\(dq*)\(dq | -);
 
-_                = {_space | _comment};
+_                 = {_space | _comment};
 
 
 (* IDENTIFIERS *)
 
-_identifier_head = _alpha | _digit | _nonascii | \(dq_\(dq;
-_identifier_tail = _identifier_head | \(dq-\(dq;
+_identifier_head  = _alpha | _digit | _nonascii | \(dq_\(dq;
+_identifier_tail  = _identifier_head | \(dq-\(dq;
 
-identifier       = _identifier_head, {_identifier_tail};
+identifier        = _identifier_head, {_identifier_tail};
 
 
 (* STRINGS *)
 
-_escape_simple   = \(dq\e\e\(dq | \(dq\e\(dq\(dq | \(dq'\(dq | \(dqa\(dq | \(dqb\(dq | \(dqf\(dq | \(dqn\(dq | \(dqr\(dq | \(dqt\(dq | \(dqv\(dq;
-_escape_hex      = (\(dqx\(dq | \(dqX\(dq), _xdigit, _xdigit;
-_escape_octal    = _octal, {_octal}; (* May not exceed 255 in base 10 *)
-_escape          = _escape_simple | _escape_hex | _escape_octal | -;
-_character       = \(dq\e\e\(dq, _escape | !\(dq\e\(dq\(dq, <\(dq \(dq, 0xFF>;
-_string          = \(dq\e\(dq\(dq, _character, {_character}, (\(dq\e\(dq\(dq | -);
+_escape_simple    = \(dq\e\e\(dq | \(dq\e\(dq\(dq | \(dq'\(dq | \(dqa\(dq | \(dqb\(dq | \(dqf\(dq | \(dqn\(dq | \(dqr\(dq | \(dqt\(dq | \(dqv\(dq;
+_escape_hex       = (\(dqx\(dq | \(dqX\(dq), _xdigit, _xdigit;
+_escape_octal     = _octal, {_octal}; (* May not exceed 255 in base 10 *)
+_escape           = _escape_simple | _escape_hex | _escape_octal | -;
+_character        = \(dq\e\e\(dq, _escape | !\(dq\e\(dq\(dq, <\(dq \(dq, 0xFF>;
+_string           = \(dq\e\(dq\(dq, _character, {_character}, (\(dq\e\(dq\(dq | -);
 
-string           = _string;
-character        = \(dq\e\(dq\(dq, _character, (\(dq\e\(dq\(dq | -);
+string            = _string;
+character         = \(dq\e\(dq\(dq, _character, (\(dq\e\(dq\(dq | -);
 
 
 (* INTEGERS *)
 
-_decimal         = _digit, {_digit};
-_hexadecimal     = \(dq0\(dq, (\(dqx\(dq | \(dqX\(dq), _xdigit, {_xdigit};
+_decimal          = _digit, {_digit};
+_hexadecimal      = \(dq0\(dq, (\(dqx\(dq | \(dqX\(dq), _xdigit, {_xdigit};
 
-integer          = _decimal | _hexadecimal; (* May not exceed 255. *)
+integer           = _hexadecimal | _decimal; (* May not exceed 255. *)
 
 
 (* GROUPINGS *)
 
-_low             = character | integer;
-_high            = character | integer;
+_low              = character | integer;
+_high             = character | integer;
 
-nondeterministic = \(dq?\(dq;
+nondeterministic  = \(dq?\(dq;
 
-committed        = \(dq+\(dq, _, _operand;
-rejection        = \(dq!\(dq, _, _operand;
-concatenation    = _operand, {_, \(dq,\(dq, _, _operand};
-alternation      = concatenation, {_, [nondeterministic], \(dq|\(dq, _, concatenation};
-optional         = [nondeterministic], \(dq[\(dq, _, _expression, _, \(dq]\(dq;
-repeated         = [nondeterministic], \(dq{\(dq, _, _expression, _, \(dq}\(dq;
-group            = \(dq(\(dq, _, _expression, _, \(dq)\(dq;
-char-range       = \(dq<\(dq, _, _low, _, \(dq,\(dq, _, _high, \(dq_\(dq, \(dq>\(dq;
-exception        = \(dq-\(dq;
-embedded-rule    = identifier;
+committed         = \(dq+\(dq, _, _operand;
+rejection         = \(dq!\(dq, _, _operand;
+concatenation     = _operand, {_, \(dq,\(dq, _, _operand};
+alternation       = concatenation, {_, [nondeterministic], \(dq|\(dq, _, concatenation};
+optional          = [nondeterministic], \(dq[\(dq, _, _expression, _, \(dq]\(dq;
+repeated          = [nondeterministic], \(dq{\(dq, _, _expression, _, \(dq}\(dq;
+group             = \(dq(\(dq, _, _expression, _, \(dq)\(dq;
+char-range        = \(dq<\(dq, _, _low, _, \(dq,\(dq, _, _high, _, \(dq>\(dq;
+exception         = \(dq-\(dq;
+embedded-rule     = identifier;
 
-_literal         = char-range | exception | string;
-_group           = optional | repeated | group | embedded-rule;
-_operand         = _group | _literal | rejection | committed;
+_literal          = char-range | exception | string;
+_group            = optional | repeated | group | embedded-rule;
+_operand          = _group | _literal | rejection | committed;
 
-_expression      = alternation;
+_expression       = alternation;
 
 
 (* RULES *)
 
-rule             = identifier, _, \(dq=\(dq, _, _expression, _, \(dq;\(dq;
+rule              = identifier, _, \(dq=\(dq, _, _expression, _, \(dq;\(dq;
 
 (* This is the root rule of the grammar. *)
-grammar          = _, {rules, _};
+grammar           = _, {rule, _};
 .fi
 .PP
 .RE