Skip to content
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

Jump to bottom

Fix regular expression for variable splitting. #37493

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Fix regular expression for variable splitting. #37493

merged 2 commits into from
Feb 10, 2025

Conversation

andy31415
Copy link
Contributor

Previous code tried to escape every character, however python linters complained about illegal escapes. The expression also seemed a bit complex, so a character set seems clearer.

Testing

CI will run, however I manually tested over an expression as well:

>>> re.split("(\ |\(|\)|\+|\-|\*|/|%)", "var + 1 | 2 ( - ) + 3")
<stdin>:1: SyntaxWarning: invalid escape sequence '\ '
['var', ' ', '', '+', '', ' ', '1', ' ', '|', ' ', '2', ' ', '', '(', '', ' ', '', '-', '', ' ', '', ')', '', ' ', '', '+', '', ' ', '3']

>>> re.split("([- ()|+*/%])", "var + 1 | 2 ( - ) + 3")
['var', ' ', '', '+', '', ' ', '1', ' ', '', '|', '', ' ', '2', ' ', '', '(', '', ' ', '', '-', '', ' ', '', ')', '', ' ', '', '+', '', ' ', '3']

Note that the values are not exactly identical as a few more empty strings are added, however it does seem equivalent from a "merge by tokens" perspective.

@andy31415
Fix regular expression for variable splitting.
e7f5117 
Previous code tried to escape every character, however python
linters complained about illegal escapes. The expression also
seemed a bit complex, so a character set seems clearer.
@andy31415
Add brackets to force separator to also exist in the split
4f08766
@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Feb 10, 2025 •
edited
Loading

Review changes with  SemanticDiff

Changed Files
File Status
  scripts/py_matter_yamltests/matter_yamltests/parser.py  48% smaller

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 10, 2025 •
edited
Loading

