const merge testing. qfcc is currently borked in that dept.

This commit is contained in:
Bill Currie 2001-06-08 00:14:11 +00:00
parent 62c783f47a
commit ef99ad24b0
2 changed files with 11 additions and 3 deletions

View file

@ -28,7 +28,7 @@ main ()
func_t main_func; func_t main_func;
FILE *f; FILE *f;
int len; int len;
//int i; int i;
Cvar_Init_Hash (); Cvar_Init_Hash ();
Cmd_Init_Hash (); Cmd_Init_Hash ();
@ -62,9 +62,9 @@ main ()
Sys_Error ("couldn't load %s\n", "qwaq.dat"); Sys_Error ("couldn't load %s\n", "qwaq.dat");
*progs.edicts = PR_InitEdicts (&progs, MAX_EDICTS); *progs.edicts = PR_InitEdicts (&progs, MAX_EDICTS);
#if 0
for (i = 0; i < progs.progs->numstatements; i++) for (i = 0; i < progs.progs->numstatements; i++)
PR_PrintStatement (&progs, &progs.pr_statements[i]); PR_PrintStatement (&progs, &progs.pr_statements[i]);
#if 0
printf ("\n"); printf ("\n");
for (i = 0; i < progs.progs->numfunctions; i++) { for (i = 0; i < progs.progs->numfunctions; i++) {
dfunction_t *func = &progs.pr_functions[i]; dfunction_t *func = &progs.pr_functions[i];

View file

@ -1,9 +1,12 @@
float foo = 1;
float bar = 1;
float () main = float () main =
{ {
local float handle; local float handle;
local string buffer; local string buffer;
handle = open ("builtins.c", 0); handle = open ("main.qc", 0);
if (handle == -1) { if (handle == -1) {
print (strerror (errno ()) + "\n"); print (strerror (errno ()) + "\n");
return 1; return 1;
@ -19,3 +22,8 @@ float () main =
close (handle); close (handle);
return 0; return 0;
}; };
float () baz =
{
return foo + bar;
};