From 4020b0deb036ffa3fd01d2dac2297670f65fb7c3 Mon Sep 17 00:00:00 2001 From: "radim.karnis" Date: Tue, 20 Jun 2023 13:16:22 +0200 Subject: [PATCH] fix: Compatibility with pyparsing>=3.1.0 --- tools/ldgen/ldgen/entity.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ldgen/ldgen/entity.py b/tools/ldgen/ldgen/entity.py index 35021a51b5..aecdcab91b 100644 --- a/tools/ldgen/ldgen/entity.py +++ b/tools/ldgen/ldgen/entity.py @@ -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 # @@ -9,8 +9,8 @@ import os from enum import Enum from functools import total_ordering -from pyparsing import (Group, Literal, OneOrMore, ParseException, SkipTo, Suppress, White, Word, ZeroOrMore, alphas, - nums, rest_of_line) +from pyparsing import (Group, Literal, OneOrMore, ParseException, Regex, SkipTo, Suppress, White, Word, ZeroOrMore, + alphas, nums, rest_of_line) @total_ordering @@ -139,7 +139,7 @@ class EntityDB: # 00 {section} 0000000 ... # 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))) content = Group(object_line