From 507328d4dbb1d1d4e7c3d07334b3982cdb775fc8 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Mon, 19 Nov 2018 18:30:24 +0800 Subject: [PATCH] ldgen: fix issues when using pyparsing 2.3.0 --- tools/ldgen/fragments.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/ldgen/fragments.py b/tools/ldgen/fragments.py index f088515299..d28ce01bad 100644 --- a/tools/ldgen/fragments.py +++ b/tools/ldgen/fragments.py @@ -183,15 +183,20 @@ class Mapping(Fragment): def _process_entries(self): processed = [] - for normal_group in self.entries.normal_groups: + for normal_group in self.entries[0]: # Get the original string of the condition condition = next(iter(normal_group.condition.asList())).strip() - mappings = self._create_mappings_set(normal_group.mappings) - + mappings = self._create_mappings_set(normal_group[1]) + processed.append((condition, mappings)) + + default_group = self.entries[1] + + if len(default_group) > 1: + mappings = self._create_mappings_set(default_group[1]) + else: + mappings = self._create_mappings_set(default_group[0]) - default_group = self.entries.default_group - mappings = self._create_mappings_set(default_group.mappings) processed.append(("default", mappings)) self.entries = processed