X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=tests%2Fparser%2Fvalidate001.phpt;h=da1c20a7c8d22afb8b14f383c521d86485d72a9c;hp=f9869a830b1231f300143926057db8c442b721e6;hb=a2a2428b6e50787a7f33151275fb5ceabc7c5621;hpb=510306ed8a97c9eb3f113d9181b60ccdf0b91d79

diff --git a/tests/parser/validate001.phpt b/tests/parser/validate001.phpt
index f9869a8..da1c20a 100644
--- a/tests/parser/validate001.phpt
+++ b/tests/parser/validate001.phpt
@@ -7,23 +7,20 @@ extension_loaded("psi") or die("skip - need ext/psi");
 --FILE--
 ===TEST===
 <?php 
+
 function validate($check, $psi) {
-	$file = __DIR__."/001.psi";
-	file_put_contents($file, $psi);
-	if ($check !== psi_validate($file)) {
-		echo "Assertion failed!\n";
+	if ($check !== psi_validate_string($psi)) {
+		printf("Assertion failed!\nExpected: %s\n\n%s\n\n",
+				$check ? "true" : "false", $psi);
 	}
 }
 
-validate(false, "typedef void foo;");
 validate(true, "typedef void *bar;");
-validate(false, "typedef long int;");
 validate(true, "typedef long foo;");
-validate(false, "typedef struct foo bar;");
+validate(true, "typedef struct foo bar;");
 validate(true, "typedef struct {int a;} foo;");
-validate(false, "struct a; \n typedef struct a a_t;");
-validate(true, "struct a::(8,8); \n typedef struct a a_t;");
-validate(true, "typedef struct a a_t; \n struct a::(8,8);");
+validate(true, "struct a::(8,8); \ntypedef struct a a_t;");
+validate(true, "typedef struct a a_t; \nstruct a::(8,8);");
 
 validate(true,
 <<<PSI
@@ -34,65 +31,16 @@ enum {
 }
 PSI
 );
-validate(false,
-<<<PSI
-enum {
-	A,
-	B = A + 2,
-	C = X
-}
-PSI
-);
-
-validate(true,
-<<<PSI
-struct a {
-	int i;
-}
-struct b {
-	long l;
-}
-typedef struct b b;
-union v {
-	struct a a;
-	b b;
-	struct {
-		double d;
-	} s;
-	union {
-		long l;
-		double d;
-	} u;
-}
-PSI
-);
 
 validate(true, "typedef int foo(int bar);");
 validate(true, "typedef int (foo)(int bar);");
 validate(true, "typedef int (*foo)(int bar);");
 validate(true, "typedef int *(*foo)(int bar);");
-validate(false, "typedef int *(*foo)(int *(*bar)(int baz));");
-validate(true, "typedef int *(*bar)(int baz); \n typedef int *(*foo)(bar bar);");
-validate(false, "typedef int bar(int baz); \n typedef int *(*foo)(bar bar);");
+validate(true, "typedef int *(*bar)(int baz); \ntypedef int *(*foo)(bar bar);");
+validate(true, "typedef int bar(int baz); \ntypedef int *(*foo)(bar bar);");
 
 ?>
 ===DONE===
---CLEAN--
-<?php
-@unlink(__DIR__."/001.psi");
-?>
 --EXPECTF--
 ===TEST===
-
-Warning: PSI syntax error: Unexpected token ';' in %s001.psi on line 1
-
-Warning: PSI syntax error: Unexpected token 'int' in %s001.psi on line 1
-
-Warning: Type 'bar' cannot be aliased to struct 'foo' in %s001.psi on line 1
-
-Warning: Cannot compute size of empty struct 'a' in %s001.psi on line 1
-
-Warning: Unknown variable 'X' in numeric expression in %s001.psi on line 4
-
-Warning: PSI syntax error: Unexpected token '(' in %s001.psi on line 1
 ===DONE===