Skip to content

model_utils: File__FindSimpleOption is updated #121

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
dmitry-lipetsk merged 1 commit into from
Nov 13, 2026
Merged

model_utils: File__FindSimpleOption is updated #121

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
13 changes: 9 additions & 4 deletions src/core/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,19 +392,23 @@ def reg_file(
# --------------------------------------------------------------------
@staticmethod
def File__FindSimpleOption(
findCtx: tagFindCtx,
findCtx: typing.Optional[tagFindCtx],
fileData: PgCfgModel__FileData,
optionName: str,
enterIntoIncludes: bool,
) -> typing.Optional[PgCfgModel__OptionData]:
assert type(findCtx) is __class__.tagFindCtx
assert not enterIntoIncludes or type(findCtx) is __class__.tagFindCtx
assert type(fileData) is PgCfgModel__FileData
assert type(fileData.m_Lines) is list
assert type(optionName) is str
assert type(enterIntoIncludes) is bool

if not findCtx.reg_file(fileData.m_Path):
return None
if not enterIntoIncludes:
pass
else:
assert findCtx is not None
if not findCtx.reg_file(fileData.m_Path):
return None

stack: typing.List[
typing.Tuple[
Expand Down Expand Up @@ -461,6 +465,7 @@ def File__FindSimpleOption(
# might be overridden by that included file.
return None # <--------- FAIL

assert findCtx is not None
if not findCtx.reg_file(firstItem.m_Element.m_File.m_Path):
continue

Expand Down
Loading