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.

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

Pull Request for Green #62

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
915d8f8
Readme updated
Jul 24, 2018
fac0cc0
Uncomment 1 test
Jul 24, 2018
d3abaa3
Update .travis.yml
WinandMey Jul 24, 2018
6e2ae7b
Changed test 20
Jul 24, 2018
2cdb158
Merge branch 'master' of https://github.com/WinandMey/green
Jul 24, 2018
3e4375a
Update .travis.yml
WinandMey Jul 24, 2018
30c706c
Removed bin folder
Jul 24, 2018
2d166b0
Merge branch 'master' of https://github.com/WinandMey/green
Jul 24, 2018
6f9cea7
First attempt at task 2
Jul 24, 2018
72b723d
test if carlad/sinatra is specific
Jul 24, 2018
a908a05
Changing the yml file
Jul 24, 2018
a4b04e8
Changing the yml file 2
Jul 24, 2018
97e142b
Changing the yml file 3
Jul 24, 2018
4e3b2e6
Changing the yml file 4
Jul 24, 2018
4bdfc35
Changing yml file again
Jul 24, 2018
a2099d3
Update .travis.yml
WinandMey Jul 31, 2018
880ee89
Readme updated for icon
Jul 31, 2018
ac60c92
Delete .Rhistory
WinandMey Jul 31, 2018
cd73833
Added failing test
Jul 31, 2018
73727b9
Merge branch 'master' of https://github.com/WinandMey/green
Jul 31, 2018
ae34abf
Update Dockerfile
Jul 31, 2018
0bd1eff
Update .travis.yml
WinandMey Jul 31, 2018
12a0ded
Update .travis.yml
WinandMey Jul 31, 2018
81f5473
Change buildfile
Jul 31, 2018
b5369fa
Update .travis.yml
WinandMey Jul 31, 2018
aa575ce
Merge branch 'master' of https://github.com/WinandMey/green
Jul 31, 2018
31858f2
Changed buildfile
Jul 31, 2018
b6eb284
Changed buildfile again
Jul 31, 2018
4540f87
New test files added
Aug 13, 2018
589a49c
I start to see light
Aug 13, 2018
6623395
I pray this works
Aug 13, 2018
b7ece56
Tiny fixes
Aug 13, 2018
9957832
More fixes
Aug 13, 2018
8bdaa8f
Again!
Aug 13, 2018
ff06d02
Againgit add .!
Aug 13, 2018
101dc10
I doubt this will work
Aug 13, 2018
461a2b6
Pick up where we left off
Aug 14, 2018
c557d12
Pick up where we left off2
Aug 14, 2018
3290783
We left off at a bad place
Aug 14, 2018
70bdde1
Once upon a time
Aug 14, 2018
e1f41f3
In a kingdom
Aug 14, 2018
eaa4f15
far
Aug 14, 2018
4b24141
Let's try something different
Aug 14, 2018
04225cd
smaal things
Aug 14, 2018
211585f
smaal thingsyies
Aug 14, 2018
629beae
come on
Aug 14, 2018
55cc969
one more time
Aug 14, 2018
5f405a0
I pleaded for help, and it seems to have worked!
Aug 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Uncomment 1 test
William Ferdinand Mey committed Jul 24, 2018
commit fac0cc0fc62b6d69da8c47d8e649ddf72a494595
Original file line number Diff line number Diff line change
@@ -293,7 +293,6 @@ public void test19() {
Operation o1 = new Operation(Operation.Operator.LE, c1, c1);
check(o1, "2<=2", "0==0");
}
/*
@Test
public void test20() {
IntConstant c1 = new IntConstant(2);
@@ -303,5 +302,5 @@ public void test20() {
Operation o3 = new Operation(Operation.Operator.AND, o1, o2);
check(o3, "(2<=2)&&(aa<2)", "1*v+-1<0");
}
*/

}