Mise à jour des tests funcall.

4b3282c5 · Wilke Pierre · a51088ad · 4b3282c5 · 4b3282c5 · 4b3282c5
Commit 4b3282c5 authored 5 years ago by Wilke Pierre
--- a/tests/funcall/f_3.e
+++ b/tests/funcall/f_3.e
-int main(int argc,char* argv[]){
+main(){
  return f();
 }
-int f(){
+f(){
 return 3;
 }
--- a/tests/funcall/f_3.e.expect_14_12_3_8_12
+++ b/tests/funcall/f_3.e.expect_14_12_3_8_12
+{"output": "", "error": null, "retval": 3}
\ No newline at end of file
--- a/tests/funcall/f_3.e.expect_1_2_3
+++ b/tests/funcall/f_3.e.expect_1_2_3
+{"output": "", "error": null, "retval": 3}
\ No newline at end of file
--- a/tests/funcall/f_3.e.expect_lexer
+++ b/tests/funcall/f_3.e.expect_lexer
+SYM_IDENTIFIER(main)
+SYM_LPARENTHESIS
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(f)
+SYM_LPARENTHESIS
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_IDENTIFIER(f)
+SYM_LPARENTHESIS
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_INTEGER(3)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_EOF
--- a/tests/funcall/fib.e.expect_14_12_3_8_12
+++ b/tests/funcall/fib.e.expect_14_12_3_8_12
+{"output": "", "error": null, "retval": 377}
\ No newline at end of file
--- a/tests/funcall/fib.e.expect_1_2_3
+++ b/tests/funcall/fib.e.expect_1_2_3
+{"output": "", "error": null, "retval": 1}
\ No newline at end of file
--- a/tests/funcall/fib.e.expect_lexer
+++ b/tests/funcall/fib.e.expect_lexer
+SYM_IDENTIFIER(fib)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_IF
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_GT
+SYM_INTEGER(14)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_MINUS
+SYM_INTEGER(1)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_IF
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_LEQ
+SYM_INTEGER(2)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_INTEGER(1)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_ELSE
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(fib)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_MINUS
+SYM_INTEGER(1)
+SYM_RPARENTHESIS
+SYM_PLUS
+SYM_IDENTIFIER(fib)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_MINUS
+SYM_INTEGER(2)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_RBRACE
+SYM_IDENTIFIER(main)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(fib)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_EOF
--- a/tests/funcall/gcdrec.e
+++ b/tests/funcall/gcdrec.e
-int gcd(int a,int b){
+gcd(a,b){
 if(b == 0){
   return a;
 } else {
   return gcd(b, a % b);
 }
 }
-int main(int argc,char* argv[]){
+main(a, b){
-  int a = atoi(argv[1]);
-  int b = atoi(argv[2]);
  return gcd(a,b);
 }
--- a/tests/funcall/gcdrec.e.expect_14_12_3_8_12
+++ b/tests/funcall/gcdrec.e.expect_14_12_3_8_12
+{"output": "", "error": null, "retval": 2}
\ No newline at end of file
--- a/tests/funcall/gcdrec.e.expect_1_2_3
+++ b/tests/funcall/gcdrec.e.expect_1_2_3
+{"output": "", "error": null, "retval": 1}
\ No newline at end of file
--- a/tests/funcall/gcdrec.e.expect_lexer
+++ b/tests/funcall/gcdrec.e.expect_lexer
+SYM_IDENTIFIER(gcd)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(a)
+SYM_COMMA
+SYM_IDENTIFIER(b)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_IF
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(b)
+SYM_EQUALITY
+SYM_INTEGER(0)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(a)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_ELSE
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(gcd)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(b)
+SYM_COMMA
+SYM_IDENTIFIER(a)
+SYM_MOD
+SYM_IDENTIFIER(b)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_RBRACE
+SYM_IDENTIFIER(main)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(a)
+SYM_COMMA
+SYM_IDENTIFIER(b)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(gcd)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(a)
+SYM_COMMA
+SYM_IDENTIFIER(b)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_EOF
--- a/tests/funcall/hanoi.e
+++ b/tests/funcall/hanoi.e
-int main(int argc,char* argv[]){
+main(ndisque){
-  int ndisque = atoi(argv[1]);
  return hanoi(ndisque);
 }
-int hanoi(int n)
+hanoi(n)
 {
  if(n > 0)
    {
-      int x = hanoi(n-1);
+      x = hanoi(n-1);
      return 1 + 2 * x;
    }
  return 0;

--- a/tests/funcall/hanoi.e.expect_14_12_3_8_12
+++ b/tests/funcall/hanoi.e.expect_14_12_3_8_12
+{"output": "", "error": null, "retval": 16383}
\ No newline at end of file
--- a/tests/funcall/hanoi.e.expect_1_2_3
+++ b/tests/funcall/hanoi.e.expect_1_2_3
+{"output": "", "error": null, "retval": 1}
\ No newline at end of file
--- a/tests/funcall/hanoi.e.expect_lexer
+++ b/tests/funcall/hanoi.e.expect_lexer
+SYM_IDENTIFIER(main)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(ndisque)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(hanoi)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(ndisque)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_IDENTIFIER(hanoi)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_IF
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_GT
+SYM_INTEGER(0)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_IDENTIFIER(x)
+SYM_ASSIGN
+SYM_IDENTIFIER(hanoi)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(n)
+SYM_MINUS
+SYM_INTEGER(1)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RETURN
+SYM_INTEGER(1)
+SYM_PLUS
+SYM_INTEGER(2)
+SYM_ASTERISK
+SYM_IDENTIFIER(x)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_RETURN
+SYM_INTEGER(0)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_EOF
--- a/tests/funcall/lots_of_args.e
+++ b/tests/funcall/lots_of_args.e
-int f(int a,
+f(a,
-           int b,
+  b,
-           int c,
+  c,
-           int d,
+  d,
-           int e,
+  e,
-           int f,
+  f,
-           int g,
+  g,
-           int h,
+  h,
-           int i,
+  i,
-           int j
+  j
-           ){
+  ){
  return a + b * c + d * e * f + g * h * i * j;
 }
-int main(int argc, char* argv[]){
+main(){
  return f(1,2,3,4,5,6,7,8,9,10);
 }
--- a/tests/funcall/lots_of_args.e.expect_14_12_3_8_12
+++ b/tests/funcall/lots_of_args.e.expect_14_12_3_8_12
+{"output": "", "error": null, "retval": 5167}
\ No newline at end of file
--- a/tests/funcall/lots_of_args.e.expect_1_2_3
+++ b/tests/funcall/lots_of_args.e.expect_1_2_3
+{"output": "", "error": null, "retval": 5167}
\ No newline at end of file
--- a/tests/funcall/lots_of_args.e.expect_lexer
+++ b/tests/funcall/lots_of_args.e.expect_lexer
+SYM_IDENTIFIER(f)
+SYM_LPARENTHESIS
+SYM_IDENTIFIER(a)
+SYM_COMMA
+SYM_IDENTIFIER(b)
+SYM_COMMA
+SYM_IDENTIFIER(c)
+SYM_COMMA
+SYM_IDENTIFIER(d)
+SYM_COMMA
+SYM_IDENTIFIER(e)
+SYM_COMMA
+SYM_IDENTIFIER(f)
+SYM_COMMA
+SYM_IDENTIFIER(g)
+SYM_COMMA
+SYM_IDENTIFIER(h)
+SYM_COMMA
+SYM_IDENTIFIER(i)
+SYM_COMMA
+SYM_IDENTIFIER(j)
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(a)
+SYM_PLUS
+SYM_IDENTIFIER(b)
+SYM_ASTERISK
+SYM_IDENTIFIER(c)
+SYM_PLUS
+SYM_IDENTIFIER(d)
+SYM_ASTERISK
+SYM_IDENTIFIER(e)
+SYM_ASTERISK
+SYM_IDENTIFIER(f)
+SYM_PLUS
+SYM_IDENTIFIER(g)
+SYM_ASTERISK
+SYM_IDENTIFIER(h)
+SYM_ASTERISK
+SYM_IDENTIFIER(i)
+SYM_ASTERISK
+SYM_IDENTIFIER(j)
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_IDENTIFIER(main)
+SYM_LPARENTHESIS
+SYM_RPARENTHESIS
+SYM_LBRACE
+SYM_RETURN
+SYM_IDENTIFIER(f)
+SYM_LPARENTHESIS
+SYM_INTEGER(1)
+SYM_COMMA
+SYM_INTEGER(2)
+SYM_COMMA
+SYM_INTEGER(3)
+SYM_COMMA
+SYM_INTEGER(4)
+SYM_COMMA
+SYM_INTEGER(5)
+SYM_COMMA
+SYM_INTEGER(6)
+SYM_COMMA
+SYM_INTEGER(7)
+SYM_COMMA
+SYM_INTEGER(8)
+SYM_COMMA
+SYM_INTEGER(9)
+SYM_COMMA
+SYM_INTEGER(10)
+SYM_RPARENTHESIS
+SYM_SEMICOLON
+SYM_RBRACE
+SYM_EOF
--- a/tests/funcall/print_and_fun.e
+++ b/tests/funcall/print_and_fun.e
-int g(int x){
+g(x){
  return x;
 }
-int f(int a, int b){
+f(a, b){
  b = g(8);
  print(a);
  print(b);
  return 0;
 }
-int main(int argc, char* argv[]){
+main(){
  f(3,4);
  return 0;
 }