Skip to content
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

Update parsimonious to 0.10.0 #3

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update parsimonious to 0.10.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99dd0da
Update parsimonious version
benjaminbellamy Jan 7, 2024
da0c841
Update version number
benjaminbellamy Jan 7, 2024
448bf77
fix: update regexps for Python 3.12
benjaminbellamy Dec 30, 2024
1020dfe
fix: update version
benjaminbellamy Dec 30, 2024
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
6 changes: 3 additions & 3 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = hypertag-lang
version = 1.2.0
version = 1.2.2
author = Marcin Wojnarski
author_email = [email protected]
description = Modern language for markup generation with Python-like concise syntax, custom tags & Django integration. HTML templates reinvented.
Expand All @@ -19,11 +19,11 @@ keywords = markup, language, html, html5, css, templates, templating, tags, jinj
package_dir =
= src
packages = find:
python_requires = >=3.5
python_requires = >=3.12
setup_requires =
wheel
install_requires =
parsimonious==0.8.1
parsimonious>=0.10.0
six>=1.12.0

[options.packages.find]
Expand Down
13 changes: 6 additions & 7 deletions src/hypertag/core/grammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
block_expr = mark_eval expr_assign
block_assign = mark_eval ws targets ws op_inplace? '=' expr_assign
expr_assign = ws (expr_augment / embedding) inline_comment?
op_inplace = ~"//|\%%|<<|>>|[-+*/&|^]"
op_inplace = ~"//|\\%%|<<|>>|[-+*/&|^]"

block_while = 'while' clause_if clause_else?
block_for = 'for' space targets space 'in' space tail_for clause_else?
Expand All @@ -61,7 +61,7 @@

block_context = 'context' space cntx_import (comma cntx_import)* inline_comment?
block_import = 'from' space path_import space 'import' space item_import (comma item_import)* inline_comment?
path_import = ~"[^\s\x22\x27]+" # import path can be ANY string of 1+ characters unless it contains a whitespace, ' or "
path_import = ~"[^\\s\x22\x27]+" # import path can be ANY string of 1+ characters unless it contains a whitespace, ' or "
item_import = wild_import / name_import
wild_import = '*'
cntx_import = symbol rename?
Expand Down Expand Up @@ -231,7 +231,7 @@
partial_call = '(' ws (args ws)? ')'
filter = factor_filt partial_call? # no space is allowed between the function and its arguments

qualifier = ~"[\?!]" # ? means that None/empty(false)/exceptions shall be converted to '' ... ! means that empty (false) value triggers exception
qualifier = ~"[\\?!]" # ? means that None/empty(false)/exceptions shall be converted to '' ... ! means that empty (false) value triggers exception
# obligatory = '!'
# optional = '?'

Expand All @@ -246,7 +246,7 @@
op_empty = '?' / '!'

not = 'not'
op_comp = ~"==|!=|<>|>=|<=|<|>|not\s+in|is\s+not|in|is"
op_comp = ~"==|!=|<>|>=|<=|<|>|not\\s+in|is\\s+not|in|is"

### IDENTIFIERS

Expand All @@ -264,7 +264,7 @@
literal = number / string / boolean / none

number_signed = ~"[+-]?" number
number = ~"((\.\d+)|(\d+(\.\d*)?))([eE][+-]?\d+)?" # the leading +- is added during expression construction (<neg>)
number = ~"((\\.\\d+)|(\\d+(\\.\\d*)?))([eE][+-]?\\d+)?" # the leading +- is added during expression construction (<neg>)
#string = ~"'[^']*'" / ~'"[^"]*"' # '...' or "..." string; no escaping of ' and " inside!
boolean = 'True' / 'False'
none = 'None'
Expand All @@ -279,7 +279,7 @@

### BASIC TOKENS

escape = ~'\$\$|{{|}}' # escape sequences: $$ {{ }}
escape = ~'\\$\\$|{{|}}' # escape sequences: $$ {{ }}

verbatim = ~"[^%(INDENT_S)s%(DEDENT_S)s%(INDENT_T)s%(DEDENT_T)s\n]+"su # 1 line of plain text, may include special symbols (left unparsed)
text = ~"[^%(INDENT_S)s%(DEDENT_S)s%(INDENT_T)s%(DEDENT_T)s\n${}]+"su # 1 line of plain text, excluded $ { }
Expand Down Expand Up @@ -332,4 +332,3 @@ def IS_TAG(symbol):

def IS_VAR(symbol):
return symbol.startswith(MARK_VAR)

3 changes: 1 addition & 2 deletions src/hypertag/core/xml_chars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
XML_StartChar = r"_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\U00010000-\U000EFFFF"

# human-readable: XML_StartChar | [0-9.\u00B7-] | [\u0300-\u036F] | [\u203F-\u2040]
XML_Char = XML_StartChar + r"0-9\.\-" + r"\u00B7\u0300-\u036F\u203F-\u2040" + ":"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change looks unneeded (incorrect) to me, as this regex is in plain Python code outside the grammar, and Py 3.5 and 3.12 should interpret this in the same way.

XML_Char = XML_StartChar + r"0-9\\.\\-" + r"\u00B7\u0300-\u036F\u203F-\u2040" + ":"

# XML_EndChar is like XML_Char, but ":" is NOT allowed, to avoid collision with a trailing ":" used in Hypertag blocks
XML_EndChar = XML_Char[:-1]