Skip to content

Conversation

BuggusMageevers
Copy link
Contributor

Added initial REPL. Needs a little work yet before merge: adds multiple EOF's currently. However, the token's produced are otherwise correct and the REPL can be exited with "quit".

@BuggusMageevers
Copy link
Contributor Author

@MatsMoll - started an REPL.

@BuggusMageevers BuggusMageevers force-pushed the master branch 2 times, most recently from c893237 to baa7d10 Compare June 15, 2023 22:25
@Spongman
Copy link
Contributor

you might want to consider rebasing this PR onto upstream/master to avoid rewriting all that history...

@BuggusMageevers
Copy link
Contributor Author

You know what, that sounds like a great idea. I'm not really sure how I got my local repo so out of sync though. @Spongman, I'm not great with git. I should be able to just do a rebase and place my changes as the most recent commit?

@Spongman
Copy link
Contributor

Spongman commented Jun 16, 2023

yeah, you should be able to do something like:

git stash                      # save any changes in your working dir
git fetch --all                # sync with the server
git checkout master            # switch to local master branch
git reset --hard origin/master # sync with your github repo
git rebase upstream/master     # rebase your changes onto the upstream branch
git push -f                    # force-push to your github repo
git stash pop                  # restore your working dir changes

I use these defaults, ymmv:

git config --global rerere.enabled true
git config --global pull.rebase merges
git config --global rebase.autoStash true
git config --global rebase.autosquash true

@BuggusMageevers
Copy link
Contributor Author

Thank you, I'll give that a try.

`REPL` for Monkey language prints a list of tokens.
`evaluate()` function added to `Lexer` to make processing a line from
the `REPL` cleaning in `main`.
@BuggusMageevers
Copy link
Contributor Author

Ended up deleting my local, cloning from Prime's repo, applying my changes, committing, and pushing this to my fork. I had not done all that much so it seemed easiest. Should have fixed the history problem.

Copy link
Contributor

@MatsMoll MatsMoll left a comment

Choose a reason for hiding this comment

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

Nicely done @BuggusMageevers 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants