qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-04 10:30:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into qfcc-codegen

Browse source 
Conflicts:
	tools/qfcc/source/expr.c
	tools/qfcc/source/function.c
	tools/qwaq/test.r
This commit is contained in:
Bill Currie 2011-03-20 15:58:31 +09:00
commit 1ada2a96cf
3 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/source/function.c
View file

@ -322,6 +322,7 @@ find_function (expr_t *fexpr, expr_t *params)
memset (&type, 0, sizeof (type)); memset (&type, 0, sizeof (type));
type.type = ev_func;
for (e = params; e; e = e->next) { for (e = params; e; e = e->next) {
if (e->type == ex_error) if (e->type == ex_error)
return e; return e;

27
tools/qfcc/test/file-line.r Normal file
View file

@ -0,0 +1,27 @@
void printf (string fmt, ...) = #0;
@overload void test (integer x)
{
printf ("\"%s\" %s %d %s\n",
__PRETTY_FUNCTION__, __FUNCTION__, __LINE__, __FILE__);
}
@overload void test (void)
{
printf ("\"%s\" %s %d %s\n",
__PRETTY_FUNCTION__, __FUNCTION__, __LINE__, __FILE__);
}
void foo (void)
{
printf ("\"%s\" %s %d %s\n",
__PRETTY_FUNCTION__, __FUNCTION__, __LINE__, __FILE__);
}
integer main ()
{
test (1);
test ();
foo ();
return 0;
}

3
tools/qwaq/test.r
View file

@ -34,7 +34,8 @@
-run -run
{ {
print ("Hello world\n"); print ("Hello world\n");
printf ("%i %p\n", self, &self.x); printf ("%i %p [%s %s]\n", self, &self.x, [self description],
__PRETTY_FUNCTION__);
return self; return self;
} }