Skip to content

Adding some common characters to the components #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubentsirunyan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adding some common characters to the components #10

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e81d3f9
Adding some common characters to the components
rubentsirunyan Jun 6, 2018
155f152
Adding some new characters to be parsed
rubentsirunyan Jun 7, 2018
9f0e3fa
Allow for directives like "php_value"
rjhornsby Jun 17, 2018
8d61321
Simplify call to `Word` constructor.
rjhornsby Jun 17, 2018
9e4e201
Merge pull request #1 from rjhornsby/master
rubentsirunyan Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions parse_apache_configs/parse_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
# a conditional expression. The reason this is done
# is so that a tag with the ">" operator in the
# arguments will parse correctly.
OPERAND = Word(alphanums + "." + '"' + '/-' + "*:^_![]?$%@)(#=`" + '\\')
OPERAND = Word(alphanums + "." + '"' + '/-' + "*:^_|![]?$%@)(#=`'}{&+~" + '\\')
OPERATOR = oneOf(["<=", ">=", "==", "!=", "<", ">", "~"], useRegex=False)
EXPRESSION_TAG = OPERAND + White() + OPERATOR + White() + OPERAND
EXPRESSION_TAG = Word(alphanums) + White() + OPERAND + White() + OPERATOR + White() + OPERAND

# LITERAL_TAG will match tags that do not have
# a conditional expression. So any other tag
# with arguments that don't contain OPERATORs
LITERAL_TAG = OneOrMore(Word(
alphanums + '*:' + '/' + '"-' + '.' + " " + "^" + "_" + "!" + "[]?$"
+ "'" + '\\'
+ "'" + '\\' + "*:^_|![]?$%@)(#=`'}{&+~"
))
# Will match the start of any tag
TAG_START_GRAMMAR = Group(Literal("<") + (EXPRESSION_TAG | LITERAL_TAG)
Expand All @@ -27,10 +27,9 @@
# Will match any directive. We are performing
# a simple parse by matching the directive on
# the left, and everything else on the right.
ANY_DIRECTIVE = Group(Word(alphanums) + Suppress(White())
ANY_DIRECTIVE = Group(Word(alphanums+'_-@.') + Suppress(White())
+ Word(printables + " ") + LineEnd())


COMMENT = Group(
(Literal("#") + LineEnd()) ^
(Literal("#")
Expand Down