Skip to content

BaseTools: Ecc: Fix ECC for Python 3.13 #12315

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
mergify merged 4 commits into from
Apr 8, 2026
Merged

BaseTools: Ecc: Fix ECC for Python 3.13 #12315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d0afa3
BaseTools: Ecc: Drop ANTLR 3 Support
os-d Mar 19, 2026
64c9d1e
BaseTools: Ecc: Use SPDX in AutoGen Template
os-d Apr 3, 2026
3269c99
BaseTools: Ecc: Update to ANTLR 4.13.2
os-d Mar 19, 2026
7705587
Merge branch 'master' into ecc_p3_13
mergify[bot] Apr 8, 2026
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
673 changes: 0 additions & 673 deletions BaseTools/Source/Python/Ecc/C.g
View file
Open in desktop

This file was deleted.

4,941 changes: 0 additions & 4,941 deletions BaseTools/Source/Python/Ecc/CParser3/CLexer.py
View file
Open in desktop

This file was deleted.

18,833 changes: 0 additions & 18,833 deletions BaseTools/Source/Python/Ecc/CParser3/CParser.py
View file
Open in desktop

This file was deleted.

Empty file removed BaseTools/Source/Python/Ecc/CParser3/__init__.py
View file
Open in desktop
Empty file.
12 changes: 2 additions & 10 deletions BaseTools/Source/Python/Ecc/CParser4/C.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,10 @@ options {
#
# THIS FILE IS AUTO-GENENERATED. PLEASE DON NOT MODIFY THIS FILE.
# This file is generated by running:
# java org.antlr.Tool C.g
# java org.antlr.Tool C.g4
#
# Copyright (c) 2009 - 2010, Intel Corporation All rights reserved.
#
# This program and the accompanying materials are licensed and made available
# under the terms and conditions of the BSD License which accompanies this
# distribution. The full text of the license may be found at:
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
##

import Ecc.CodeFragment as CodeFragment
Expand Down
739 changes: 336 additions & 403 deletions BaseTools/Source/Python/Ecc/CParser4/CLexer.py
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions BaseTools/Source/Python/Ecc/CParser4/CListener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
# Generated from C.g4 by ANTLR 4.9
# Generated from C.g4 by ANTLR 4.13.2
from antlr4 import *
if __name__ is not None and "." in __name__:
if "." in __name__:
from .CParser import CParser
else:
from CParser import CParser


## @file
# The file defines the parser for C source files.
#
# THIS FILE IS AUTO-GENENERATED. PLEASE DON NOT MODIFY THIS FILE.
# This file is generated by running:
# java org.antlr.Tool C.g
# java org.antlr.Tool C.g4
#
# Copyright (c) 2009 - 2010, Intel Corporation All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##

import Ecc.CodeFragment as CodeFragment
Expand Down
1,492 changes: 512 additions & 980 deletions BaseTools/Source/Python/Ecc/CParser4/CParser.py
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@
import re
import Common.LongFilePathOs as os
import sys
if sys.version_info.major == 3:
import antlr4 as antlr
from Ecc.CParser4.CLexer import CLexer
from Ecc.CParser4.CParser import CParser
else:
import antlr3 as antlr
antlr.InputStream = antlr.StringStream
from Ecc.CParser3.CLexer import CLexer
from Ecc.CParser3.CParser import CParser
import antlr4 as antlr
from Ecc.CParser4.CLexer import CLexer
from Ecc.CParser4.CParser import CParser


from Ecc import FileProfile
Expand Down
12 changes: 3 additions & 9 deletions BaseTools/Source/Python/Eot/CodeFragmentCollector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@
import Common.LongFilePathOs as os
import sys

if sys.version_info.major == 3:
import antlr4 as antlr
from Eot.CParser4.CLexer import CLexer
from Eot.CParser4.CParser import CParser
else:
import antlr3 as antlr
antlr.InputStream = antlr.StringStream
from Eot.CParser3.CLexer import CLexer
from Eot.CParser3.CParser import CParser
import antlr4 as antlr
from Eot.CParser4.CLexer import CLexer
from Eot.CParser4.CParser import CParser

from Eot import FileProfile
from Eot.CodeFragment import PP_Directive
Expand Down
2 changes: 1 addition & 1 deletion pip-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

edk2-pytool-library~=0.23.4
edk2-pytool-extensions~=0.29.11
antlr4-python3-runtime==4.9
antlr4-python3-runtime==4.13.2
lcov-cobertura==2.1.1
regex==2024.11.6
pylibfdt==1.7.2.post1
Expand Down
Loading