Update ConfigParser define parser
Matlab 2023b indents the (if)def files, so the regex for finding defines needs to be updated. Change-Id: I795e3ffe1991ac28e76ac3c26a5d5ad75defd3ee
This commit is contained in:
60
NOTICE
60
NOTICE
@@ -32,7 +32,7 @@ pytest 8.4.0: http://pytest.org : MIT License
|
||||
python3-charset-normalizer 3.4.2: https://github.com/ousret/charset_normalizer : MIT License
|
||||
python-certifi 2024.7.4: https://certifiio.readthedocs.io/en/latest/ : Mozilla Public License 2.0
|
||||
python-pluggy 1.6.0: https://pypi.python.org/pypi/pluggy : MIT License
|
||||
python-typing-extensions 4.14.0 :
|
||||
python-typing-extensions 4.14.0 : Python Software Foundation License 2.0
|
||||
RonnyPfannschmidt/iniconfig 2.1.0: https://github.com/RonnyPfannschmidt/iniconfig : MIT License
|
||||
ruamel-yaml 0.18.6: https://pypi.org/project/ruamel.yaml/ : MIT License
|
||||
ruamel.yaml.clib 0.2.12: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/ : MIT License
|
||||
@@ -29260,3 +29260,61 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
|
||||
---
|
||||
|
||||
Python Software Foundation License 2.0
|
||||
(python-typing-extensions 4.14.0)
|
||||
|
||||
This license was approved as the official PSF License Version 2 on October 22,
|
||||
2004. The only differences between this and version 1 of the PSF license consist
|
||||
of removing Python version numbers (like 2.1.1 or 2.3).
|
||||
|
||||
|
||||
|
||||
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
|
||||
============================================
|
||||
|
||||
--------------------------------------------
|
||||
|
||||
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
|
||||
and the Individual or Organization ("Licensee") accessing and otherwise using
|
||||
this software ("Python") in source or binary form and its associated
|
||||
documentation.
|
||||
|
||||
2. Subject to the terms and conditions of this License Agreement, PSF hereby
|
||||
grants Licensee a nonexclusive, royalty-free, world-wide license to
|
||||
reproduce, analyze, test, perform and/or display publicly, prepare derivative
|
||||
works, distribute, and otherwise use Python alone or in any derivative
|
||||
version, provided, however, that PSF's License Agreement and PSF's notice of
|
||||
copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python Software
|
||||
Foundation; All Rights Reserved" are retained in Python alone or in any
|
||||
derivative version prepared by Licensee.
|
||||
|
||||
3. In the event Licensee prepares a derivative work that is based on or
|
||||
incorporates Python or any part thereof, and wants to make the derivative
|
||||
work available to others as provided herein, then Licensee hereby agrees to
|
||||
include in any such work a brief summary of the changes made to Python.
|
||||
|
||||
4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES
|
||||
NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT
|
||||
NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF
|
||||
MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
|
||||
PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
|
||||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
|
||||
INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
|
||||
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE
|
||||
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
|
||||
6. This License Agreement will automatically terminate upon a material breach
|
||||
of its terms and conditions.
|
||||
|
||||
7. Nothing in this License Agreement shall be deemed to create any
|
||||
relationship of agency, partnership, or joint venture between PSF and
|
||||
Licensee. This License Agreement does not grant permission to use PSF
|
||||
trademarks or trade name in a trademark sense to endorse or promote products
|
||||
or services of Licensee, or any third party.
|
||||
|
||||
8. By copying, installing or otherwise using Python, Licensee agrees to be
|
||||
bound by the terms and conditions of this License Agreement.
|
||||
|
||||
---
|
||||
|
||||
|
@@ -30,7 +30,7 @@ class ConfigParserCommon:
|
||||
self.code_regexes = [(re.compile(r'^\s*#(?P<type>if|ifdef|ifndef) (?P<condition>.*)$'),
|
||||
self.parse_if),
|
||||
(re.compile(r'^\s*#else.*$'), self.parse_else),
|
||||
(re.compile(r'#define (\w*)\s?(.*)?'), self.parse_defines),
|
||||
(re.compile(r'^\s*#define (\w*)\s?(.*)?'), self.parse_defines),
|
||||
(re.compile(r'^\s*#endif.*$'), self.parse_endif)]
|
||||
|
||||
def parse_line(self, line):
|
||||
|
Reference in New Issue
Block a user