Merge branch 'fix-this-func' into 'master'

btj12 · btj12 · commit 0cb3832cdaff · 2018-04-28T22:51:58.000-04:00
Fix this func

See merge request btj12/Interpreter!75
diff --git a/Tests/1/test1.java b/Tests/1/test1.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 return 150;
 }
 
diff --git a/Tests/1/test10.java b/Tests/1/test10.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 return 6 * -(4 * 2) + 9;
 }
 
diff --git a/Tests/1/test11.java b/Tests/1/test11.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 1;
 y = 10 + x;
 return y;
diff --git a/Tests/1/test12.java b/Tests/1/test12.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var y;
 y = x;
 return y;
diff --git a/Tests/1/test13.java b/Tests/1/test13.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 var y;
 x = x + y;
diff --git a/Tests/1/test14.java b/Tests/1/test14.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var y = 20;
 var x = x + y;
diff --git a/Tests/1/test15.java b/Tests/1/test15.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 return (10 > 20) || (5 - 6 < 10) && true;
 }
 
diff --git a/Tests/1/test16.java b/Tests/1/test16.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var y = 20;
 if (x < y && (x % 2) == 0)
diff --git a/Tests/1/test17.java b/Tests/1/test17.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 100 % 2 == 0;
 var y = 10 >= 20;
 var z;
diff --git a/Tests/1/test18.java b/Tests/1/test18.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var y = 20;
 var z = 20 >= 10;
diff --git a/Tests/1/test19.java b/Tests/1/test19.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 2;
 while (x < 100)
   x = x * 2;
diff --git a/Tests/1/test2.java b/Tests/1/test2.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 return 6 * (8 + (5 % 3)) / 11 - 9;
 }
 
diff --git a/Tests/1/test20.java b/Tests/1/test20.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 20;
 var y = 128;
 while (x * x > 128)
diff --git a/Tests/1/test21.java b/Tests/1/test21.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 var y;
 var z = x = y = 10;
diff --git a/Tests/1/test22.java b/Tests/1/test22.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 var y;
 x = y = 10;
diff --git a/Tests/1/test23.java b/Tests/1/test23.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 var y = (x = 5) + (x = 6);
 return y * 100 + x;
diff --git a/Tests/1/test24.java b/Tests/1/test24.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 x = (x = 6) + x;
 return x;
diff --git a/Tests/1/test25.java b/Tests/1/test25.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 x = x + (x = 6);
 return x;
diff --git a/Tests/1/test26.java b/Tests/1/test26.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 var y;
 var z;
diff --git a/Tests/1/test27.java b/Tests/1/test27.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 while ((x = x + 1) < 21)
   x = x;
diff --git a/Tests/1/test28.java b/Tests/1/test28.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var a = 31160;
 var b = 1476;
 var r = a % b;
diff --git a/Tests/1/test3.java b/Tests/1/test3.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var z;
 z = 10;
 return z;
diff --git a/Tests/1/test4.java b/Tests/1/test4.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = (5 * 7 - 3) / 2;
 return x;
 }
diff --git a/Tests/1/test5.java b/Tests/1/test5.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var y = 12 + x;
 return x * y;
diff --git a/Tests/1/test6.java b/Tests/1/test6.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 5;
 var y = 6;
 var m;
diff --git a/Tests/1/test7.java b/Tests/1/test7.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 5;
 var y = 6;
 var m;
diff --git a/Tests/1/test8.java b/Tests/1/test8.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 5;
 var y = 6;
 if (x != y)
diff --git a/Tests/1/test9.java b/Tests/1/test9.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 5;
 var y = 6; 
 if (x == y)
