Menu
▾
▴
agd-cvs — Mailing list for CVS commits.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(180) |
Apr
(20) |
May
|
Jun
(91) |
Jul
(78) |
Aug
(18) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Peep P. <so...@us...> - 2004-03-15 19:02:45
|
Update of /cvsroot/agd/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4457 Modified Files: ChangeLog Ideas TODO Log Message: Routine commit. Index: ChangeLog =================================================================== RCS file: /cvsroot/agd/server/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 12 Mar 2004 16:05:04 -0000 1.2 --- ChangeLog 15 Mar 2004 18:53:35 -0000 1.3 *************** *** 2,8 **** 0.0.2: ---------------------------------------------------------------------------- 2004-03-12 * interpreter.c: fixed F_RETURN and F_CALL_OTHER - * compiles on MacOSX * compiles on Solaris again (id_t was redefined) --- 2,12 ---- 0.0.2: ---------------------------------------------------------------------------- + 2004-03-15 + * fixed popping locals if this_ob was destructed + * garbage collection for program_t - clones now use the master's + program_t. + * fixed input_to resetting with player_t->input_to_called 2004-03-12 * interpreter.c: fixed F_RETURN and F_CALL_OTHER * compiles on MacOSX * compiles on Solaris again (id_t was redefined) Index: TODO =================================================================== RCS file: /cvsroot/agd/server/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 12 Mar 2004 08:32:10 -0000 1.1 --- TODO 15 Mar 2004 18:53:35 -0000 1.2 *************** *** 32,35 **** --- 32,36 ---- - dfuns: query_ip() for players. + int random(int highest) - better logging system - log using lib's facilities (master::log()?) *************** *** 60,65 **** all of the clones would be broken too. - default values for arguments ! - string table for each object, and F_PUSH_STRING takes index into the table ! - F_PUSH_*VAR don't push T_LVALUE, F_PUSH_*VAR_LVALUE does (for assign lvalue and ++, -- lvalues) - clean up includes, not everything needs everything in std.h and lpc_incl.h, etc. - for div, mul and mod - if both sides are direct_type, calculate result at compile-time --- 61,66 ---- all of the clones would be broken too. - default values for arguments ! int foo(int i, int j = 1); ! - string table for each program, and F_PUSH_STRING takes index into the table - clean up includes, not everything needs everything in std.h and lpc_incl.h, etc. - for div, mul and mod - if both sides are direct_type, calculate result at compile-time Index: Ideas =================================================================== RCS file: /cvsroot/agd/server/Ideas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Ideas 12 Mar 2004 08:32:10 -0000 1.1 --- Ideas 15 Mar 2004 18:53:35 -0000 1.2 *************** *** 3,10 **** lpc: * if(x == 1 || == 2 && != 3) - * Optimized status type. A variable_t of type T_STATUS should have an index - into an array of bits. The value of the variable is array_of_bits & (0x1 << index). - We then only use sizeof(char) + 1 bytes instead of sizeof(long int) * Argument type grouping int foo(int i, j, k, string s1, s2, s3, object ob1, ob2); ! --- 3,12 ---- lpc: * if(x == 1 || == 2 && != 3) * Argument type grouping int foo(int i, j, k, string s1, s2, s3, object ob1, ob2); ! * k integer constants: ! 100k equals to 100000 ! 1k equals to 1000 etc. ! * the same for K, M ! K (or maybe Kb / KB) = 1024 ! M = 1024 * 1024 |
|
From: Peep P. <so...@us...> - 2004-03-15 19:02:45
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4457/src Modified Files: debug.c lang.output Log Message: Routine commit. Index: lang.output =================================================================== RCS file: /cvsroot/agd/server/src/lang.output,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang.output 12 Mar 2004 11:51:44 -0000 1.1 --- lang.output 15 Mar 2004 18:53:36 -0000 1.2 *************** *** 9,13 **** ! State 146 conflicts: 1 shift/reduce --- 9,13 ---- ! State 147 conflicts: 1 shift/reduce [...4206 lines suppressed...] ! state 151 ! 76 if: L_IF '(' expr ')' statement else . ! $default reduce using rule 76 (if) ! state 152 ! 79 do_while: L_DO statement L_WHILE '(' expr ')' . ! $default reduce using rule 79 (do_while) ! state 153 ! 78 else: L_ELSE statement . ! $default reduce using rule 78 (else) Index: debug.c =================================================================== RCS file: /cvsroot/agd/server/src/debug.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** debug.c 12 Mar 2004 08:40:10 -0000 1.6 --- debug.c 15 Mar 2004 18:53:36 -0000 1.7 *************** *** 278,282 **** printf("Printing code for \"%s\":\n", ob->name); printf("Globals: \n"); ! print_var_arr(&p->variables); printf("\n"); --- 278,282 ---- printf("Printing code for \"%s\":\n", ob->name); printf("Globals: \n"); ! print_var_arr(&ob->variables); printf("\n"); |
|
From: Peep P. <so...@us...> - 2004-03-15 19:01:55
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4242 Modified Files: object.c Log Message: program_t references and garbage collection. Index: object.c =================================================================== RCS file: /cvsroot/agd/server/src/object.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** object.c 12 Mar 2004 08:40:10 -0000 1.5 --- object.c 15 Mar 2004 18:52:39 -0000 1.6 *************** *** 71,80 **** { list_remove(&all_objects, ob); ! if(ob->prog) { ! free_array(&ob->prog->fun_table, NULL); /* Will probably crash. */ ! free_array(&ob->prog->functions, free_fun); ! free_array(&ob->prog->variables, (void (*)(void*))free_var); ! xfree(ob->prog); } if(ob->name) xfree(ob->name); --- 71,83 ---- { list_remove(&all_objects, ob); ! if(unref_prog(ob->prog)) { ! ob->prog = NULL; } + /* + free_array(&ob->prog->fun_table, NULL); + free_array(&ob->prog->functions, free_fun); + xfree(ob->prog); + */ + free_array(&ob->variables, (void (*)(void*))free_var); if(ob->name) xfree(ob->name); *************** *** 98,101 **** --- 101,122 ---- } + void ref_prog(program_t *prog) + { + prog->ref++; + } + + /* Returns 1 if program was freed. */ + int unref_prog(program_t *prog) + { + prog->ref--; + if(prog->ref <= 0) { + free_array(&prog->functions, free_fun); + free_array(&prog->fun_table, NULL); + xfree(prog); + return 1; + } + return 0; + } + object_t *find_object(char *s) { *************** *** 151,158 **** sprintf(new_ob->name, "%s#%d", base_ob->name, base_ob->ref); ! new_ob->prog = type_xmalloc(program_t); new_ob->prog->fun_table = *copy_array(&base_ob->prog->fun_table, NULL); ! new_ob->prog->functions = *copy_array(&base_ob->prog->functions, (void*(*)(void *)) copy_fun); ! new_ob->prog->variables = *copy_array(&base_ob->prog->variables, (void*(*)(void*)) copy_var); apply(new_ob, "create", NULL); --- 172,183 ---- sprintf(new_ob->name, "%s#%d", base_ob->name, base_ob->ref); ! /*new_ob->prog = type_xmalloc(program_t); new_ob->prog->fun_table = *copy_array(&base_ob->prog->fun_table, NULL); ! new_ob->prog->functions = *copy_array(&base_ob->prog->functions, (void*(*)(void *)) copy_fun);*/ ! new_ob->prog = base_ob->prog; ! ref_prog(new_ob->prog); ! ! /* Memory leak? */ ! new_ob/*->prog*/->variables = *copy_array(&base_ob/*->prog*/->variables, (void*(*)(void*)) copy_var); apply(new_ob, "create", NULL); |
|
From: Peep P. <so...@us...> - 2004-03-15 18:59:38
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3674 Modified Files: main.c Log Message: Disabled debugging of master::crash() again. Index: main.c =================================================================== RCS file: /cvsroot/agd/server/src/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.c 12 Mar 2004 08:40:10 -0000 1.8 --- main.c 15 Mar 2004 18:50:28 -0000 1.9 *************** *** 39,43 **** #ifdef DEBUG /* We generally do not want to debug the crash function. Causes unnecessary spam. */ ! /* dont_debug_interpreter = 1;*/ #endif --- 39,43 ---- #ifdef DEBUG /* We generally do not want to debug the crash function. Causes unnecessary spam. */ ! dont_debug_interpreter = 1; #endif |
|
From: Peep P. <so...@us...> - 2004-03-15 18:59:21
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3528 Modified Files: net.c net.h Log Message: Added input_to_called. Index: net.c =================================================================== RCS file: /cvsroot/agd/server/src/net.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** net.c 12 Mar 2004 08:40:10 -0000 1.6 --- net.c 15 Mar 2004 18:50:10 -0000 1.7 *************** *** 89,93 **** player_t *p; ! object_t *temp_pl; p = type_xmalloc(player_t); --- 89,93 ---- player_t *p; ! object_t *player_ob; p = type_xmalloc(player_t); *************** *** 102,110 **** this_player = p; ! temp_pl = type_xmalloc(object_t); ! temp_pl->iaob = p; ! temp_pl->name = NULL; ! temp_pl->prog = NULL; ! this_ob = p->ob = temp_pl; { variable_t *login_ob, *pob; --- 102,110 ---- this_player = p; ! player_ob = type_xmalloc(object_t); ! player_ob->iaob = p; ! player_ob->name = NULL; ! player_ob->prog = NULL; ! this_ob = p->ob = player_ob; { variable_t *login_ob, *pob; *************** *** 117,134 **** /* More freedom to the coder! Doesn't have to return anything if not needed. */ printf("Warning: master::connect() didn't return an object.\n"); ! xfree(temp_pl); return; } p->ob = login_ob->u.ob; p->ob->iaob = p; apply(login_ob->u.ob, "logon", NULL); ! if(this_player == p && p->ob == temp_pl) { return; } ! /* temp_pl is not needed anymore if we get this far. */ ! xfree(temp_pl); } } --- 117,136 ---- /* More freedom to the coder! Doesn't have to return anything if not needed. */ printf("Warning: master::connect() didn't return an object.\n"); ! xfree(player_ob); return; } p->ob = login_ob->u.ob; + this_ob = login_ob->u.ob; p->ob->iaob = p; apply(login_ob->u.ob, "logon", NULL); ! if(this_player == p && p->ob == player_ob) { return; } ! debug("net_accept", "player object was changed to %p; freeing player_ob %p\n", p->ob, player_ob); ! /* player_ob is not needed anymore if we get this far. */ ! xfree(player_ob); } } *************** *** 170,173 **** --- 172,181 ---- goto out; } + + if(!p->ob) { + net_send("Oops, looks like you don't have an interactive object!\n", 55, p); + net_disconnect(p); + return; + } c = strchr(p->conn.recvbuf, '\r'); *************** *** 178,183 **** } else if(c = strchr(p->conn.recvbuf, '\n')) *c = '\0';*/ ! if(p->ob) ! apply(p->ob, p->input_to, "s", p->conn.recvbuf); /* The previous apply() might have destructed p->ob */ if(p->ob) --- 186,195 ---- } else if(c = strchr(p->conn.recvbuf, '\n')) *c = '\0';*/ ! p->input_to_called = 1; ! apply(p->ob, p->input_to, "s", p->conn.recvbuf); ! if(p->input_to_called) { /* input_to wasn't called again */ ! p->input_to = NULL; ! } ! /* The previous apply() might have destructed p->ob */ if(p->ob) Index: net.h =================================================================== RCS file: /cvsroot/agd/server/src/net.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** net.h 12 Mar 2004 16:02:05 -0000 1.7 --- net.h 15 Mar 2004 18:50:10 -0000 1.8 *************** *** 35,38 **** --- 35,39 ---- char *input_to; + int input_to_called; } player_t; |
|
From: Peep P. <so...@us...> - 2004-03-15 18:58:46
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3311 Modified Files: lpc.h object.h Log Message: Moves program_T and function_t away from lpc.h, to object.h. Added program_t references. Index: object.h =================================================================== RCS file: /cvsroot/agd/server/src/object.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** object.h 12 Mar 2004 08:40:10 -0000 1.4 --- object.h 15 Mar 2004 18:49:30 -0000 1.5 *************** *** 2,9 **** #define _OBJECT_H ! #define O_DESTRUCTED 0x1 typedef struct object_t { char *name; program_t *prog; int ref; --- 2,22 ---- #define _OBJECT_H ! typedef struct { ! int type; ! array_t args; ! array_t code; ! unsigned int lineno; ! } function_t; ! ! typedef struct program_t { ! array_t functions; ! array_t fun_table; ! int ref; ! } program_t; ! typedef struct object_t { char *name; program_t *prog; + array_t /* * */ variables; int ref; *************** *** 18,24 **** --- 31,41 ---- } object_t; + #define O_DESTRUCTED 0x1 + void destruct(object_t *ob); void ref_ob(object_t *ob, variable_t *v); void unref_ob(object_t *ob, variable_t *v); + void ref_prog(program_t *prog); + int unref_prog(program_t *prog); object_t *find_object(char *name); object_t *load_object(char *name); Index: lpc.h =================================================================== RCS file: /cvsroot/agd/server/src/lpc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lpc.h 12 Mar 2004 08:40:10 -0000 1.5 --- lpc.h 15 Mar 2004 18:49:30 -0000 1.6 *************** *** 38,54 **** } variable_t; - typedef struct { - int type; - array_t args; - array_t code; - unsigned int lineno; - } function_t; - - typedef struct program_t { - array_t functions; - /* array_t nametable;*/ - array_t fun_table; - array_t variables; - } program_t; - #endif --- 38,40 ---- |
|
From: Peep P. <so...@us...> - 2004-03-15 18:58:02
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3175 Modified Files: list.c Log Message: Temporary hack. Index: list.c =================================================================== RCS file: /cvsroot/agd/server/src/list.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list.c 12 Mar 2004 08:40:10 -0000 1.4 --- list.c 15 Mar 2004 18:48:45 -0000 1.5 *************** *** 34,40 **** void list_remove(list_t *l, void *data) { ! list_t *p, *prev; prev = NULL; p = l; while(1) { --- 34,41 ---- void list_remove(list_t *l, void *data) { ! list_t *saved_l, *p, *prev; prev = NULL; + saved_l = l; p = l; while(1) { *************** *** 45,49 **** prev->next = p->next; } ! xfree(p); /* ? */ return; } --- 46,51 ---- prev->next = p->next; } ! /* if(p != saved_l) ! xfree(p);*/ /* Never free the root element. */ return; } |
|
From: Peep P. <so...@us...> - 2004-03-15 18:57:28
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3038 Modified Files: lang.y Log Message: Fixes for prototype defining. Index: lang.y =================================================================== RCS file: /cvsroot/agd/server/src/lang.y,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang.y 12 Mar 2004 16:03:10 -0000 1.2 --- lang.y 15 Mar 2004 18:48:13 -0000 1.3 *************** *** 96,106 **** type L_IDENTIFIER { def_id_t *idp; ! idp = find_id($2); ! if(idp && idp->type != ID_FUN_PROT) { ! redeclaration_error(idp, ID_FUN); } else { define_id($2, ID_FUN_PROT, $1, NULL); /* define_id could return id_t*. */ $<id>$ = find_id($2); } } --- 96,117 ---- type L_IDENTIFIER { + /* Mid-rule action used only to store a value. + Feels hacky, but I don't want a global variable. + + 1 if the function declaration was just added; + 0 if it already existed. + Makes sense only in regard to the next action. */ + } + { def_id_t *idp; ! $<id>$ = idp = find_id($2); ! if(idp) { ! $<i>3 = 0; /* Means it already existed. */ ! if(idp->type != ID_FUN_PROT) ! redeclaration_error(idp, ID_FUN); } else { define_id($2, ID_FUN_PROT, $1, NULL); /* define_id could return id_t*. */ $<id>$ = find_id($2); + $<i>3 = 1; /* Means we just defined the prototype. */ } } *************** *** 109,120 **** def_id_t *idp; int i; ! idp = $<id>3; ! idp->args = copy_array(&$5, NULL); scope_level++; ! for(i=0;i<$5.length;i++) { variable_t *v; def_id_t *id; ! v = $5.data[i]; id = find_id(v->name); if(id) { --- 120,131 ---- def_id_t *idp; int i; ! idp = $<id>4; ! idp->args = copy_array(&$6, NULL); scope_level++; ! for(i=0;i<$6.length;i++) { variable_t *v; def_id_t *id; ! v = $6.data[i]; id = find_id(v->name); if(id) { *************** *** 129,135 **** block_or_semi { ! if($8.length) { ! def_id_t *idp = $<id>3; ! if(idp->lpc_type != $1 || compare_args(idp->args, &$5)) { char buf[256]; sprintf(buf, "definition doesn't match declaration for %s", $2); --- 140,146 ---- block_or_semi { ! if($9.length) { ! def_id_t *idp = $<id>4; ! if(idp->lpc_type != $1 || compare_args(idp->args, &$6)) { char buf[256]; sprintf(buf, "definition doesn't match declaration for %s", $2); *************** *** 140,155 **** idp->type = ID_FUN; ! if((int)$8.data[$8.length-1] != F_RETURN) { if($1 != T_VOID) { comp_error("control reaches end of non-void function"); } else { ! array_push(&$8, (void *) F_PUSH_VOID); ! array_push(&$8, (void *) F_RETURN); } } ! add_function(idp, $<i>7, &$8); } else { ! add_function($<id>3, 0, NULL); } pop_scope(); --- 151,174 ---- idp->type = ID_FUN; ! if((int)$9.data[$9.length-1] != F_RETURN) { if($1 != T_VOID) { comp_error("control reaches end of non-void function"); } else { ! array_push(&$9, (void *) F_PUSH_VOID); ! array_push(&$9, (void *) F_RETURN); } } ! add_function(idp, $<i>8, &$9); } else { ! def_id_t *idp = $<id>4; ! if(idp->type == ID_FUN_PROT && !$<i>3) { ! char buf[256]; ! sprintf(buf, "warning: repeated prototype for %s; using existing prototype", $2); ! display_error(buf); ! compile_warnings++; ! } else { ! add_function(idp, $<i>8, NULL); ! } } pop_scope(); *************** *** 1117,1123 **** } array_concat(&$$, realargs); - xfree(realargs); ! free_array(&$5, NULL); array_concat(&$$, &$1.arr); --- 1136,1141 ---- } array_concat(&$$, realargs); xfree(realargs); ! array_concat(&$$, &$1.arr); *************** *** 1125,1128 **** --- 1143,1147 ---- array_push(&$$, $3); array_push(&$$, (void *) $5.length); + free_array(&$5, NULL); } ; |
|
From: Peep P. <so...@us...> - 2004-03-15 18:56:14
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2745 Modified Files: compile.c Log Message: Some tinkering around. Index: compile.c =================================================================== RCS file: /cvsroot/agd/server/src/compile.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** compile.c 12 Mar 2004 16:03:10 -0000 1.11 --- compile.c 15 Mar 2004 18:46:59 -0000 1.12 *************** *** 59,63 **** #ifdef DEBUG ! debug("define_id", "%s base_scope %d\n", idp->name, idp->base_scope); #endif --- 59,63 ---- #ifdef DEBUG ! debug("define_id", "%s base_scope %d index %d\n", idp->name, idp->base_scope, idp->index); #endif *************** *** 94,98 **** { def_id_t *id = p; ! xfree(id->name); if(id->args) xfree(id->args); --- 94,98 ---- { def_id_t *id = p; ! /* xfree(id->name);*/ if(id->args) xfree(id->args); *************** *** 282,288 **** curr_f->code = *code; curr_f->lineno = lineno; ! array_push(&cob->prog->functions, curr_f); ! /* This removes the need to generate a fun_table. */ ! array_push(&cob->prog->fun_table, idp->name); curr_f = NULL; } --- 282,302 ---- curr_f->code = *code; curr_f->lineno = lineno; ! #if 0 ! if(idp->index == cob->prog->functions.length) { ! #endif ! array_push(&cob->prog->functions, curr_f); ! /* This removes the need to generate a fun_table. */ ! array_push(&cob->prog->fun_table, idp->name); ! #if 0 ! } else { /* index > length */ ! cob->prog->functions.length = idp->index + 1; ! alloc_array(&cob->prog->functions); ! cob->prog->functions.data[idp->index] = curr_f; ! ! cob->prog->fun_table.length = idp->index + 1; ! alloc_array(&cob->prog->fun_table); ! cob->prog->fun_table.data[idp->index] = idp->name; ! } ! #endif curr_f = NULL; } *************** *** 332,336 **** init_var(var); if(type == ID_GVAR) { ! array_push(&cob->prog->variables, var); } else /* LVAR */{ switch(var->type) { --- 346,350 ---- init_var(var); if(type == ID_GVAR) { ! array_push(&cob/*->prog*/->variables, var); } else /* LVAR */{ switch(var->type) { *************** *** 500,504 **** init_array(&cob->prog->functions); init_array(&cob->prog->fun_table); ! init_array(&cob->prog->variables); numlvars = numgvars = 0; --- 514,518 ---- init_array(&cob->prog->functions); init_array(&cob->prog->fun_table); ! init_array(&cob/*->prog*/->variables); numlvars = numgvars = 0; *************** *** 626,629 **** --- 640,644 ---- /*nametable_sort(&cob->prog->nametable);*/ + ref_prog(ob->prog); list_push(&all_objects, ob); |
|
From: Peep P. <so...@us...> - 2004-03-15 18:54:10
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2139 Modified Files: interpret.c Log Message: Cleanup and fixes. Index: interpret.c =================================================================== RCS file: /cvsroot/agd/server/src/interpret.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** interpret.c 12 Mar 2004 13:50:53 -0000 1.9 --- interpret.c 15 Mar 2004 18:44:53 -0000 1.10 *************** *** 18,22 **** #endif - /*variable_t void_ret = {T_VOID, NULL};*/ static int lineno, funcno; --- 18,21 ---- *************** *** 119,128 **** } void push_var(variable_t *v) { if(v) do_assign(sp, v); ! else sp->type = 0; sp++; CHECK_SP() --- 118,130 ---- } + void free_value(variable_t *v); void push_var(variable_t *v) { if(v) do_assign(sp, v); ! else { ! free_value(sp); sp->type = 0; + } sp++; CHECK_SP() *************** *** 147,154 **** } ! #define pop_locals() if(sp - 1 >= fp) \ ! while(sp > fp) { free_value(sp); sp--; } ! void pop_arguments(void) { int i; --- 149,157 ---- } ! /*#define pop_locals() if(sp - 1 >= fp) \ ! while(1) { if(sp == fp) break; free_value(sp); sp--; }*/ ! #define pop_locals() while(sp > fp) { sp--; free_value(sp); } ! /*void pop_arguments(void) { int i; *************** *** 156,169 **** pop_stack(); } ! } void do_assign(variable_t *lval, variable_t *rval) { - /* if(lval->type == T_LVALUE) - lval = lval->u.v;*/ - if(rval->type == T_LVALUE) - rval = rval->u.v; - *lval = *rval; switch(lval->type) { --- 159,167 ---- pop_stack(); } ! }*/ void do_assign(variable_t *lval, variable_t *rval) { *lval = *rval; switch(lval->type) { *************** *** 181,188 **** void do_assign_free(variable_t *lval, variable_t *rval) { ! if(lval->type == T_LVALUE) lval = lval->u.v; if(rval->type == T_LVALUE) ! rval = rval->u.v; free_value(lval); --- 179,186 ---- void do_assign_free(variable_t *lval, variable_t *rval) { ! /* if(lval->type == T_LVALUE) lval = lval->u.v; if(rval->type == T_LVALUE) ! rval = rval->u.v;*/ free_value(lval); *************** *** 327,336 **** case F_PUSH_GVAR: cp++; ! push_var(this_ob->prog->variables.data[*cp]); break; case F_PUSH_GVAR_LVALUE: cp++; sp->type = T_LVALUE; ! sp->u.v = this_ob->prog->variables.data[*cp]; sp++; CHECK_SP() --- 325,334 ---- case F_PUSH_GVAR: cp++; ! push_var(this_ob/*->prog*/->variables.data[*cp]); break; case F_PUSH_GVAR_LVALUE: cp++; sp->type = T_LVALUE; ! sp->u.v = this_ob/*->prog*/->variables.data[*cp]; sp++; CHECK_SP() *************** *** 358,363 **** break; case F_ASSIGN: ! do_assign_free(sp-2, sp-1); ! pop_stack(); break; case F_POSTINC: --- 356,366 ---- break; case F_ASSIGN: ! { ! variable_t tmp; ! do_assign(sp[-2].u.v, sp-1); ! do_assign(&tmp, sp-1); ! pop_stack(); pop_stack(); ! push_var(&tmp); ! } break; case F_POSTINC: *************** *** 485,492 **** name = (char *) *++cp; ++cp; ! ref = sp-1; ! if(ref->type == T_LVALUE) ! ref = ref->u.v; ! ob = ref->u.ob; if(!ob) { runtime("call_other on NULL object"); --- 488,493 ---- name = (char *) *++cp; ++cp; ! sp--; ! ob = sp->u.ob; if(!ob) { runtime("call_other on NULL object"); *************** *** 494,504 **** } - show_stack(); index = get_fun_index(ob, name); push_control_stack(); csp->num_arg = *cp; fp = sp - csp->num_arg; call_function(ob, index); ! eval_instruction(); } break; --- 495,505 ---- } index = get_fun_index(ob, name); + free_value(sp); push_control_stack(); csp->num_arg = *cp; fp = sp - csp->num_arg; call_function(ob, index); ! goto again; } break; *************** *** 507,513 **** variable_t tmp; tmp = sp[-1]; - pop_stack(); - pop_arguments(); - pop_locals(); push_var(&tmp); pop_control_stack(1); --- 508,511 ---- *************** *** 523,530 **** #endif /* We return to the control level where we entered - we have finished. */ ! if(csp == saved_csp /*&control_stack[0]*/ || stop_execution ! || this_ob->flags & O_DESTRUCTED) return; if((int *) ++cp >= (int *) code->data + code->length) { return; } --- 521,539 ---- #endif /* We return to the control level where we entered - we have finished. */ ! if(csp == saved_csp) { /*&control_stack[0]*/ ! debug("interpret", "csp (%d) == saved_csp (%d); returning\n", csp - &control_stack[0], saved_csp - &control_stack[0]); ! return; ! } ! /* Abnormal termination - need to pop unnecessary stuff off the stack. */ ! if(stop_execution || this_ob->flags & O_DESTRUCTED) { ! debug("interpret", "stop_execution(%d) or this_ob destructed (%d); returning\n", stop_execution, this_ob->flags & O_DESTRUCTED); ! /* Should we pop to the bottom? */ ! pop_control_stack(1); ! pop_locals(); return; + } + /* Should only check this with F_JMP. */ if((int *) ++cp >= (int *) code->data + code->length) { + debug("interpret", "Ran over end of array: returning\n"); return; } |
|
From: Peep P. <so...@us...> - 2004-03-15 18:53:19
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1907 Modified Files: dfuns.c Log Message: Cleanup. Index: dfuns.c =================================================================== RCS file: /cvsroot/agd/server/src/dfuns.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dfuns.c 12 Mar 2004 13:50:43 -0000 1.10 --- dfuns.c 15 Mar 2004 18:44:09 -0000 1.11 *************** *** 1,7 **** - /* - Functions dealing with dfuns, and the dfun - hooks (the function that gets called by call_dfun() and - needs to pop the arguments off the stack). - */ #include "std.h" #include "lpc_incl.h" --- 1,2 ---- *************** *** 24,28 **** init_array(&global_ids); ! dfptr = xmalloc(sizeof(void(*)(void*)) * NUM_DF); for(i=0;i<NUM_DF;i++) { dfptr[i] = decl[i].fun; --- 19,23 ---- init_array(&global_ids); ! dfptr = xmalloc(sizeof(void(*)(void)) * NUM_DF); for(i=0;i<NUM_DF;i++) { dfptr[i] = decl[i].fun; *************** *** 42,50 **** define_id(decl[i].name, ID_DFUN, decl[i].ret, args); - /* define_name(type, decl[i].name, decl[i].ret, args, 0); - nametable_add(type, decl[i].name, numofdecl, &global_nametable); - numofdecl++;*/ } - /* nametable_sort(&global_nametable);*/ } --- 37,41 ---- *************** *** 84,89 **** } - /* Hooks begin here. */ - void df_write(void) { int ret; --- 75,78 ---- *************** *** 95,98 **** --- 84,88 ---- void df_input_to(void) { this_player->input_to = fp->u.s; + this_player->input_to_called = 0; pop_stack(); push_void(); *************** *** 150,154 **** variable_t *saved_fp; - show_stack(); saved_fp = fp; fp++; --- 140,143 ---- *************** *** 208,211 **** --- 197,201 ---- } + /* Should be done in the mudlib - much easier in LPC. */ #define WRITE_BUFFER(plur, sing) if(plur) { if(bufptr > buf) bufptr[-1] = ' ';\ bufptr += sprintf(bufptr, "%d "#sing"%c", plur, plur>1?'s':0) + (plur>1); } *************** *** 217,221 **** days = hrs = mins = 0; - fp->u.i += 3670; secs = fp->u.i; if(secs >= 60) { --- 207,210 ---- |
|
From: Peep P. <so...@us...> - 2004-03-15 18:52:40
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1747 Modified Files: compile_options.h Log Message: Fixed a typo. Index: compile_options.h =================================================================== RCS file: /cvsroot/agd/server/src/compile_options.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** compile_options.h 12 Mar 2004 08:40:10 -0000 1.7 --- compile_options.h 15 Mar 2004 18:43:30 -0000 1.8 *************** *** 27,31 **** This determines how many local variables, function arguments and return values we can have at one time. ! Increase this if you get lot of value stack overflow errors. */ #define VALUE_STACK_SIZE 1000 --- 27,31 ---- This determines how many local variables, function arguments and return values we can have at one time. ! Increase this if you get a lot of value stack overflow errors. */ #define VALUE_STACK_SIZE 1000 |
|
From: Peep P. <so...@us...> - 2004-03-15 18:49:29
|
Update of /cvsroot/agd/server/doc/dfuns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1152 Added Files: asctime clone_object destruct exec file_name find_object input_to interactivep load_object platform previous_object query_idle shout tell_object this_object time uptime version write Log Message: Initial import. --- NEW FILE: interactivep --- --- NEW FILE: this_object --- --- NEW FILE: uptime --- int uptime(void) Returns number of seconds since the server started. Convert this to a textual representation with asctime(). --- NEW FILE: previous_object --- --- NEW FILE: query_idle --- int query_idle(object) Returns -1 if object isn't interactive, and idle time of the object's connection otherwise. --- NEW FILE: load_object --- --- NEW FILE: exec --- void exec(object) Set the new object as the player object and removes interactive status from the last object. Should be considered a privileged dfun. --- NEW FILE: tell_object --- --- NEW FILE: destruct --- void destruct(object ob) Marks the object for destruction. It will be removed from memory after all call_outs have finished. --- NEW FILE: write --- --- NEW FILE: platform --- string platform(void) Returns the platform that AGD was compiled on. This will soon be replaced with a preprocessor macro __ARCH__. --- NEW FILE: shout --- --- NEW FILE: version --- string version(void) Returns current version of AGD. This will soon be replaced with a preprocessor macro __VERSION__ --- NEW FILE: time --- --- NEW FILE: input_to --- --- NEW FILE: asctime --- string asctime(int) Converts seconds into a textual representation. For example, asctime(61) becomes "1 minute and 1 second". --- NEW FILE: clone_object --- object clone_object(string|object ob) Clones the object ob and returns the new object. --- NEW FILE: find_object --- --- NEW FILE: file_name --- string file_name(object) Returns the file name of object. |
|
From: Peep P. <so...@us...> - 2004-03-15 18:48:20
|
Update of /cvsroot/agd/server/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv895 Added Files: adding_dfuns applies Log Message: Initial import. --- NEW FILE: adding_dfuns --- Edit the file dfdecl.in. Read the comments at the top and following them, add a declaration of it. Write a dfun hook in dfuns.c. It should be of the form void df_name_of_dfun(void); You use fp[i] for the arguments, (fp[0], fp[1], fp[2] etc). Before pushing the return value, you have to pop_stack() for each argument (fp[i]) used. See the existings dfuns in dfuns.c. --- NEW FILE: applies --- If a player connects, master::connect() will be called. It should return an object. In that object, logon() is called. Usually master::connect() clones the login object, and logon() in the login object does exec() on a player object. |
|
From: <so...@us...> - 2004-03-12 16:39:06
|
Update of /cvsroot/agd/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21873 Modified Files: index.php Log Message: Describing portability. Index: index.php =================================================================== RCS file: /cvsroot/agd/www/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 12 Mar 2004 14:29:36 -0000 1.1.1.1 --- index.php 12 Mar 2004 16:19:29 -0000 1.2 *************** *** 20,23 **** --- 20,30 ---- <p>See NEWS and doc/lpc/operators for a clue about the status. <br>Some basic dfuns are in, most of the LPC operators, network connections, memory management (rough). + <br>Quite portable, with the help of the GNU Build tools. + Compiles and runs on the following systems (this may not be complete): + <br>* Linux (x86, x86-64, Alpha) + <br>* FreeBSD, NetBSD. Haven't got any OpenBSD hosts to test. (x86) + <br>* Solaris (SPARC) + <br>* MacOSX (PowerPC) + <br> <br>No graphics yet. <br>AGD needs all the help it can get - there's documentation to be written, bugs to be found, features to be requested, and most importantly - bugs to be fixed. |
|
From: <so...@us...> - 2004-03-12 16:32:35
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20675/src Modified Files: Makefile.am Makefile.in Log Message: Changed CFLAGS back to -ansi. Index: Makefile.am =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 12 Mar 2004 16:04:03 -0000 1.3 --- Makefile.am 12 Mar 2004 16:12:58 -0000 1.4 *************** *** 1,5 **** ## Process this file with automake to produce Makefile.in ! AM_CFLAGS = -ansi -pedantic ## AM_CPPFLAGS = -I. --- 1,5 ---- ## Process this file with automake to produce Makefile.in ! AM_CFLAGS = -ansi ## AM_CPPFLAGS = -I. Index: Makefile.in =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 12 Mar 2004 16:05:05 -0000 1.4 --- Makefile.in 12 Mar 2004 16:12:58 -0000 1.5 *************** *** 112,116 **** target_alias = @target_alias@ ! AM_CFLAGS = -ansi -pedantic AM_YFLAGS = -dv --- 112,116 ---- target_alias = @target_alias@ ! AM_CFLAGS = -ansi AM_YFLAGS = -dv |
|
From: <so...@us...> - 2004-03-12 16:24:43
|
Update of /cvsroot/agd/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18960 Modified Files: ChangeLog configure Log Message: Routine commit. Index: ChangeLog =================================================================== RCS file: /cvsroot/agd/server/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChangeLog 12 Mar 2004 08:32:10 -0000 1.1 --- ChangeLog 12 Mar 2004 16:05:04 -0000 1.2 *************** *** 2,5 **** --- 2,10 ---- 0.0.2: ---------------------------------------------------------------------------- + 2004-03-12 + * interpreter.c: fixed F_RETURN and F_CALL_OTHER + + * compiles on MacOSX + * compiles on Solaris again (id_t was redefined) 2004-03-10 * fixed small bug on array_remove() Index: configure =================================================================== RCS file: /cvsroot/agd/server/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure 12 Mar 2004 11:51:44 -0000 1.1 --- configure 12 Mar 2004 16:05:04 -0000 1.2 *************** *** 4422,4425 **** --- 4422,4575 ---- done + # This is where u_int32_t is on MacOSX - needs to be included before dirent.h. + + for ac_header in machine/types.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 + echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## --------------------------------- ## + ## Report this to so...@es... ## + ## --------------------------------- ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + + done + # Checks for typedefs, structures, and compiler characteristics. |
|
From: <so...@us...> - 2004-03-12 16:24:43
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18960/src Modified Files: Makefile.in lang.h Log Message: Routine commit. Index: Makefile.in =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 12 Mar 2004 14:43:27 -0000 1.3 --- Makefile.in 12 Mar 2004 16:05:05 -0000 1.4 *************** *** 112,119 **** target_alias = @target_alias@ ! AM_CFLAGS = -ansi AM_YFLAGS = -dv ! EXTRA_DIST = dfparse.h lang.h options.dist dist_pkgdata_DATA = options --- 112,119 ---- target_alias = @target_alias@ ! AM_CFLAGS = -ansi -pedantic AM_YFLAGS = -dv ! EXTRA_DIST = dfparse.h lang.h dist_pkgdata_DATA = options *************** *** 394,400 **** fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook check-am: all-am check: $(BUILT_SOURCES) --- 394,397 ---- *************** *** 503,510 **** lex.c: lang.c - - dist-hook: - rm $(distdir)/options - mv $(distdir)/options.dist $(distdir)/options # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 500,503 ---- Index: lang.h =================================================================== RCS file: /cvsroot/agd/server/src/lang.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang.h 12 Mar 2004 11:51:44 -0000 1.1 --- lang.h 12 Mar 2004 16:05:05 -0000 1.2 *************** *** 115,119 **** array_t arr; expr_t expr; ! id_t *id; } YYSTYPE; /* Line 1240 of yacc.c. */ --- 115,119 ---- array_t arr; expr_t expr; ! def_id_t *id; } YYSTYPE; /* Line 1240 of yacc.c. */ |
|
From: <so...@us...> - 2004-03-12 16:23:43
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18924/src Modified Files: Makefile.am Log Message: Changed CFLAGS to -ansi -pedantic Index: Makefile.am =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 12 Mar 2004 15:00:38 -0000 1.2 --- Makefile.am 12 Mar 2004 16:04:03 -0000 1.3 *************** *** 1,5 **** ## Process this file with automake to produce Makefile.in ! AM_CFLAGS = -ansi ## AM_CPPFLAGS = -I. --- 1,5 ---- ## Process this file with automake to produce Makefile.in ! AM_CFLAGS = -ansi -pedantic ## AM_CPPFLAGS = -I. |
|
From: <so...@us...> - 2004-03-12 16:23:39
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18846/src Modified Files: config.h.in Log Message: Added checks for machine/types.h Index: config.h.in =================================================================== RCS file: /cvsroot/agd/server/src/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.h.in 12 Mar 2004 08:44:53 -0000 1.1 --- config.h.in 12 Mar 2004 16:03:52 -0000 1.2 *************** *** 32,35 **** --- 32,38 ---- #undef HAVE_LIBSOCKET + /* Define to 1 if you have the <machine/types.h> header file. */ + #undef HAVE_MACHINE_TYPES_H + /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ |
|
From: <so...@us...> - 2004-03-12 16:22:47
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18671/src Modified Files: lang.y compile.c compile.h Log Message: Renamed id_t to def_id_t Index: lang.y =================================================================== RCS file: /cvsroot/agd/server/src/lang.y,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang.y 12 Mar 2004 08:44:53 -0000 1.1 --- lang.y 12 Mar 2004 16:03:10 -0000 1.2 *************** *** 11,16 **** extern int scope_level; ! void add_function(id_t *idp, int lineno, array_t *code); ! void redeclaration_error(id_t *id, int new_type); int compare_args(array_t *arg1, array_t *arg2); --- 11,16 ---- extern int scope_level; ! void add_function(def_id_t *idp, int lineno, array_t *code); ! void redeclaration_error(def_id_t *id, int new_type); int compare_args(array_t *arg1, array_t *arg2); *************** *** 29,33 **** array_t arr; expr_t expr; ! id_t *id; } --- 29,33 ---- array_t arr; expr_t expr; ! def_id_t *id; } *************** *** 96,100 **** type L_IDENTIFIER { ! id_t *idp; idp = find_id($2); if(idp && idp->type != ID_FUN_PROT) { --- 96,100 ---- type L_IDENTIFIER { ! def_id_t *idp; idp = find_id($2); if(idp && idp->type != ID_FUN_PROT) { *************** *** 107,111 **** '(' arguments ')' { ! id_t *idp; int i; idp = $<id>3; --- 107,111 ---- '(' arguments ')' { ! def_id_t *idp; int i; idp = $<id>3; *************** *** 115,119 **** for(i=0;i<$5.length;i++) { variable_t *v; ! id_t *id; v = $5.data[i]; id = find_id(v->name); --- 115,119 ---- for(i=0;i<$5.length;i++) { variable_t *v; ! def_id_t *id; v = $5.data[i]; id = find_id(v->name); *************** *** 130,134 **** { if($8.length) { ! id_t *idp = $<id>3; if(idp->lpc_type != $1 || compare_args(idp->args, &$5)) { char buf[256]; --- 130,134 ---- { if($8.length) { ! def_id_t *idp = $<id>3; if(idp->lpc_type != $1 || compare_args(idp->args, &$5)) { char buf[256]; *************** *** 380,384 **** L_IDENTIFIER { ! id_t *id; id = find_id($1); if(id) { --- 380,384 ---- L_IDENTIFIER { ! def_id_t *id; id = find_id($1); if(id) { *************** *** 397,401 **** | L_IDENTIFIER L_ASSIGN expr { ! id_t *id; variable_t *lval; --- 397,401 ---- | L_IDENTIFIER L_ASSIGN expr { ! def_id_t *id; variable_t *lval; Index: compile.c =================================================================== RCS file: /cvsroot/agd/server/src/compile.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** compile.c 12 Mar 2004 13:50:23 -0000 1.10 --- compile.c 12 Mar 2004 16:03:10 -0000 1.11 *************** *** 29,35 **** void define_id(char *name, int type, int lpc_type, array_t *args) { ! id_t *idp; ! idp = type_xmalloc(id_t); ! memset(idp, 0, sizeof(id_t)); idp->name = name; idp->type = type; --- 29,35 ---- void define_id(char *name, int type, int lpc_type, array_t *args) { ! def_id_t *idp; ! idp = type_xmalloc(def_id_t); ! memset(idp, 0, sizeof(def_id_t)); idp->name = name; idp->type = type; *************** *** 69,76 **** /* Binary search! */ ! id_t *find_id(char *name) { int i; ! id_t *idp; /* First search in local_ids. */ --- 69,76 ---- /* Binary search! */ ! def_id_t *find_id(char *name) { int i; ! def_id_t *idp; /* First search in local_ids. */ *************** *** 93,97 **** void free_id(void *p) { ! id_t *id = p; xfree(id->name); if(id->args) --- 93,97 ---- void free_id(void *p) { ! def_id_t *id = p; xfree(id->name); if(id->args) *************** *** 104,108 **** scope_level--; for(i=0;i<local_ids.length;i++) { ! id_t *id = local_ids.data[i]; if((id->type == ID_LVAR || id->type == ID_ARG) && id->base_scope > scope_level) { #ifdef DEBUG --- 104,108 ---- scope_level--; for(i=0;i<local_ids.length;i++) { ! def_id_t *id = local_ids.data[i]; if((id->type == ID_LVAR || id->type == ID_ARG) && id->base_scope > scope_level) { #ifdef DEBUG *************** *** 262,266 **** init_array(&curr_f->code); } ! void add_function(id_t *idp, int lineno, array_t *code) { if(idp->index < cob->prog->functions.length) { --- 262,266 ---- init_array(&curr_f->code); } ! void add_function(def_id_t *idp, int lineno, array_t *code) { if(idp->index < cob->prog->functions.length) { *************** *** 364,368 **** /* Only for locals right now. But watch out! */ if(assign) { ! id_t *id; /* Could use numlocals, since we just defined it. */ id = find_id(var->name); --- 364,368 ---- /* Only for locals right now. But watch out! */ if(assign) { ! def_id_t *id; /* Could use numlocals, since we just defined it. */ id = find_id(var->name); *************** *** 443,447 **** } ! void redeclaration_error(id_t *id, int new_type) { char buf[256]; --- 443,447 ---- } ! void redeclaration_error(def_id_t *id, int new_type) { char buf[256]; *************** *** 526,530 **** int i; for(i=0;i<local_ids.length;i++) { ! id_t *id = local_ids.data[i]; if(id->type == ID_FUN_PROT && id->has_been_called) { char buf[256]; --- 526,530 ---- int i; for(i=0;i<local_ids.length;i++) { ! def_id_t *id = local_ids.data[i]; if(id->type == ID_FUN_PROT && id->has_been_called) { char buf[256]; Index: compile.h =================================================================== RCS file: /cvsroot/agd/server/src/compile.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** compile.h 12 Mar 2004 08:40:10 -0000 1.8 --- compile.h 12 Mar 2004 16:03:10 -0000 1.9 *************** *** 18,25 **** int has_been_called; array_t *args; /* For ID_FUN_PROT and ID_FUN */ ! } id_t; void define_id(char *name, int type, int lpc_type, array_t *args); ! id_t *find_id(char *name); /* lang.y stuff */ --- 18,25 ---- int has_been_called; array_t *args; /* For ID_FUN_PROT and ID_FUN */ ! } def_id_t; void define_id(char *name, int type, int lpc_type, array_t *args); ! def_id_t *find_id(char *name); /* lang.y stuff */ |
|
From: <so...@us...> - 2004-03-12 16:21:45
|
Update of /cvsroot/agd/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18543 Modified Files: configure.ac Log Message: Added checks for machine/types.h Index: configure.ac =================================================================== RCS file: /cvsroot/agd/server/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.ac 12 Mar 2004 08:32:10 -0000 1.1 --- configure.ac 12 Mar 2004 16:02:05 -0000 1.2 *************** *** 30,33 **** --- 30,35 ---- AC_HEADER_DIRENT AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stddef.h sys/socket.h sys/time.h unistd.h]) + # This is where u_int32_t is on MacOSX - needs to be included before dirent.h. + AC_CHECK_HEADERS([machine/types.h]) # Checks for typedefs, structures, and compiler characteristics. |
|
From: <so...@us...> - 2004-03-12 16:21:44
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18543/src Modified Files: sys.c net.h Log Message: Added checks for machine/types.h Index: sys.c =================================================================== RCS file: /cvsroot/agd/server/src/sys.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sys.c 12 Mar 2004 08:40:10 -0000 1.7 --- sys.c 12 Mar 2004 16:02:05 -0000 1.8 *************** *** 9,12 **** --- 9,15 ---- #include "std.h" #include <errno.h> + #ifdef HAVE_MACHINE_TYPES_H + #include <machine/types.h> + #endif #include <dirent.h> #include <math.h> Index: net.h =================================================================== RCS file: /cvsroot/agd/server/src/net.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** net.h 12 Mar 2004 08:40:10 -0000 1.6 --- net.h 12 Mar 2004 16:02:05 -0000 1.7 *************** *** 2,5 **** --- 2,10 ---- #define _NET_H + #include "config.h" + + #ifdef HAVE_MACHINE_TYPES_H + #include <machine/types.h> + #endif #include <dirent.h> #include <fcntl.h> |
|
From: <so...@us...> - 2004-03-12 15:20:12
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2967 Modified Files: Makefile.am Log Message: Removed references to options.dist in Makefile.am Index: Makefile.am =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 12 Mar 2004 11:36:51 -0000 1.1 --- Makefile.am 12 Mar 2004 15:00:38 -0000 1.2 *************** *** 7,11 **** AM_YFLAGS = -dv ##AUTOMAKE_OPTIONS = subdir-objects ! EXTRA_DIST = dfparse.h lang.h options.dist dist_pkgdata_DATA = options --- 7,11 ---- AM_YFLAGS = -dv ##AUTOMAKE_OPTIONS = subdir-objects ! EXTRA_DIST = dfparse.h lang.h dist_pkgdata_DATA = options *************** *** 31,35 **** lex.c: lang.c - dist-hook: - rm $(distdir)/options - mv $(distdir)/options.dist $(distdir)/options --- 31,32 ---- |
|
From: <so...@us...> - 2004-03-12 15:03:04
|
Update of /cvsroot/agd/server/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30960/src Modified Files: Makefile.in Log Message: Removed install-sh again. Index: Makefile.in =================================================================== RCS file: /cvsroot/agd/server/src/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 12 Mar 2004 14:20:40 -0000 1.2 --- Makefile.in 12 Mar 2004 14:43:27 -0000 1.3 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,55 **** # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : --- 13,33 ---- # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,83 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_alias = @host_alias@ ! host_triplet = @host@ ! AMDEPBACKSLASH = @AMDEPBACKSLASH@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ ! CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LEX = @LEX@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ install_sh = @install_sh@ AM_CFLAGS = -ansi --- 36,114 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ ! CPP = @CPP@ ! CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ LEX = @LEX@ + LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ + OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + bindir = @bindir@ + build_alias = @build_alias@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ AM_CFLAGS = -ansi *************** *** 95,194 **** bin_PROGRAMS = agd ! agd_SOURCES = arch.h array.c array.h compile.c compile.h compile_options.h debug.c debug.h dfdecl.h dfuns.c dfuns.h interpret.c interpret.h lex.l lex.h list.c list.h log.c log.h lpc.h lpc_incl.h lang.y main.c net.c net.h std.h sys.c sys.h vars.c vars.h dfdecl.in dfdecl.h object.c object.h agd_LDADD = @LEXLIB@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = config.h ../$@)] ! CONFIG_CLEAN_FILES = ! PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ! DEFS = @DEFS@ -I. -I$(srcdir) -I. -I.. ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! agd_OBJECTS = array.o compile.o debug.o dfuns.o interpret.o lex.o \ ! list.o log.o lang.o main.o net.o sys.o vars.o object.o ! agd_DEPENDENCIES = ! agd_LDFLAGS = ! dfparse_OBJECTS = dfparse.o dflex.o ! dfparse_DEPENDENCIES = sys.o array.o log.o ! dfparse_LDFLAGS = ! LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ! LEXLIB = @LEXLIB@ ! YLWRAP = $(srcdir)/ylwrap ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = ./stamp-h1.in Makefile.am Makefile.in config.h.in dflex.c \ ! dfparse.c lang.c lex.c ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar ! GZIP_ENV = --best ! DEP_FILES = .deps/array.P .deps/compile.P .deps/debug.P .deps/dflex.P \ ! .deps/dfparse.P .deps/dfuns.P .deps/interpret.P .deps/lang.P \ ! .deps/lex.P .deps/list.P .deps/log.P .deps/main.P .deps/net.P \ ! .deps/object.P .deps/sys.P .deps/vars.P SOURCES = $(agd_SOURCES) $(dfparse_SOURCES) - OBJECTS = $(agd_OBJECTS) $(dfparse_OBJECTS) ! all: all-redirect ! .SUFFIXES: ! .SUFFIXES: .S .c .l .o .s .y ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status config.h: stamp-h1 @if test ! -f $@; then \ ! rm -f stamp-h1; \ ! $(MAKE) stamp-h1; \ ! else :; fi ! stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ ! $(SHELL) ./config.status ! @echo timestamp > stamp-h1 2> /dev/null ! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h1.in ! @if test ! -f $@; then \ ! rm -f $(srcdir)/stamp-h1.in; \ ! $(MAKE) $(srcdir)/stamp-h1.in; \ else :; fi - $(srcdir)/stamp-h1.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h1.in 2> /dev/null ! mostlyclean-hdr: ! clean-hdr: distclean-hdr: ! -rm -f config.h ! ! maintainer-clean-hdr: ! ! mostlyclean-binPROGRAMS: ! ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! ! distclean-binPROGRAMS: ! ! maintainer-clean-binPROGRAMS: ! install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done --- 126,219 ---- bin_PROGRAMS = agd ! agd_SOURCES = arch.h array.c array.h compile.c compile.h compile_options.h \ ! debug.c debug.h dfdecl.h dfuns.c dfuns.h interpret.c interpret.h lex.l lex.h \ ! list.c list.h log.c log.h lpc.h lpc_incl.h lang.y main.c net.c net.h std.h \ ! sys.c sys.h vars.c vars.h dfdecl.in dfdecl.h object.c object.h agd_LDADD = @LEXLIB@ + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = ! bin_PROGRAMS = agd$(EXEEXT) ! noinst_PROGRAMS = dfparse$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) + am_agd_OBJECTS = array.$(OBJEXT) compile.$(OBJEXT) debug.$(OBJEXT) \ + dfuns.$(OBJEXT) interpret.$(OBJEXT) lex.$(OBJEXT) \ + list.$(OBJEXT) log.$(OBJEXT) lang.$(OBJEXT) main.$(OBJEXT) \ + net.$(OBJEXT) sys.$(OBJEXT) vars.$(OBJEXT) object.$(OBJEXT) + agd_OBJECTS = $(am_agd_OBJECTS) + agd_DEPENDENCIES = + agd_LDFLAGS = + am_dfparse_OBJECTS = dfparse.$(OBJEXT) dflex.$(OBJEXT) + dfparse_OBJECTS = $(am_dfparse_OBJECTS) + dfparse_DEPENDENCIES = sys.o array.o log.o + dfparse_LDFLAGS = ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I. ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/compile.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/debug.Po ./$(DEPDIR)/dflex.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/dfparse.Po ./$(DEPDIR)/dfuns.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/interpret.Po ./$(DEPDIR)/lang.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/lex.Po ./$(DEPDIR)/list.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/log.Po ./$(DEPDIR)/main.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/net.Po ./$(DEPDIR)/object.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/sys.Po ./$(DEPDIR)/vars.Po ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) ! YLWRAP = $(top_srcdir)/ylwrap ! YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) ! DIST_SOURCES = $(agd_SOURCES) $(dfparse_SOURCES) ! DATA = $(dist_pkgdata_DATA) ! DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.in Makefile.am \ ! config.h.in dflex.c dfparse.c lang.c lex.c SOURCES = $(agd_SOURCES) $(dfparse_SOURCES) ! all: $(BUILT_SOURCES) config.h ! $(MAKE) $(AM_MAKEFLAGS) all-am + .SUFFIXES: + .SUFFIXES: .c .l .o .obj .y + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) config.h: stamp-h1 @if test ! -f $@; then \ ! rm -f stamp-h1; \ ! $(MAKE) stamp-h1; \ else :; fi ! stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ! @rm -f stamp-h1 ! cd $(top_builddir) && $(SHELL) ./config.status src/config.h ! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOHEADER) ! touch $(srcdir)/config.h.in distclean-hdr: ! -rm -f config.h stamp-h1 ! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! ; then \ ! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 196,408 **** uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! ! distclean-noinstPROGRAMS: ! ! maintainer-clean-noinstPROGRAMS: ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! agd: $(agd_OBJECTS) $(agd_DEPENDENCIES) ! @rm -f agd ! $(LINK) $(agd_LDFLAGS) $(agd_OBJECTS) $(agd_LDADD) $(LIBS) - dfparse: $(dfparse_OBJECTS) $(dfparse_DEPENDENCIES) - @rm -f dfparse - $(LINK) $(dfparse_LDFLAGS) $(dfparse_OBJECTS) $(dfparse_LDADD) $(LIBS) .l.c: ! $(SHELL) $(YLWRAP) "$(LEX)" $< $(LEX_OUTPUT_ROOT).c $@ -- $(AM_LFLAGS) $(LFLAGS) .y.c: ! $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(AM_YFLAGS) $(YFLAGS) ! dfparse.h: dfparse.c ! lang.h: lang.c tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = src distdir: $(DISTFILES) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(top_distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook ! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ! -include $(DEP_FILES) ! mostlyclean-depend: ! clean-depend: ! distclean-depend: ! -rm -rf .deps ! maintainer-clean-depend: ! %.o: %.c ! @echo '$(COMPILE) -c $<'; \ ! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: dvi: dvi-am - check-am: all-am - check: check-am - installcheck-am: - installcheck: installcheck-am - all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive ! install-exec-am: install-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! install: install-am ! uninstall-am: uninstall-binPROGRAMS ! uninstall: uninstall-am ! all-am: Makefile $(PROGRAMS) config.h ! all-redirect: all-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* ! maintainer-clean-generic: ! -test -z "dflexclexcdfparsehdfparseclanghlangc$(BUILT_SOURCES)" || rm -f dflexc lexc dfparseh dfparsec langh langc $(BUILT_SOURCES) ! mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ ! mostlyclean-noinstPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS \ ! clean-compile clean-tags clean-depend clean-generic \ ! mostlyclean-am ! clean: clean-am ! distclean-am: distclean-hdr distclean-binPROGRAMS \ ! distclean-noinstPROGRAMS distclean-compile \ ! distclean-tags distclean-depend distclean-generic \ ! clean-am ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ ! maintainer-clean-noinstPROGRAMS \ ! maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." ! maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ ! clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ ! install-exec-am install-exec install-data-am install-data install-am \ ! install uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 221,498 ---- uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! agd$(EXEEXT): $(agd_OBJECTS) $(agd_DEPENDENCIES) ! @rm -f agd$(EXEEXT) ! $(LINK) $(agd_LDFLAGS) $(agd_OBJECTS) $(agd_LDADD) $(LIBS) ! dfparse$(EXEEXT): $(dfparse_OBJECTS) $(dfparse_DEPENDENCIES) ! @rm -f dfparse$(EXEEXT) ! $(LINK) $(dfparse_LDFLAGS) $(dfparse_OBJECTS) $(dfparse_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compile.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dflex.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfparse.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfuns.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lang.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vars.Po@am__quote@ ! .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .l.c: ! $(SHELL) $(YLWRAP) `test -f '$<' || echo '$(srcdir)/'`$< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) ! .y.c: ! $(SHELL) $(YLWRAP) `test -f '$<' || echo '$(srcdir)/'`$< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) ! uninstall-info-am: ! dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) ! install-dist_pkgdataDATA: $(dist_pkgdata_DATA) ! @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) ! @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ ! $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ ! done ! ! uninstall-dist_pkgdataDATA: ! @$(NORMAL_UNINSTALL) ! @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ ! done ! ! ETAGS = etags ! ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ ! dist-hook ! check-am: all-am ! check: $(BUILT_SOURCES) ! $(MAKE) $(AM_MAKEFLAGS) check-am ! all-am: Makefile $(PROGRAMS) $(DATA) config.h ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) ! install: $(BUILT_SOURCES) ! $(MAKE) $(AM_MAKEFLAGS) install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! -rm -f lex.c ! -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ! -rm -f dflex.c ! -rm -f dfparse.c ! -rm -f lang.c ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ ! mostlyclean-am ! ! distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ ! distclean-tags dvi: dvi-am ! dvi-am: ! info: info-am ! info-am: + install-data-am: install-dist_pkgdataDATA ! install-exec-am: install-binPROGRAMS ! install-info: install-info-am ! install-man: ! installcheck-am: ! ! maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am ! mostlyclean-am: mostlyclean-compile mostlyclean-generic ! pdf: pdf-am ! pdf-am: ! ps: ps-am ! ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-dist_pkgdataDATA \ ! uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-noinstPROGRAMS ctags distclean \ ! distclean-compile distclean-generic distclean-hdr \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-binPROGRAMS install-data install-data-am \ ! install-dist_pkgdataDATA install-exec install-exec-am \ ! install-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-binPROGRAMS uninstall-dist_pkgdataDATA \ ! uninstall-info-am *************** *** 417,421 **** rm $(distdir)/options mv $(distdir)/options.dist $(distdir)/options - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 507,510 ---- |
