diff --git a/tests/pp/02.expect b/tests/pp/02.expect index 625c80b..f1fb927 100644 --- a/tests/pp/02.expect +++ b/tests/pp/02.expect @@ -1,6 +1,6 @@ f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1); -f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1); +f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1); char c[2][6] = { "hello", "" }; f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1); -f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1); +f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1); diff --git a/tests/pp/14.c b/tests/pp/14.c index 8611479..e15468c 100644 --- a/tests/pp/14.c +++ b/tests/pp/14.c @@ -1,11 +1,13 @@ -extern int printf(const char *format, ...); -#define P ++ -#define n(x) x +#define W Z +#define Z(X) W(X,2) +#define Y(X) Z(X) +#define X Y +return X(X(1)); -int main(void) -{ - int a = 0, b = -1; - int i1 = a P+P b; - printf("i1 = %d\n", i1); - return n(0x1e)n(-1); -} +#define P Q +#define Q(n) P(n,2) +return P(1); + +#define A (B * B) +#define B (A + A) +return A + B; diff --git a/tests/pp/14.expect b/tests/pp/14.expect index 138f97b..3786044 100644 --- a/tests/pp/14.expect +++ b/tests/pp/14.expect @@ -1,8 +1,3 @@ -extern int printf(const char *format, ...); -int main(void) -{ - int a = 0, b = -1; - int i1 = a +++ ++ b; - printf("i1 = %d\n", i1); - return 0x1e -1; -} +return Z(Z(1,2),2); +return Q(1,2); +return ((A + A) * (A + A)) + ((B * B) + (B * B)); diff --git a/tests/pp/15.c b/tests/pp/15.c deleted file mode 100644 index dc2b8d1..0000000 --- a/tests/pp/15.c +++ /dev/null @@ -1,26 +0,0 @@ -#define Y(x) Z(x) -#define X Y -X(1) -X(X(1)) -X(X(X(X(X(1))))) - -#define A B -#define B A -return A + B; - -#undef A -#undef B - -#define A B+1 -#define B A -return A + B; - -#define A1 B1+1 -#define B1 C1+2 -#define C1 A1+3 -return A1 + B1; - -#define i() x -#define n() 1 -i()i()n()n()i() -i()+i()-n()+n()- diff --git a/tests/pp/15.expect b/tests/pp/15.expect deleted file mode 100644 index d3d3dd5..0000000 --- a/tests/pp/15.expect +++ /dev/null @@ -1,26 +0,0 @@ - - -Z(1) -Z(Z(1)) -Z(Z(Z(Z(Z(1))))) - - - -return A + B; - - - - - - -return A+1 + B+1; - - - - -return A1+3 +2 +1 + B1+1 +3 +2; - - - -x x 1 1 x -x+x-1 +1 - diff --git a/tests/pp/Makefile b/tests/pp/Makefile index ad97f9b..cd0b83f 100644 --- a/tests/pp/Makefile +++ b/tests/pp/Makefile @@ -3,6 +3,7 @@ # TCC = ../../tcc + TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) TESTS += $(patsubst %.S,%.test,$(wildcard *.S)) @@ -35,8 +36,8 @@ DIFF_OPTS = -Nu -b -B -I "^\#" clean: rm -vf *.output -02.test : DIFF_OPTS += -w -15.test : DIFF_OPTS += -w +# 02.test : DIFF_OPTS += -w +# 15.test : DIFF_OPTS += -w # diff options: # -b ighore space changes