PR #37493: Size comparison from e86768b to 4f08766

Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section e86768b 4f08766 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1094776 1094776 0 0.0
RAM 103354 103354 0 0.0
bl702 lighting-app bl702+eth FLASH 650604 650604 0 0.0
RAM 25273 25273 0 0.0
bl702+wifi FLASH 828306 828306 0 0.0
RAM 13981 13981 0 0.0
bl706+mfd+rpc+littlefs FLASH 1057820 1057820 0 0.0
RAM 23885 23885 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 888506 888506 0 0.0
RAM 18496 18496 0 0.0
lighting-app bl702l+mfd+littlefs FLASH 971548 971548 0 0.0
RAM 16360 16360 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 838452 838452 0 0.0
RAM 123480 123480 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 823864 823864 0 0.0
RAM 125360 125360 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 771024 771024 0 0.0
RAM 113820 113820 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 755292 755292 0 0.0
RAM 114028 114028 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 538926 538926 0 0.0
RAM 205208 205208 0 0.0
lock CC3235SF_LAUNCHXL FLASH 572806 572806 0 0.0
RAM 205360 205360 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 679801 679801 0 0.0
RAM 78548 78548 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 699653 699653 0 0.0
RAM 81188 81188 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 699653 699653 0 0.0
RAM 81188 81188 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 656593 656593 0 0.0
RAM 73616 73616 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 616153 616153 0 0.0
RAM 71532 71532 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 635789 635789 0 0.0
RAM 74076 74076 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 635789 635789 0 0.0
RAM 74076 74076 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 635649 635649 0 0.0
RAM 74540 74540 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 655365 655365 0 0.0
RAM 77084 77084 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 655365 655365 0 0.0
RAM 77084 77084 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 612073 612073 0 0.0
RAM 68628 68628 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 631933 631933 0 0.0
RAM 71268 71268 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 631933 631933 0 0.0
RAM 71268 71268 0 0.0
efr32 lock-app BRD4187C FLASH 937120 937120 0 0.0
RAM 159904 159904 0 0.0
BRD4338a FLASH 730516 730516 0 0.0
RAM 234716 234716 0 0.0
window-app BRD4187C FLASH 1029808 1029808 0 0.0
RAM 128008 128008 0 0.0
esp32 all-clusters-app c3devkit DRAM 97312 97312 0 0.0
FLASH 1577572 1577572 0 0.0
IRAM 83820 83820 0 0.0
m5stack DRAM 116100 116100 0 0.0
FLASH 1545374 1545374 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4760 4760 0 0.0
FLASH 2709835 2709835 0 0.0
RAM 132784 132784 0 0.0
all-clusters-app debug unknown 5568 5568 0 0.0
FLASH 5976330 5976330 0 0.0
RAM 531600 531600 0 0.0
all-clusters-minimal-app debug unknown 5464 5464 0 0.0
FLASH 5323874 5323874 0 0.0
RAM 242712 242712 0 0.0
bridge-app debug unknown 5480 5480 0 0.0
FLASH 4682390 4682390 0 0.0
RAM 221448 221448 0 0.0
chip-tool debug unknown 6120 6120 0 0.0
FLASH 13099986 13099986 0 0.0
RAM 596578 596578 0 0.0
chip-tool-ipv6only arm64 unknown 21816 21816 0 0.0
FLASH 11163392 11163392 0 0.0
RAM 648256 648256 0 0.0
fabric-admin debug unknown 5808 5808 0 0.0
FLASH 11389003 11389003 0 0.0
RAM 596362 596362 0 0.0
fabric-bridge-app debug unknown 4736 4736 0 0.0
FLASH 4507712 4507712 0 0.0
RAM 208632 208632 0 0.0
fabric-sync debug unknown 4976 4976 0 0.0
FLASH 5613989 5613989 0 0.0
RAM 483504 483504 0 0.0
lighting-app debug+rpc+ui unknown 6144 6144 0 0.0
FLASH 5630465 5630465 0 0.0
RAM 231792 231792 0 0.0
lock-app debug unknown 5416 5416 0 0.0
FLASH 4731818 4731818 0 0.0
RAM 207696 207696 0 0.0
ota-provider-app debug unknown 4776 4776 0 0.0
FLASH 4360820 4360820 0 0.0
RAM 201336 201336 0 0.0
ota-requestor-app debug unknown 4728 4728 0 0.0
FLASH 4498228 4498228 0 0.0
RAM 205920 205920 0 0.0
shell debug unknown 4256 4256 0 0.0
FLASH 3006572 3006572 0 0.0
RAM 160552 160552 0 0.0
thermostat-no-ble arm64 unknown 9512 9512 0 0.0
FLASH 4097752 4097752 0 0.0
RAM 246024 246024 0 0.0
tv-app debug unknown 5744 5744 0 0.0
FLASH 5952901 5952901 0 0.0
RAM 606904 606904 0 0.0
tv-casting-app debug unknown 5320 5320 0 0.0
FLASH 11272749 11272749 0 0.0
RAM 710864 710864 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 907584 907584 0 0.0
RAM 142411 142411 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 902052 902052 0 0.0
RAM 124755 124755 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 846108 846108 0 0.0
RAM 141339 141339 0 0.0
nxp contact k32w0+release FLASH 584792 584792 0 0.0
RAM 70876 70876 0 0.0
mcxw71+release FLASH 600232 600232 0 0.0
RAM 63096 63096 0 0.0
light k32w0+release FLASH 611084 611084 0 0.0
RAM 70268 70268 0 0.0
k32w1+release FLASH 685544 685544 0 0.0
RAM 48680 48680 0 0.0
lock mcxw71+release FLASH 749056 749056 0 0.0
RAM 67500 67500 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646980 1646980 0 0.0
RAM 211576 211576 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1553660 1553660 0 0.0
RAM 208392 208392 0 0.0
light cy8ckit_062s2_43012 FLASH 1469604 1469604 0 0.0
RAM 200368 200368 0 0.0
lock cy8ckit_062s2_43012 FLASH 1467540 1467540 0 0.0
RAM 224704 224704 0 0.0
qpg lighting-app qpg6105+debug FLASH 662356 662356 0 0.0
RAM 105220 105220 0 0.0
lock-app qpg6105+debug FLASH 620152 620152 0 0.0
RAM 99664 99664 0 0.0
stm32 light STM32WB5MM-DK FLASH 483024 483024 0 0.0
RAM 144688 144688 0 0.0
telink bridge-app tl7218x FLASH 665308 665308 0 0.0
RAM 90828 90828 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 622168 622168 0 0.0
RAM 31500 31500 0 0.0
light-app-ota-shell-factory-data tl3218x FLASH 770954 770954 0 0.0
RAM 43568 43568 0 0.0
tl7218x FLASH 779456 779456 0 0.0
RAM 98704 98704 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 680770 680770 0 0.0
RAM 52192 52192 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 709322 709322 0 0.0
RAM 73400 73400 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 626264 626264 0 0.0
RAM 142032 142032 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 814102 814102 0 0.0
RAM 99608 99608 0 0.0
tizen all-clusters-app arm unknown 5104 5104 0 0.0
FLASH 1752600 1752600 0 0.0
RAM 93508 93508 0 0.0
chip-tool-ubsan arm unknown 11396 11396 0 0.0
FLASH 18686646 18686646 0 0.0
RAM 8183340 8183340 0 0.0

@mergify mergify bot merged commit da6a512 into project-chip:master Feb 10, 2025
70 checks passed
pimpalemahesh pushed a commit to pimpalemahesh/connectedhomeip that referenced this pull request Feb 12, 2025
@andy31415 @pimpalemahesh
Fix regular expression for variable splitting. (project-chip#37493)
7b2ca36 
* Fix regular expression for variable splitting.

Previous code tried to escape every character, however python
linters complained about illegal escapes. The expression also
seemed a bit complex, so a character set seems clearer.

* Add brackets to force separator to also exist in the split
ratgr pushed a commit to ratgr/connectedhomeip that referenced this pull request Feb 26, 2025
@andy31415 @ratgr
Fix regular expression for variable splitting. (project-chip#37493)
47788b0 
* Fix regular expression for variable splitting.

Previous code tried to escape every character, however python
linters complained about illegal escapes. The expression also
seemed a bit complex, so a character set seems clearer.

* Add brackets to force separator to also exist in the split
gmarcosb pushed a commit to gmarcosb/connectedhomeip that referenced this pull request Mar 4, 2025
@andy31415 @gmarcosb
Fix regular expression for variable splitting. (project-chip#37493)
25fc701 
* Fix regular expression for variable splitting.

Previous code tried to escape every character, however python
linters complained about illegal escapes. The expression also
seemed a bit complex, so a character set seems clearer.

* Add brackets to force separator to also exist in the split
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arkq arkq arkq approved these changes

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

Assignees
No one assigned
Labels
review - approved scripts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andy31415 @arkq @jmartinez-silabs