espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/pyparsing_3.1.0_compatibility_v5.0' into 'release/v5.0'

Browse Source 
fix: Compatibility with pyparsing>=3.1.0 (backport v5.0)

See merge request espressif/esp-idf!24370
This commit is contained in:
Roland Dobai
2023-07-11 16:40:15 +08:00
parent 7bd6e8f707 7b98762ff5
commit bd824a04d6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ldgen/ldgen/entity.py
View File

@ -1,5 +1,5 @@
# #
# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -9,8 +9,8 @@ import os
from enum import Enum from enum import Enum
from functools import total_ordering from functools import total_ordering
from pyparsing import (Group, Literal, OneOrMore, ParseException, SkipTo, Suppress, White, Word, ZeroOrMore, alphas, from pyparsing import (Group, Literal, OneOrMore, ParseException, Regex, SkipTo, Suppress, White, Word, ZeroOrMore,
nums, rest_of_line) alphas, nums, rest_of_line)
@total_ordering @total_ordering
@ -139,7 +139,7 @@ class EntityDB:
# 00 {section} 0000000 ... # 00 {section} 0000000 ...
# CONTENTS, ALLOC, .... # CONTENTS, ALLOC, ....
section_entry = (Suppress(Word(nums)) + SkipTo(' ') + Suppress(rest_of_line) section_entry = (Suppress(Word(nums)) + Regex(r'\.\S+') + Suppress(rest_of_line)
+ Suppress(ZeroOrMore(Word(alphas) + Literal(',')) + Word(alphas))) + Suppress(ZeroOrMore(Word(alphas) + Literal(',')) + Word(alphas)))
content = Group(object_line content = Group(object_line