Changed tests to new standard library.

Fixed some regressions when converting to new standard library.


git-svn-id: http://picoc.googlecode.com/svn/trunk@432 21eae674-98b7-11dd-bd71-f92a316d2d60

cstdlib/stdio.c

@@ -9,6 +9,8 @@
 
 FILE *CStdOut;
 
+static int ZeroValue = 0;
+static int TRUEValue = 1;
 static int EOFValue = EOF;
 static int SEEK_SETValue = SEEK_SET;
 static int SEEK_CURValue = SEEK_CUR;
@@ -251,7 +253,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, int S
                     if (ShowType == &IntType)
                     {
                         /* show a signed integer */
-                        if (IS_INTEGER_NUMERIC(ThisArg))
+                        if (IS_NUMERIC_COERCIBLE(ThisArg))
                             StdioFprintfWord(&SOStream, OneFormatBuf, ExpressionCoerceUnsignedInteger(ThisArg));
                         else
                             StdioOutPuts("XXX", &SOStream);
@@ -259,7 +261,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, int S
                     else if (ShowType == &FPType)
                     {
                         /* show a floating point number */
-                        if (IS_FP(ThisArg))
+                        if (IS_NUMERIC_COERCIBLE(ThisArg))
                             StdioFprintfFP(&SOStream, OneFormatBuf, ExpressionCoerceFP(ThisArg));
                         else
                             StdioOutPuts("XXX", &SOStream);
@@ -681,6 +683,11 @@ void StdioSetupFunc(void)
     VariableDefinePlatformVar(NULL, "stdin", FilePtrType, (union AnyValue *)&stdinValue, FALSE);
     VariableDefinePlatformVar(NULL, "stdout", FilePtrType, (union AnyValue *)&stdoutValue, FALSE);
     VariableDefinePlatformVar(NULL, "stderr", FilePtrType, (union AnyValue *)&stderrValue, FALSE);
+
+    /* define NULL, TRUE and FALSE */
+    VariableDefinePlatformVar(NULL, "NULL", &IntType, (union AnyValue *)&ZeroValue, FALSE);
+    VariableDefinePlatformVar(NULL, "TRUE", &IntType, (union AnyValue *)&TRUEValue, FALSE);
+    VariableDefinePlatformVar(NULL, "FALSE", &IntType, (union AnyValue *)&ZeroValue, FALSE);
 }
 
 /* portability-related I/O calls */

tests/00_assignment.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 a = 42;
 printf("%d\n", a);

tests/01_comment.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 printf("Hello\n");
 printf("Hello\n"); /* this is a comment */ printf("Hello\n");
 printf("Hello\n");

tests/02_printf.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 printf("Hello world\n");
 
 int Count;

tests/03_struct.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 struct fred
 {
     int boris;

tests/04_for.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int Count;
 
 for (Count = 1; Count <= 10; Count++)

tests/05_array.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int Count;
 int Array[10];
 

tests/06_case.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int Count;
 
 for (Count = 0; Count < 4; Count++)

tests/07_function.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int myfunc(int x)
 {
     return x * x;

tests/08_while.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int p;
 int t;

tests/09_do_while.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int p;
 int t;

tests/10_pointer.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int *b;
 int c;

tests/11_precedence.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int b;
 int c;

tests/12_hashdefine.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 #define FRED 12
 #define BLOGGS(x) (12*(x))
 

tests/13_integer_literals.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a = 24680;
 int b = 01234567;
 int c = 0x2468ac;

tests/14_if.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a = 1;
 
 if (a)

tests/15_recursion.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int factorial(int i) 
 {
     if (i < 2)

tests/16_nesting.c

@@ -1,12 +1,14 @@
-int x, y, z;
-
-for (x = 0; x < 2; x++)
-{
-    for (y = 0; y < 3; y++)
-    {
-        for (z = 0; z < 3; z++)
-        {
-            printf("%d %d %d\n", x, y, z);
-        }
-    }
-}
+#include <stdio.h>
+
+int x, y, z;
+
+for (x = 0; x < 2; x++)
+{
+    for (y = 0; y < 3; y++)
+    {
+        for (z = 0; z < 3; z++)
+        {
+            printf("%d %d %d\n", x, y, z);
+        }
+    }
+}

tests/17_enum.c

@@ -1,20 +1,22 @@
-enum fred
-{
-    a,
-    b,
-    c,
-    d,
-    e = 54,
-    f = 73,
-    g,
-    h
-};
+#include <stdio.h>
+
+enum fred
+{
+    a,
+    b,
+    c,
+    d,
+    e = 54,
+    f = 73,
+    g,
+    h
+};
 
 enum fred frod;
-
-printf("%d %d %d %d %d %d %d %d\n", a, b, c, d, e, f, g, h);
-printf("%d\n", frod);
-frod = 12;
-printf("%d\n", frod);
-frod = e;
-printf("%d\n", frod);
+
+printf("%d %d %d %d %d %d %d %d\n", a, b, c, d, e, f, g, h);
+printf("%d\n", frod);
+frod = 12;
+printf("%d\n", frod);
+frod = e;
+printf("%d\n", frod);

tests/18_include.c

@@ -1,3 +1,5 @@
-printf("including\n");
-#include "18_include.h"
-printf("done\n");
+#include <stdio.h>
+
+printf("including\n");
+#include "18_include.h"
+printf("done\n");

tests/19_pointer_arithmetic.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int *b;
 int *c;

tests/20_pointer_comparison.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a;
 int b;
 int *d;

tests/21_char_array.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int x = 'a';
 char y = x;
 

tests/22_floating_point.c

@@ -1,40 +1,43 @@
-// variables
-float a = 12.34 + 56.78;
-printf("%f\n", a);
-
-// infix operators
-printf("%f\n", 12.34 + 56.78);
-printf("%f\n", 12.34 - 56.78);
-printf("%f\n", 12.34 * 56.78);
-printf("%f\n", 12.34 / 56.78);
-
-// comparison operators
-printf("%d %d %d %d %d %d\n", 12.34 < 56.78, 12.34 <= 56.78, 12.34 == 56.78, 12.34 >= 56.78, 12.34 > 56.78, 12.34 != 56.78);
-printf("%d %d %d %d %d %d\n", 12.34 < 12.34, 12.34 <= 12.34, 12.34 == 12.34, 12.34 >= 12.34, 12.34 > 12.34, 12.34 != 12.34);
-printf("%d %d %d %d %d %d\n", 56.78 < 12.34, 56.78 <= 12.34, 56.78 == 12.34, 56.78 >= 12.34, 56.78 > 12.34, 56.78 != 12.34);
-
-// assignment operators
-a = 12.34;
-a += 56.78;
-printf("%f\n", a);
-
-a = 12.34;
-a -= 56.78;
-printf("%f\n", a);
-
-a = 12.34;
-a *= 56.78;
-printf("%f\n", a);
-
-a = 12.34;
-a /= 56.78;
-printf("%f\n", a);
-
-// prefix operators
-printf("%f\n", +12.34);
-printf("%f\n", -12.34);
-
-// type coercion
-a = 2;
-printf("%f\n", a);
-printf("%f\n", sin(2));
+#include <stdio.h>
+#include <math.h>
+
+// variables
+float a = 12.34 + 56.78;
+printf("%f\n", a);
+
+// infix operators
+printf("%f\n", 12.34 + 56.78);
+printf("%f\n", 12.34 - 56.78);
+printf("%f\n", 12.34 * 56.78);
+printf("%f\n", 12.34 / 56.78);
+
+// comparison operators
+printf("%d %d %d %d %d %d\n", 12.34 < 56.78, 12.34 <= 56.78, 12.34 == 56.78, 12.34 >= 56.78, 12.34 > 56.78, 12.34 != 56.78);
+printf("%d %d %d %d %d %d\n", 12.34 < 12.34, 12.34 <= 12.34, 12.34 == 12.34, 12.34 >= 12.34, 12.34 > 12.34, 12.34 != 12.34);
+printf("%d %d %d %d %d %d\n", 56.78 < 12.34, 56.78 <= 12.34, 56.78 == 12.34, 56.78 >= 12.34, 56.78 > 12.34, 56.78 != 12.34);
+
+// assignment operators
+a = 12.34;
+a += 56.78;
+printf("%f\n", a);
+
+a = 12.34;
+a -= 56.78;
+printf("%f\n", a);
+
+a = 12.34;
+a *= 56.78;
+printf("%f\n", a);
+
+a = 12.34;
+a /= 56.78;
+printf("%f\n", a);
+
+// prefix operators
+printf("%f\n", +12.34);
+printf("%f\n", -12.34);
+
+// type coercion
+a = 2;
+printf("%f\n", a);
+printf("%f\n", sin(2));

tests/22_floating_point.expect

@@ -1,16 +1,16 @@
-69.12
-69.12
--44.44
-700.6652
+69.120000
+69.120000
+-44.440000
+700.665200
 0.217330
 1 1 0 0 0 1
 0 1 1 1 0 0
 0 0 0 1 1 1
-69.12
--44.44
-700.6652
+69.120000
+-44.440000
+700.665200
 0.217330
-12.34
--12.34
-2.0
+12.340000
+-12.340000
+2.000000
 0.909297

tests/23_type_coercion.c

@@ -1,45 +1,47 @@
-void charfunc(char a)
-{
-    printf("char: %c\n", a);
-}
-
-void intfunc(int a)
-{
-    printf("int: %d\n", a);
-}
-
-void floatfunc(float a)
-{
-    printf("float: %f\n", a);
-}
-
-charfunc('a');
-charfunc(98);
-charfunc(99.0);
-
-intfunc('a');
-intfunc(98);
-intfunc(99.0);
-
-floatfunc('a');
-floatfunc(98);
-floatfunc(99.0);
-
-printf("%c %d %f\n", 'a', 'b', 'c');
-printf("%c %d %f\n", 97, 98, 99);
-printf("%c %d %f\n", 97.0, 98.0, 99.0);
-
-char b = 97;
-char c = 97.0;
-
-printf("%d %d\n", b, c);
-
-int d = 'a';
-int e = 97.0;
-
-printf("%d %d\n", d, e);
-
-float f = 'a';
-float g = 97;
-
-printf("%f %f\n", f, g);
+#include <stdio.h>
+
+void charfunc(char a)
+{
+    printf("char: %c\n", a);
+}
+
+void intfunc(int a)
+{
+    printf("int: %d\n", a);
+}
+
+void floatfunc(float a)
+{
+    printf("float: %f\n", a);
+}
+
+charfunc('a');
+charfunc(98);
+charfunc(99.0);
+
+intfunc('a');
+intfunc(98);
+intfunc(99.0);
+
+floatfunc('a');
+floatfunc(98);
+floatfunc(99.0);
+
+printf("%c %d %f\n", 'a', 'b', 'c');
+printf("%c %d %f\n", 97, 98, 99);
+printf("%c %d %f\n", 97.0, 98.0, 99.0);
+
+char b = 97;
+char c = 97.0;
+
+printf("%d %d\n", b, c);
+
+int d = 'a';
+int e = 97.0;
+
+printf("%d %d\n", d, e);
+
+float f = 'a';
+float g = 97;
+
+printf("%f %f\n", f, g);

tests/23_type_coercion.expect

@@ -1,15 +1,15 @@
-char: a
-char: b
-char: c
-int: 97
-int: 98
-int: 99
-float: 97.0
-float: 98.0
-float: 99.0
-a 98 99.0
-a 98 99.0
-a 98 99.0
-97 97
-97 97
-97.0 97.0
+char: a
+char: b
+char: c
+int: 97
+int: 98
+int: 99
+float: 97.000000
+float: 98.000000
+float: 99.000000
+a 98 99.000000
+a 98 99.000000
+a 98 99.000000
+97 97
+97 97
+97.000000 97.000000

tests/24_math_library.c

@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <math.h>
+
 printf("%f\n", sin(0.12));
 printf("%f\n", cos(0.12));
 printf("%f\n", tan(0.12));

tests/24_math_library.expect

@@ -1,18 +1,18 @@
 0.119712
-0.992808
+0.992809
 0.120579
-0.120289
+0.120290
 1.450506
-0.119428
+0.119429
 0.120288
-1.007208
+1.007209
 0.119427
-1.127496
-0.12
--2.120263
--0.920818
+1.127497
+0.120000
+-2.120264
+-0.920819
 0.775357
 0.346410
-12.0
-13.0
-12.0
+12.000000
+13.000000
+12.000000

tests/25_quicksort.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int array[16];
 
 //Swap integer values by array indexes

tests/26_character_constants.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 printf("%d\n", '\1');
 printf("%d\n", '\10');
 printf("%d\n", '\100');

tests/27_sizeof.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 char a;
 int b;
 double c;

tests/28_strings.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 char a[10];
 
 strcpy(a, "hello");

tests/29_array_address.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 char a[10];
 strcpy(a, "abcdef");
 printf("%s\n", &a[1]);

tests/34_array_assignment.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a[4];
 
 a[0] = 12;

tests/35_sizeof.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 char a;
 short b;
 

tests/36_array_initialisers.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int Count;
 
 int Array[10] = { 12, 34, 56, 78, 90, 123, 456, 789, 8642, 9753 };

tests/37_sprintf.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 char Buf[100];
 int Count;
 

tests/38_multiple_array_index.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 int a[4][4];
 int b = 0;
 int x;

tests/39_typedef.c

@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 typedef int MyInt;
 
 MyInt a = 1;