Skip to content

extmod/ure: Extend functionality#1544

Merged
tannewt merged 8 commits into
adafruit:masterfrom
notro:ure_sub
Feb 14, 2019
Merged

extmod/ure: Extend functionality#1544
tannewt merged 8 commits into
adafruit:masterfrom
notro:ure_sub

Conversation

@notro
Copy link
Copy Markdown

@notro notro commented Feb 13, 2019

This PR adds:

  • 3 upstream commits which brings in the latest changes (upstream history)
  • One stalled patch by @deshipu that enabled me to parse ini file headers for the CPython configparser
  • One match(..., pos, endpos) patch that enabled me to port the CPython textwrap module without a lot of custom parsing code
  • Enable this on samd boards with a lot of flash (ie. the Grand Central)

This PR uses 1100 bytes of flash

@tannewt
Copy link
Copy Markdown
Member

tannewt commented Feb 14, 2019

I'm wary of splitting what re supports across m0 and m4 boards. What do you think about slimming down the SAMD clock stuff further to fit these changes? We're basically out of space in the m0 expresses so we'd need to trade out something for this.

dpgeorge and others added 8 commits February 14, 2019 15:42
@dpgeorge @notro
extmod/modure: Add match.groups() method, and tests.
a24fabb 
This feature is controlled at compile time by MICROPY_PY_URE_MATCH_GROUPS,
disabled by default.

Thanks to @dmazzella for the original patch for this feature; see #3770.
@dpgeorge @notro
extmod/modure: Add match.span(), start() and end() methods, and tests.
cbeac09 
This feature is controlled at compile time by
MICROPY_PY_URE_MATCH_SPAN_START_END, disabled by default.

Thanks to @dmazzella for the original patch for this feature; see #3770.
@dpgeorge @notro
extmod/modure: Add ure.sub() function and method, and tests.
b9dc23c 
This feature is controlled at compile time by MICROPY_PY_URE_SUB, disabled
by default.

Thanks to @dmazzella for the original patch for this feature; see #3770.
@deshipu @notro
extmod/ure: Handle some escape sequences.
20a787a 
Fix MicroPython #3176

Handle escape sequences inside regular expressions. This adds
handling for \a, \b, \f, \n, \r, \v and \\.
@notro
extmod/ure: Support search/match() pos and endpos parameters
0865c9d 
MICROPY_PY_URE_MATCH_SPAN_START_END is used to enable the functionality
since it's similar.
@notro
atmel-samd: Remove samd module from SAMD21 builds
9cdffe5 
Remove the samd module which has representations of the clocks.
This is done to save on precious flash.
@notro
atmel-samd: Enable extra ure functionality on Express boards
77ff17c 
This enables ure.sub(), Match.span/start/end() and the
ure.Compile.search/match() pos/endpos arguments.
@notro
Update translations
0edd739
@notro
Copy link
Copy Markdown
Author

notro commented Feb 14, 2019

I have removed the samd module on M0 which freed 1232 bytes of flash.
Also enabled the ure functionality on #if BOARD_FLASH_SIZE > 192000, which I assume is all Express boards.

@dhalbert
Copy link
Copy Markdown
Collaborator

dhalbert commented Feb 14, 2019

Note that I have just started doing a large refactor of the #define stuff so we can have consistent settings across our ports. See #1547. I'm introducing an mpconfig_circuitpy.h file (or some name like that), which will have common settings, will check for small and large flash sizes, etc. Also I'll have on/off #defines for each native module so they are easily enabled/disabled in mpconfigport.h or mpconfigboard.h.

@notro notro mentioned this pull request Feb 14, 2019
Closed
@tannewt tannewt self-requested a review February 14, 2019 18:26
@tannewt tannewt added enhancement cpython api modules from cpython labels Feb 14, 2019
@tannewt tannewt added this to the 4.0.0 - Bluetooth milestone Feb 14, 2019
tannewt
tannewt approved these changes Feb 14, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok great! Thank you for adding this.

@tannewt tannewt merged commit 35e3d99 into adafruit:master Feb 14, 2019
@notro notro deleted the ure_sub branch February 14, 2019 21:23
This was referenced Feb 16, 2019
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tannewt tannewt tannewt approved these changes

Assignees

No one assigned

Labels

cpython api modules from cpython enhancement

Projects

None yet

Milestone

4.0.0 - Bluetooth

Development

Successfully merging this pull request may close these issues.

5 participants

@notro @tannewt @dhalbert @dpgeorge @deshipu