* [Patch] BaseTools: Fix one bug of nest !include parser
@ 2018-06-12 1:00 Yonghong Zhu
2018-06-12 1:51 ` Kinney, Michael D
2018-06-13 1:00 ` Zhu, Yonghong
0 siblings, 2 replies; 3+ messages in thread
From: Yonghong Zhu @ 2018-06-12 1:00 UTC (permalink / raw)
To: edk2-devel; +Cc: Yunhua Feng, Liming Gao
From: Yunhua Feng <yunhuax.feng@intel.com>
The case is DSC file include file1, file1 include file2, after parse
file2 finished, DSC parser get the wrong section type, then it would
report invalid error.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
BaseTools/Source/Python/Workspace/MetaFileParser.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 8ab1dd2..4252e6d 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1568,11 +1568,15 @@ class DscParser(MetaFileParser):
# Parse the included file
Parser.Start()
# update current status with sub-parser's status
self._SectionName = Parser._SectionName
- self._SectionType = Parser._SectionType
+ if not self._InSubsection:
+ self._SectionType = Parser._SectionType
+ self._SubsectionType = Parser._SubsectionType
+ self._InSubsection = Parser._InSubsection
+
self._Scope = Parser._Scope
self._Enabled = Parser._Enabled
# Insert all records in the table for the included file into dsc file table
Records = IncludedFileTable.GetAll()
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Patch] BaseTools: Fix one bug of nest !include parser
2018-06-12 1:00 [Patch] BaseTools: Fix one bug of nest !include parser Yonghong Zhu
@ 2018-06-12 1:51 ` Kinney, Michael D
2018-06-13 1:00 ` Zhu, Yonghong
1 sibling, 0 replies; 3+ messages in thread
From: Kinney, Michael D @ 2018-06-12 1:51 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org, Kinney, Michael D
Cc: Feng, YunhuaX, Gao, Liming
Tested-by: Michael D Kinney <michael.d.kinney@intel.com>
Mike
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-
> bounces@lists.01.org] On Behalf Of Yonghong Zhu
> Sent: Monday, June 11, 2018 6:01 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, YunhuaX <yunhuax.feng@intel.com>; Gao, Liming
> <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix one bug of nest
> !include parser
>
> From: Yunhua Feng <yunhuax.feng@intel.com>
>
> The case is DSC file include file1, file1 include file2,
> after parse
> file2 finished, DSC parser get the wrong section type,
> then it would
> report invalid error.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
> ---
> BaseTools/Source/Python/Workspace/MetaFileParser.py | 6
> +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git
> a/BaseTools/Source/Python/Workspace/MetaFileParser.py
> b/BaseTools/Source/Python/Workspace/MetaFileParser.py
> index 8ab1dd2..4252e6d 100644
> ---
> a/BaseTools/Source/Python/Workspace/MetaFileParser.py
> +++
> b/BaseTools/Source/Python/Workspace/MetaFileParser.py
> @@ -1568,11 +1568,15 @@ class DscParser(MetaFileParser):
> # Parse the included file
> Parser.Start()
>
> # update current status with sub-parser's
> status
> self._SectionName = Parser._SectionName
> - self._SectionType = Parser._SectionType
> + if not self._InSubsection:
> + self._SectionType = Parser._SectionType
> + self._SubsectionType =
> Parser._SubsectionType
> + self._InSubsection = Parser._InSubsection
> +
> self._Scope = Parser._Scope
> self._Enabled = Parser._Enabled
>
> # Insert all records in the table for the
> included file into dsc file table
> Records = IncludedFileTable.GetAll()
> --
> 2.6.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Patch] BaseTools: Fix one bug of nest !include parser
2018-06-12 1:00 [Patch] BaseTools: Fix one bug of nest !include parser Yonghong Zhu
2018-06-12 1:51 ` Kinney, Michael D
@ 2018-06-13 1:00 ` Zhu, Yonghong
1 sibling, 0 replies; 3+ messages in thread
From: Zhu, Yonghong @ 2018-06-13 1:00 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org
Cc: Feng, YunhuaX, Gao, Liming, Zhu, Yonghong
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
Sent: Tuesday, June 12, 2018 9:01 AM
To: edk2-devel@lists.01.org
Cc: Feng, YunhuaX <yunhuax.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2] [Patch] BaseTools: Fix one bug of nest !include parser
From: Yunhua Feng <yunhuax.feng@intel.com>
The case is DSC file include file1, file1 include file2, after parse
file2 finished, DSC parser get the wrong section type, then it would report invalid error.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
BaseTools/Source/Python/Workspace/MetaFileParser.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 8ab1dd2..4252e6d 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1568,11 +1568,15 @@ class DscParser(MetaFileParser):
# Parse the included file
Parser.Start()
# update current status with sub-parser's status
self._SectionName = Parser._SectionName
- self._SectionType = Parser._SectionType
+ if not self._InSubsection:
+ self._SectionType = Parser._SectionType
+ self._SubsectionType = Parser._SubsectionType
+ self._InSubsection = Parser._InSubsection
+
self._Scope = Parser._Scope
self._Enabled = Parser._Enabled
# Insert all records in the table for the included file into dsc file table
Records = IncludedFileTable.GetAll()
--
2.6.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-13 1:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-12 1:00 [Patch] BaseTools: Fix one bug of nest !include parser Yonghong Zhu
2018-06-12 1:51 ` Kinney, Michael D
2018-06-13 1:00 ` Zhu, Yonghong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox