feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix: Compatibility with pyparsing>=3.1.0

Browse Source
This commit is contained in:
radim.karnis
2023-06-25 19:59:13 +02:00
parent c570f67461
commit 8ed82f11ae
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