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

Error recovery #2033

Draft
wants to merge 95 commits into
base: main
Choose a base branch
from
Draft

Error recovery #2033

wants to merge 95 commits into from

Commits on Mar 30, 2022

  1. recovered Recoverer from git history

    @jurgenvinju
    jurgenvinju committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    9deefa3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into revive-robust-parsing

    @jurgenvinju
    jurgenvinju committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    d1fdf89 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. fixed imports and whitespace

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    9ae895c View commit details
    Browse the repository at this point in the history

  2. added documentation

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    4e43070 View commit details
    Browse the repository at this point in the history

  3. renamed recoverer and simplified to whitespace only and all context-f… 

    …ree non-terminals
    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    ff99ac9 View commit details
    Browse the repository at this point in the history

  4. removed unused javadoc plugin that produced warnings

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    d2a0b66 View commit details
    Browse the repository at this point in the history

  5. fixed compiler warnings

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    d9439a4 View commit details
    Browse the repository at this point in the history

  6. fixed warnings

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    d87b4b8 View commit details
    Browse the repository at this point in the history

  7. fixed warnings

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    4897d88 View commit details
    Browse the repository at this point in the history

  8. added boolean parameter \'robust\' to parsing API

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    5803411 View commit details
    Browse the repository at this point in the history

  9. wired boolean parameter for robustness from Rascal function down to p… 

    …arser implementation
    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    3adee6c View commit details
    Browse the repository at this point in the history

  10. added override

    @jurgenvinju
    jurgenvinju committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    7318e8f View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. minor additions to make recovery work and removed dead code

    @jurgenvinju
    jurgenvinju committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    f6e13d8 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. recovered a missing piece from the recovery code

    @jurgenvinju
    jurgenvinju committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    ba0fb43 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Debugging error recovery 

    Sometimes recovery nodes start before the current location where
the parser failed to continue. Since the parser works with a
short queue of schedulede TODO's around the current cursor, we
might end up outside of this queue when recovering. This breaks
several unspecified invariants of the SGTBF implementations. For
now I added a detection that a recovery node is to be planned
before the currently retained history and filter that recovery
node. The next step will be to make sure backtracking over the
current location is made possible.
    @jurgenvinju
    jurgenvinju committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    650224a View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2022

  1. added possibility for recovered nodes to start back in time (at earli… 

    …er input locations)
    @jurgenvinju
    jurgenvinju committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    6d5d49b View commit details
    Browse the repository at this point in the history

  2. fixed off-by-one: error nodes should be scheduled one character ahead… 

    … because the next parser loop iteration always wants to advance one character
    @jurgenvinju
    jurgenvinju committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    78ee76b View commit details
    Browse the repository at this point in the history

  3. fixed another off-by-one

    @jurgenvinju
    jurgenvinju committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    d9f8fc9 View commit details
    Browse the repository at this point in the history

  4. added initial construction of skipped nodes

    @jurgenvinju
    jurgenvinju committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    685198d View commit details
    Browse the repository at this point in the history

  5. gave skipped productions a type such that all trees have a type

    @jurgenvinju
    jurgenvinju committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    1d5435b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Merge branch 'main' into revive-robust-parsing

    @jurgenvinju
    jurgenvinju committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    50edd09 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. updated template

    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    5265ef0 View commit details
    Browse the repository at this point in the history

  2. bumped rascal-maven-plugin to 0.8.0 to see if we can benefit from opt… 

    …imizations
    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    a2162c9 View commit details
    Browse the repository at this point in the history

  3. upgraded to rascal-maven-plugin 0.8.1

    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    91fb32b View commit details
    Browse the repository at this point in the history

  4. [maven-release-plugin] prepare release v0.23.1

    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    018826f View commit details
    Browse the repository at this point in the history

  5. [maven-release-plugin] prepare for next development iteration

    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    7b6e8b8 View commit details
    Browse the repository at this point in the history

  6. make sure that (a) BasicIDEServices are registered for the commandlin… 

    …e version of Rascal and (b) the edit command is wired to the edit IDEService
    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    4aefd52 View commit details
    Browse the repository at this point in the history

  7. basic IDE services can now also browse contents of files which are no… 

    …t in the scheme by copyinhthe contents to a tmp file
    @jurgenvinju
    jurgenvinju committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    dde9bd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'main' into robust-parsing-merge-main

    @PieterOlivier
    PieterOlivier committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6f9b2b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Merge branch 'main' into revive-robust-parsing

    @PieterOlivier
    PieterOlivier committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    d88ac77 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Started working on a simple recovery test

    @PieterOlivier
    PieterOlivier committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    517df9c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Added 'toString' methods and fixed issue in recoverer. 

    - Added a lot of toString methods to help understading when debugging
  as VSCode uses toString to display the value of objects
