Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/robin/gh-25-backtrack'
Browse files Browse the repository at this point in the history
* origin/topic/robin/gh-25-backtrack:
  Fix Sphinx helper script that emits command lines.
  Add support for manual backtracking to Spicy.
  Support &eod for vector parsing.
  • Loading branch information
rsmmr committed Dec 10, 2020
1 parent f6bce51 commit 7f167ca
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
13 changes: 13 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@

0.4.0-1110 | 2020-12-10 10:15:17 +0000

* GH-25: Add support for manual backtracking to Spicy. If a field is
marked with ``&try``, a later call to ``self.backtrack()``
anywhere down in the parse tree will return to that position and
continue there. See the documentation for more, including an
example. (Robin Sommer, Corelight).

* Support &eod for vector parsing. (Robin Sommer, Corelight)

* Fix Sphinx helper script that emits command lines. (Robin Sommer,
Corelight)

0.4.0-1106 | 2020-12-10 10:10:16 +0000

* Make capture groups available inside hooks of regular expression fields.
Expand Down
2 changes: 1 addition & 1 deletion doc/autogen/types/regexp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
``find``; and (2) if a match has been found, the data that matches the
regular expression.

.. spicy:method:: regexp::token_matcher regexp token_matcher False hilti::MatchState ()
.. spicy:method:: regexp::token_matcher regexp token_matcher False spicy::MatchState ()
Initializes state for matching regular expression incrementally
against chunks of future input. The regular expression will be
Expand Down
6 changes: 0 additions & 6 deletions doc/autogen/types/unit.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
.. rubric:: Methods

.. spicy:method:: unit::backtrack unit backtrack False void ()
Aborts parsing at the current position and returns back to the most
recent ``&try`` attribute. Turns into a parse error if there's no
``&try`` in scope.

.. spicy:method:: unit::connect_filter unit connect_filter False void (filter: strong_ref<unit>)
Connects a separate filter unit to transform the unit's input
Expand Down

0 comments on commit 7f167ca

Please sign in to comment.