From 508bbcd89cd0a7c51aeb8d72ad584712115d184a Mon Sep 17 00:00:00 2001 From: Francois Donnet Date: Wed, 3 Apr 2002 11:27:09 +0000 Subject: [PATCH] changement du message d'erreur pour ne pas embrouiller l'utilisateur --- alliance/src/boog/src/bog_lib_complete.c | 12 ++++++------ alliance/src/boog/src/bog_lib_reader.c | 2 +- alliance/src/boog/src/bog_lib_specifications.c | 2 +- alliance/src/boog/src/bog_map_adapt.c | 6 +++--- alliance/src/boog/src/bog_map_pattern.c | 6 +++--- alliance/src/boog/src/bog_map_prepare.c | 4 ++-- alliance/src/loon/src/lon_lib_reader.c | 2 +- alliance/src/loon/src/lon_lib_specifications.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/alliance/src/boog/src/bog_lib_complete.c b/alliance/src/boog/src/bog_lib_complete.c index af12caea..89525fa3 100644 --- a/alliance/src/boog/src/bog_lib_complete.c +++ b/alliance/src/boog/src/bog_lib_complete.c @@ -440,33 +440,33 @@ extern void control_lib() "Mapping Warning: 'ZERO' constant cell is missing in library\n"); } if (!not) { - fprintf(stderr,"Mapping Error: 'NOT' cell is missing in library\n"); + fprintf(stderr,"Library Error: 'NOT' cell is missing in library\n"); exit(1); } if (!or) { - fprintf(stderr,"Mapping Error: 'OR' cell is missing in library\n"); + fprintf(stderr,"Library Error: 'OR' cell is missing in library\n"); exit(1); } else if (or->ARITY!=2) { fprintf(stderr, - "Mapping Error: 'OR 2' is missing in library\n"); + "Library Error: 'OR 2' is missing in library\n"); exit(1); } if (!and) { - fprintf(stderr,"Mapping Error: 'AND' cell is missing in library\n"); + fprintf(stderr,"Library Error: 'AND' cell is missing in library\n"); exit(1); } else if (and->ARITY!=2) { fprintf(stderr, - "Mapping Error: 'AND 2' is missing in library\n"); + "Library Error: 'AND 2' is missing in library\n"); exit(1); } if (xor && xor->ARITY!=2) { fprintf(stderr, - "Mapping Error: 'XOR 2' is missing in library\n"); + "Library Error: 'XOR 2' is missing in library\n"); exit(1); } diff --git a/alliance/src/boog/src/bog_lib_reader.c b/alliance/src/boog/src/bog_lib_reader.c index 3d3b941e..90d46d13 100644 --- a/alliance/src/boog/src/bog_lib_reader.c +++ b/alliance/src/boog/src/bog_lib_reader.c @@ -331,7 +331,7 @@ extern void library_reader(char* cell_directory) if (!vbe_list /*list of name*/) { fprintf(stderr, - "Mapping Error: no cell in directory '%s'\n", + "Library Error: no cell in directory '%s'\n", cell_directory?cell_directory:"."); exit(1); } diff --git a/alliance/src/boog/src/bog_lib_specifications.c b/alliance/src/boog/src/bog_lib_specifications.c index 2f9e027e..93193465 100644 --- a/alliance/src/boog/src/bog_lib_specifications.c +++ b/alliance/src/boog/src/bog_lib_specifications.c @@ -138,7 +138,7 @@ static int getgeneric(befig_list* befig, char* name) if (begen->NAME==name) return getvalue(begen); } - fprintf(stderr,"Mapping Error: generic '%s' not found in cell %s\n", + fprintf(stderr,"Library Error: generic '%s' not found in cell %s\n", name,befig->NAME); exit(1); } diff --git a/alliance/src/boog/src/bog_map_adapt.c b/alliance/src/boog/src/bog_map_adapt.c index 0dd35207..c4c78901 100644 --- a/alliance/src/boog/src/bog_map_adapt.c +++ b/alliance/src/boog/src/bog_map_adapt.c @@ -167,7 +167,7 @@ static chain_list* loc_adapt_abl(chain_list* expr, float C) } ABL_ARITY(expr)=arity; /*put back arity*/ if (!cell) { - fprintf(stderr,"Mapping Error: No cell could match '"); + fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); if (ABL_ATOM(expr)) fprintf(stderr,"'\n"); else fprintf(stderr,"' (oper arity=%d)\n",ABL_ARITY(expr)); @@ -228,7 +228,7 @@ extern chain_list* adapt_abl(chain_list* expr) if (ABL_ATOM(expr)) { /*no buffer?!!!*/ - fprintf(stderr,"Mapping Error: No cell could match '"); + fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); fprintf(stderr,"'\n"); exit(1); @@ -244,7 +244,7 @@ extern chain_list* adapt_abl(chain_list* expr) } ABL_ARITY(expr)=arity; /*put back arity*/ if (!cell) { - fprintf(stderr,"Mapping Error: No cell could match '"); + fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); fprintf(stderr,"' (oper arity=%d)\n",ABL_ARITY(expr)); exit(1); diff --git a/alliance/src/boog/src/bog_map_pattern.c b/alliance/src/boog/src/bog_map_pattern.c index f5556890..c4ddf259 100644 --- a/alliance/src/boog/src/bog_map_pattern.c +++ b/alliance/src/boog/src/bog_map_pattern.c @@ -521,7 +521,7 @@ extern cell_list* cell_pattern(chain_list* expr) && (ABL_ATOM_VALUE(expr)==getablatomone() || ABL_ATOM_VALUE(expr)==getablatomzero()) && ABL_ATOM_VALUE(expr)!=ABL_ATOM_VALUE(best_cell->ABL)) ) { - fprintf(stderr,"Mapping Error: No cell could match '"); + fprintf(stderr,"Library Error: No cell could match '"); display_abl(expr); if (ABL_ATOM(expr)) fprintf(stderr,"'\n"); else fprintf(stderr,"' (oper arity=%d)\n",ABL_ARITY(expr)); @@ -663,7 +663,7 @@ extern cell_list* cell_pattern_bus(biabl_list* biabl) if (!best_cell) { - fprintf(stderr,"Mapping Error: No cell could match\n"); + fprintf(stderr,"Library Error: No cell could match\n"); for ( ; biabl; biabl=biabl->NEXT) { fprintf(stderr,"BLOCK( "); display_abl(biabl->CNDABL); @@ -811,7 +811,7 @@ extern cell_list* cell_pattern_reg(biabl_list* biabl) } if (!best_cell) { - fprintf(stderr,"Mapping Error: No cell could match\n"); + fprintf(stderr,"Library Error: No cell could match\n"); for ( ; biabl; biabl=biabl->NEXT) { fprintf(stderr,"BLOCK( "); display_abl(biabl->CNDABL); diff --git a/alliance/src/boog/src/bog_map_prepare.c b/alliance/src/boog/src/bog_map_prepare.c index d0146b77..7fa7c5c7 100644 --- a/alliance/src/boog/src/bog_map_prepare.c +++ b/alliance/src/boog/src/bog_map_prepare.c @@ -167,7 +167,7 @@ extern cell_list* cell_prepare_bus(biabl_list* biabl) } - fprintf(stderr,"Mapping Error: No cell could match\n"); + fprintf(stderr,"Library Error: No cell could match\n"); for ( ; biabl; biabl=biabl->NEXT) { fprintf(stderr,"BLOCK( "); display_abl(biabl->CNDABL); @@ -236,7 +236,7 @@ extern cell_list* cell_prepare_reg(biabl_list* biabl) } - fprintf(stderr,"Mapping Error: No cell could match\n"); + fprintf(stderr,"Library Error: No cell could match\n"); for ( ; biabl; biabl=biabl->NEXT) { fprintf(stderr,"BLOCK( "); display_abl(biabl->CNDABL); diff --git a/alliance/src/loon/src/lon_lib_reader.c b/alliance/src/loon/src/lon_lib_reader.c index e285656f..3b6cdc8b 100644 --- a/alliance/src/loon/src/lon_lib_reader.c +++ b/alliance/src/loon/src/lon_lib_reader.c @@ -113,7 +113,7 @@ extern void library_reader(char* cell_directory) if (!vbe_list /*list of name*/) { fprintf(stderr, - "Mapping Error: no cell in directory '%s'\n", + "Library Error: no cell in directory '%s'\n", cell_directory?cell_directory:"."); exit(1); } diff --git a/alliance/src/loon/src/lon_lib_specifications.c b/alliance/src/loon/src/lon_lib_specifications.c index 88e1bf1d..551a774e 100644 --- a/alliance/src/loon/src/lon_lib_specifications.c +++ b/alliance/src/loon/src/lon_lib_specifications.c @@ -138,7 +138,7 @@ static int getgeneric(befig_list* befig, char* name) if (begen->NAME==name) return getvalue(begen); } - fprintf(stderr,"Mapping Error: generic '%s' not found in cell %s\n", + fprintf(stderr,"Library Error: generic '%s' not found in cell %s\n", name,befig->NAME); exit(1); }