Skip to content

Tiny change to fix bug related to pre-delivery selftest failed #197

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

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Tiny change to fix bug related to pre-delivery selftest failed #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions JsonPreprocessor/CJsonPreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,15 +1211,16 @@ def __checkKeynameFormat(oJson : dict):
raise Exception(f"Provided syntax '{self.syntax}' is not supported.")
# Load the temporary Json object without checking duplicated keys for
# verifying duplicated keys later.
self.bDuplicatedKeys = False
try:
self.jsonCheck = json.loads(sJsonDataUpdated,
cls=CJSONDecoder,
object_pairs_hook=self.__processImportFiles)
except Exception as error:
self.__reset(bCleanGlobalVars=True)
raise Exception(f"JSON file: {jFile}\n{error}")
self.bDuplicatedKeys = True
if masterFile:
self.bDuplicatedKeys = False
try:
self.jsonCheck = json.loads(sJsonDataUpdated,
cls=CJSONDecoder,
object_pairs_hook=self.__processImportFiles)
except Exception as error:
self.__reset(bCleanGlobalVars=True)
raise Exception(f"JSON file: {jFile}\n{error}")
self.bDuplicatedKeys = True

# Load Json object with checking duplicated keys feature is enabled.
# The duplicated keys feature uses the self.jsonCheck object to check duplicated keys.
Expand All @@ -1230,7 +1231,6 @@ def __checkKeynameFormat(oJson : dict):
except Exception as error:
self.__reset(bCleanGlobalVars=True)
raise Exception(f"JSON file: {jFile}\n{error}")
self.jsonCheck = {}
self.__checkDotInParamName(oJson)
__checkKeynameFormat(oJson)

Expand All @@ -1243,6 +1243,7 @@ def __checkKeynameFormat(oJson : dict):
k = CNameMangling.AVOIDDATATYPE.value + k
globals().update({k:v})
oJson, bNested = self.__updateAndReplaceNestedParam(oJson)
self.jsonCheck = {}
for k, v in self.dUpdatedParams.items():
if '[' in k:
rootElement = k.split('[', 1)[0]
Expand Down