Added TokRange token, and replaced TokColon with TokRange in GetSymbol and ArrayType, fixing issue #5 #6

Open

HippieKiller wants to merge 10 commits from HippieKiller/master into master

HippieKiller commented

2023-01-29 07:14:24 +00:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

README.md
src/btpc.dpr

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Added TokRange token, and replaced TokColon with TokRange in GetSymbol and ArrayType, fixing issue #5' (#6) from HippieKiller/master into master

Merge commit body

Reviewed-on: https://git.rosseaux.net/BeRo1985/berotinypascal/pulls/6

Merge pull request 'Added TokRange token, and replaced TokColon with TokRange in GetSymbol and ArrayType, fixing issue #5' (#6) from HippieKiller/master into master

Reviewed-on: https://git.rosseaux.net/BeRo1985/berotinypascal/pulls/6

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin HippieKiller/master:HippieKiller/master

git switch HippieKiller/master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff HippieKiller/master

git switch HippieKiller/master

git rebase master

git switch master

git merge --ff-only HippieKiller/master

git switch HippieKiller/master

git rebase master

git switch master

git merge --no-ff HippieKiller/master

git switch master

git merge --squash HippieKiller/master