X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=tests%2Fparser%2Fvalidate001.phpt;h=5774d77adfb88869aae15438d7591a1c6a612012;hp=b9a9a6163fe11c217fd41de2e38dec2a7482833a;hb=410881ab37d993b0a15d295293a005aa0500ce8d;hpb=b2200987b147fa850c5b001620cb2535b2546b7d

diff --git a/tests/parser/validate001.phpt b/tests/parser/validate001.phpt
index b9a9a61..5774d77 100644
--- a/tests/parser/validate001.phpt
+++ b/tests/parser/validate001.phpt
@@ -7,10 +7,9 @@ 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)) {
+	if ($check !== psi_validate_string($psi)) {
 		printf("Assertion failed!\nExpected: %s\n\n%s\n\n",
 				$check ? "true" : "false", $psi);
 	}
@@ -20,7 +19,7 @@ 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; \ntypedef struct a a_t;");
 validate(true, "struct a::(8,8); \ntypedef struct a a_t;");
@@ -74,26 +73,22 @@ 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); \ntypedef int *(*foo)(bar bar);");
-validate(false, "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 ';' at pos 17 in %s on line 1
 
-Warning: PSI syntax error: Unexpected token 'int' in %s001.psi on line 1
+Warning: PSI syntax error: Unexpected token 'int' at pos 14 in %s 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 %s 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 %s on line 4
 
-Warning: Unknown variable 'X' in numeric expression in %s001.psi on line 4
+Warning: PSI syntax error: Unexpected token '(' at pos 26 in %s on line 1
 
-Warning: PSI syntax error: Unexpected token '(' in %s001.psi on line 1
+Warning: PSI syntax error: Unexpected token '(' at pos 32 in %s on line 1
 ===DONE===