Skip to content
This repository has been archived by the owner on Dec 11, 2022. It is now read-only.

v0.8.1 (backport #94) #95

Merged
merged 14 commits into from
Jul 3, 2021
Merged

v0.8.1 (backport #94) #95

merged 14 commits into from
Jul 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 3, 2021

This is an automatic backport of pull request #94 done by Mergify.
Cherry-pick of 422242c has failed:

On branch mergify/bp/develop/pr-94
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 422242c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      ExampleCode/strings_across_lines.skiy
	both modified:   PySkiylia/Lexer.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of af85ead has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit af85ead.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/strings_across_lines.skiy
	both modified:   PySkiylia/Lexer.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 1bd8d2a has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1bd8d2a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/Assignment/ArrayTest.skiy
	both modified:   PySkiylia/SkiyliaCallable.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d3f73be has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d3f73be.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/Assignment/ArrayTest.skiy
	both modified:   PySkiylia/Interpreter.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0f79dec has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0f79dec.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   PySkiylia/SkiyliaCallable.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 27d2b4f has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 27d2b4f.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Cherry-pick of 2c77066 has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2c77066.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Cherry-pick of 897d8cb has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 897d8cb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   PySkiylia/Interpreter.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of ec1510d has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ec1510d.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Cherry-pick of f8fef18 has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f8fef18.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Cherry-pick of 2c9721c has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 10 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2c9721c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   PySkiylia/Tokens.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/Grammar/FullGrammar.skiy

Cherry-pick of 21dd403 has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 11 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 21dd403.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   PySkiylia/__pycache__/ASTPrinter.cpython-39.pyc
	new file:   PySkiylia/__pycache__/AbstractSyntax.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Environment.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Interpreter.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Lexer.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Parser.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Primitives.cpython-39.pyc
	new file:   PySkiylia/__pycache__/PySkiylia.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Resolver.cpython-39.pyc
	new file:   PySkiylia/__pycache__/SkiyliaCallable.cpython-39.pyc
	new file:   PySkiylia/__pycache__/Tokens.cpython-39.pyc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/Grammar/FullGrammar.skiy

Cherry-pick of 494acb3 has failed:

On branch mergify/bp/develop/pr-94
Your branch is ahead of 'origin/develop' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 494acb3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   PySkiylia/PySkiylia.py
	modified:   PySkiylia/Tokens.py
	modified:   PySkiylia/__pycache__/Lexer.cpython-39.pyc
	modified:   PySkiylia/__pycache__/PySkiylia.cpython-39.pyc
	modified:   PySkiylia/__pycache__/SkiyliaCallable.cpython-39.pyc
	modified:   PySkiylia/__pycache__/Tokens.cpython-39.pyc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ExampleCode/Grammar/FullGrammar.skiy

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

SK1Y101 added 14 commits July 3, 2021 20:22
@SK1Y101
fix error with primitives
171bcec 
(cherry picked from commit 422242c)

# Conflicts:
#	ExampleCode/strings_across_lines.skiy
#	PySkiylia/Lexer.py
@SK1Y101
string indentation preservation
7e42808 
(cherry picked from commit af85ead)

# Conflicts:
#	ExampleCode/strings_across_lines.skiy
#	PySkiylia/Lexer.py
@SK1Y101
fix broken code in array methods
f3567f2 
(cherry picked from commit 1bd8d2a)

# Conflicts:
#	ExampleCode/Assignment/ArrayTest.skiy
#	PySkiylia/SkiyliaCallable.py
@SK1Y101
Interpreter was not passing token to error when calling a statement
f2c5ac8 
(cherry picked from commit d3f73be)

# Conflicts:
#	ExampleCode/Assignment/ArrayTest.skiy
#	PySkiylia/Interpreter.py
@SK1Y101
fix issue with pop() returning the whole array
8da8852 
(cherry picked from commit 0f79dec)

# Conflicts:
#	PySkiylia/SkiyliaCallable.py
@SK1Y101
update grammar so that precedence for conditional is correct
badee65 
(cherry picked from commit 27d2b4f)
@SK1Y101
hacky way of showing REPL output
c76307e 
(cherry picked from commit 2c77066)
@SK1Y101
fix type-equality operator
666204c 
(cherry picked from commit 897d8cb)

# Conflicts:
#	PySkiylia/Interpreter.py
@SK1Y101
updated readme
53b4a28 
(cherry picked from commit ec1510d)
@SK1Y101
update other readnes
12e792e 
(cherry picked from commit f8fef18)
@SK1Y101
add token and example code definitions
f3c5fc5 
(cherry picked from commit 2c9721c)

# Conflicts:
#	ExampleCode/Grammar/FullGrammar.skiy
@SK1Y101
implemented the wait(), elapsed(), and sum() primitives
49521ec 
(cherry picked from commit 21dd403)

# Conflicts:
#	ExampleCode/Grammar/FullGrammar.skiy
@SK1Y101
added the "join" command to arrays
19ccc67 
(cherry picked from commit 494acb3)

# Conflicts:
#	ExampleCode/Grammar/FullGrammar.skiy
@SK1Y101
remove pyb
4142711 
(cherry picked from commit 05e2cbd)
@mergify mergify bot requested a review from SK1Y101 as a code owner July 3, 2021 20:22
@mergify mergify bot added the conflicts label Jul 3, 2021
@mergify mergify bot assigned SK1Y101 Jul 3, 2021
@mergify mergify bot merged commit cb0b446 into develop Jul 3, 2021
@mergify mergify bot deleted the mergify/bp/develop/pr-94 branch July 3, 2021 20:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@SK1Y101 SK1Y101 Awaiting requested review from SK1Y101 SK1Y101 is a code owner

Assignees

@SK1Y101 SK1Y101

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@SK1Y101