- Fixed iteration order in recoverer.
  I am not sure if the incoming nodes are always ordered by location,
  if not we might need to sort them in the future.
    @PieterOlivier
    PieterOlivier committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c779820 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Added 'allowRecovery` keyword parameter in parsing functions.

    @PieterOlivier
    PieterOlivier committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    13ffcef View commit details
    Browse the repository at this point in the history

  2. Removed 'Reflective' prefix from StackNodeIdDispenser class name 

    Reflective is just the way the dispenser is implemented. No need for
users of this class to be aware of this.
    @PieterOlivier
    PieterOlivier committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    b8eb72e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. WIP: recovery starting to work

    @PieterOlivier
    PieterOlivier committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    f82006c View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'main' into robust-parsing/simple-test

    @PieterOlivier
    PieterOlivier committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c8faf66 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Added some methods to analyze recovered parse errors in parse trees

    @PieterOlivier
    PieterOlivier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    88cddc3 View commit details
    Browse the repository at this point in the history

  2. Added comment and removed unused import

    @PieterOlivier
    PieterOlivier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    6d19281 View commit details
    Browse the repository at this point in the history

  3. Enabled logging when error recovery is in effect

    @PieterOlivier
    PieterOlivier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    bcd5914 View commit details
    Browse the repository at this point in the history

  4. Made printing of productions more robust (it crashed on 'regular' pro… 

    …ductions)
    @PieterOlivier
    PieterOlivier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fb6ffe5 View commit details
    Browse the repository at this point in the history

  5. Added some basic recovery tests

    @PieterOlivier
    PieterOlivier committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    27f1afc View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Implemented parser datastructure visualization using graphviz

    @PieterOlivier
    PieterOlivier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    15fedbf View commit details
    Browse the repository at this point in the history

  2. Implemented skipping of remaining characters when top-level productio… 

    …n is recovered
    @PieterOlivier
    PieterOlivier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0eed9a1 View commit details
    Browse the repository at this point in the history

  3. Reinstated end-of-input check before recovering (for now)

    @PieterOlivier
    PieterOlivier committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    2b044fd View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Minor comment and test changes

    @PieterOlivier
    PieterOlivier committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d5dbe8c View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. In addition to using whitespace we now also skip until after the last… 

    … token in the production
    @PieterOlivier
    PieterOlivier committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    2246e06 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Implemented dynamic last/follow calculations

    @PieterOlivier
    PieterOlivier committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    4b11450 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Minor cleanup of parser tests and debug support

    @PieterOlivier
    PieterOlivier committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    8ef03b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Implemented error tree fixup (including source locations)

    @PieterOlivier
    PieterOlivier committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    7d82f20 View commit details
    Browse the repository at this point in the history

  2. Renamed RecoveryNodeFlattener to SkippedNodeFlattener

    @PieterOlivier
    PieterOlivier committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    706662b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Implemented basic error disambiguation

    @PieterOlivier
    PieterOlivier committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    7d68129 View commit details
    Browse the repository at this point in the history

  2. Added support for error and skipped productions in vis::Text

    @PieterOlivier
    PieterOlivier committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    6b2939c View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Look "through" non-terminals when finding end/next matchers

    @PieterOlivier
    PieterOlivier committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    ff350ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into to-token-recoverer

    @PieterOlivier
    PieterOlivier committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6d3d58d View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Miscellaneous cleanup of error recovery code

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    2b6a69f View commit details
    Browse the repository at this point in the history

  2. Removed unused fields from SkippedNode

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    7ee16aa View commit details
    Browse the repository at this point in the history

  3. Switched from hardcoding to environment variable for the parser visua… 

    …lization path
    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    002e7a6 View commit details
    Browse the repository at this point in the history

  4. Fixed some compiler warnings in the DebugVisualizer

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    238e4c2 View commit details
    Browse the repository at this point in the history

  5. Fixed some compiler warnings

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    704726b View commit details
    Browse the repository at this point in the history

  6. INtroduced StackNodeVisitor

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    af7b5d5 View commit details
    Browse the repository at this point in the history

  7. Fixed more warnings

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    2d3fbb1 View commit details
    Browse the repository at this point in the history

  8. Madde AbstractStackNode.visit public

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    e95b1aa View commit details
    Browse the repository at this point in the history

  9. Use visitor pattern instead of instanceof in ToTokenRecoverer

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c06dc6d View commit details
    Browse the repository at this point in the history

  10. Renamed DebugVisualizer to ParseStateVisualizer

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    d584dfe View commit details
    Browse the repository at this point in the history

  11. Generalized AbstractStackNode visitor to be able to return values

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    41ea6e8 View commit details
    Browse the repository at this point in the history

  12. Removed debug print

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    82c156d View commit details
    Browse the repository at this point in the history

  13. Added license header to files introduced for error recovery

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c406e2b View commit details
    Browse the repository at this point in the history

  14. Added license header to more files and fixed years.

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c884ceb View commit details
    Browse the repository at this point in the history

  15. Fixed bug when inputURI is missing

    @PieterOlivier
    PieterOlivier committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9dce66d View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Fixed issues when location information is missing

    @PieterOlivier
    PieterOlivier committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a139019 View commit details
    Browse the repository at this point in the history

  2. Fixed off-by-one-error

    @PieterOlivier
    PieterOlivier committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    150131e View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Now looking deep to find error trees in getBestErrorTree

    @PieterOlivier
    PieterOlivier committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    5b1561e View commit details
    Browse the repository at this point in the history

  2. Removed prints

    @PieterOlivier
    PieterOlivier committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    23d23b4 View commit details
    Browse the repository at this point in the history

  3. Added 'recovery' tests and introduced artificial failure to see if te… 

    …sts are executed
    @PieterOlivier
    PieterOlivier committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    93611fe View commit details
    Browse the repository at this point in the history

  4. Added recovery tests

    @PieterOlivier
    PieterOlivier committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    bd2d1ee View commit details
    Browse the repository at this point in the history

  5. Worked on error recovery tests

    @PieterOlivier
    PieterOlivier committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    dec2b29 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Improved comments

    @PieterOlivier
    PieterOlivier committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    9abd0bc View commit details
    Browse the repository at this point in the history

  2. Renamed 'input' field to 'inputUri'.

    @PieterOlivier
    PieterOlivier committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    4cf173e View commit details
    Browse the repository at this point in the history

  3. Removed some obsolete comments

    @PieterOlivier
    PieterOlivier committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    bcb2753 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Added backwards compatible 'parser' function

    @PieterOlivier
    PieterOlivier committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5a2266b View commit details
    Browse the repository at this point in the history

  2. Renamed input to inputUri

    @PieterOlivier
    PieterOlivier committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2be0d9b View commit details
    Browse the repository at this point in the history

  3. Disabled tutor because it requires forward-compatibility of Java code… 

    … at this point
    @PieterOlivier
    PieterOlivier committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    36d4964 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Various changes based on an excellent code review by Sung.

    @PieterOlivier
    PieterOlivier committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    96fc604 View commit details
    Browse the repository at this point in the history

  2. Layout changes

    @PieterOlivier
    PieterOlivier committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    cf16c82 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Moved tests, replaced UnicodeConverter with String constructor

    @PieterOlivier
    PieterOlivier committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    b94bc02 View commit details
    Browse the repository at this point in the history

  2. Control parser visualization by environment variable

    @PieterOlivier
    PieterOlivier committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    9444d21 View commit details
    Browse the repository at this point in the history

  3. Introduced NopDebugListener so we can remove all the if checks

    @PieterOlivier
    PieterOlivier committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    2200fdf View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Fixed compiler error

    @PieterOlivier
    PieterOlivier committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    177e425 View commit details
    Browse the repository at this point in the history

  2. Fixed debugListener NPE

    @PieterOlivier
    PieterOlivier committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    377a2e1 View commit details
    Browse the repository at this point in the history

  3. Improved parser datastructure visualization

    @PieterOlivier
    PieterOlivier committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    074b5bf View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Look through "nullable" productions

    @PieterOlivier
    PieterOlivier committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    30b935a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2020 from usethesource/to-token-recoverer 

    Implement basic error recovery
    @PieterOlivier
    PieterOlivier committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a66cca4 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. No longer visualize parser state by default (for instance in CI)

    @PieterOlivier
    PieterOlivier committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    eb9615d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into error-recovery

    @PieterOlivier
    PieterOlivier committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    bbeeae0 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Fixed problem where allocated array was too small 

    This problem only surfaces when doing error recovery.
    @PieterOlivier
    PieterOlivier committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    fda09cf View commit details
    Browse the repository at this point in the history