diff --git a/Tests/2/test1.java b/Tests/2/test1.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 {
   var y = 2;
diff --git a/Tests/2/test10.java b/Tests/2/test10.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 var y = x;
 var z = y;
diff --git a/Tests/2/test11.java b/Tests/2/test11.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 while (x < 10) {
   var y = 0;
diff --git a/Tests/2/test12.java b/Tests/2/test12.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 1;
 var y = 2;
 if (x < y) {
diff --git a/Tests/2/test13.java b/Tests/2/test13.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 1;
 break;
 return x;
diff --git a/Tests/2/test14.java b/Tests/2/test14.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 1;
 while (true) {
   x = x + 1;
diff --git a/Tests/2/test15.java b/Tests/2/test15.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 
 try {
diff --git a/Tests/2/test16.java b/Tests/2/test16.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x;
 
 try {
diff --git a/Tests/2/test17.java b/Tests/2/test17.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 var j = 1;
 
diff --git a/Tests/2/test18.java b/Tests/2/test18.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var result = 1;
 
diff --git a/Tests/2/test19.java b/Tests/2/test19.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var result = 1;
 
diff --git a/Tests/2/test2.java b/Tests/2/test2.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var a = 31160;
 var b = 1476;
 if (a < b) {
diff --git a/Tests/2/test20.java b/Tests/2/test20.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 while ((x = x + 1) < 21)
   x = x;
diff --git a/Tests/2/test3.java b/Tests/2/test3.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 var y = 10;
 while (!(x >= y) || !(y > 25)) {
diff --git a/Tests/2/test4.java b/Tests/2/test4.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 1;
 var y = x + 1;
 if (x < y) {
diff --git a/Tests/2/test5.java b/Tests/2/test5.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 10;
 var y = 4;
 if (x < y) {
diff --git a/Tests/2/test6.java b/Tests/2/test6.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 x = x + 25;
 return x;
diff --git a/Tests/2/test7.java b/Tests/2/test7.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 var result = 0;
 
diff --git a/Tests/2/test8.java b/Tests/2/test8.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 while (x < 6) {
   x = x + 1;
diff --git a/Tests/2/test9.java b/Tests/2/test9.java
@@ -1,6 +1,6 @@
 class A {
 
-function main() {
+static function main() {
 var x = 0;
 while (x < 10) {
   x = x - 1;
diff --git a/Tests/3/test0.java b/Tests/3/test0.java
@@ -6,7 +6,7 @@ function divide(x, y) {
   return x / y;
 }
 
-function main() {
+static function main() {
   var x = 0;
   try {
    if(true){
diff --git a/Tests/3/test1.java b/Tests/3/test1.java
diff --git a/Tests/3/test10.java b/Tests/3/test10.java
diff --git a/Tests/3/test11.java b/Tests/3/test11.java
diff --git a/Tests/3/test12.java b/Tests/3/test12.java
diff --git a/Tests/3/test13.java b/Tests/3/test13.java
diff --git a/Tests/3/test14.java b/Tests/3/test14.java
diff --git a/Tests/3/test15.java b/Tests/3/test15.java
diff --git a/Tests/3/test16.java b/Tests/3/test16.java
diff --git a/Tests/3/test17.java b/Tests/3/test17.java
diff --git a/Tests/3/test18.java b/Tests/3/test18.java
diff --git a/Tests/3/test19.java b/Tests/3/test19.java
diff --git a/Tests/3/test2.java b/Tests/3/test2.java
diff --git a/Tests/3/test20.java b/Tests/3/test20.java
diff --git a/Tests/3/test21.java b/Tests/3/test21.java
diff --git a/Tests/3/test22.java b/Tests/3/test22.java
diff --git a/Tests/3/test23.java b/Tests/3/test23.java
diff --git a/Tests/3/test3.java b/Tests/3/test3.java
diff --git a/Tests/3/test4.java b/Tests/3/test4.java
diff --git a/Tests/3/test5.java b/Tests/3/test5.java
diff --git a/Tests/3/test6.java b/Tests/3/test6.java
diff --git a/Tests/3/test7.java b/Tests/3/test7.java
diff --git a/Tests/3/test8.java b/Tests/3/test8.java
diff --git a/Tests/3/test9.java b/Tests/3/test9.java
diff --git a/state-manipulation.scm b/state-manipulation.scm

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`class A {`
`2`	`2`
`3`		`-function main() {`
	`3`	`+static function main() {`
`4`	`4`	`return 150;`
`5`	`5`	`}`
`6`	`6`