From 60e19868d71a7dc7681ebeb8e519ba65e6bdc919 Mon Sep 17 00:00:00 2001 From: jb Date: Wed, 10 Apr 2013 21:36:58 +0000 Subject: Replace enum gfc_try with bool type. 2013-04-11 Janne Blomqvist * gfortran.h: Remove enum gfc_try, replace gfc_try with bool type. * arith.c: Replace gfc_try with bool type. * array.c: Likewise. * check.c: Likewise. * class.c: Likewise. * cpp.c: Likewise. * cpp.h: Likewise. * data.c: Likewise. * data.h: Likewise. * decl.c: Likewise. * error.c: Likewise. * expr.c: Likewise. * f95-lang.c: Likewise. * interface.c: Likewise. * intrinsic.c: Likewise. * intrinsic.h: Likewise. * io.c: Likewise. * match.c: Likewise. * match.h: Likewise. * module.c: Likewise. * openmp.c: Likewise. * parse.c: Likewise. * parse.h: Likewise. * primary.c: Likewise. * resolve.c: Likewise. * scanner.c: Likewise. * simplify.c: Likewise. * symbol.c: Likewise. * trans-intrinsic.c: Likewise. * trans-openmp.c: Likewise. * trans-stmt.c: Likewise. * trans-types.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197682 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/openmp.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'gcc/fortran/openmp.c') diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 05de49bd79b..865f8365cfc 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -316,9 +316,8 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask) && ! sym->attr.intrinsic && ! sym->attr.use_assoc && ((sym->attr.flavor == FL_UNKNOWN - && gfc_add_flavor (&sym->attr, FL_PROCEDURE, - sym->name, NULL) == FAILURE) - || gfc_add_intrinsic (&sym->attr, NULL) == FAILURE)) + && !gfc_add_flavor (&sym->attr, FL_PROCEDURE, sym->name, NULL)) + || !gfc_add_intrinsic (&sym->attr, NULL))) { gfc_free_omp_clauses (c); return MATCH_ERROR; @@ -573,8 +572,7 @@ gfc_match_omp_threadprivate (void) if (sym->attr.in_common) gfc_error_now ("Threadprivate variable at %C is an element of " "a COMMON block"); - else if (gfc_add_threadprivate (&sym->attr, sym->name, - &sym->declared_at) == FAILURE) + else if (!gfc_add_threadprivate (&sym->attr, sym->name, &sym->declared_at)) goto cleanup; goto next_item; case MATCH_NO: @@ -597,8 +595,7 @@ gfc_match_omp_threadprivate (void) } st->n.common->threadprivate = 1; for (sym = st->n.common->head; sym; sym = sym->common_next) - if (gfc_add_threadprivate (&sym->attr, sym->name, - &sym->declared_at) == FAILURE) + if (!gfc_add_threadprivate (&sym->attr, sym->name, &sym->declared_at)) goto cleanup; next_item: @@ -814,7 +811,7 @@ resolve_omp_clauses (gfc_code *code) if (omp_clauses->if_expr) { gfc_expr *expr = omp_clauses->if_expr; - if (gfc_resolve_expr (expr) == FAILURE + if (!gfc_resolve_expr (expr) || expr->ts.type != BT_LOGICAL || expr->rank != 0) gfc_error ("IF clause at %L requires a scalar LOGICAL expression", &expr->where); @@ -822,7 +819,7 @@ resolve_omp_clauses (gfc_code *code) if (omp_clauses->final_expr) { gfc_expr *expr = omp_clauses->final_expr; - if (gfc_resolve_expr (expr) == FAILURE + if (!gfc_resolve_expr (expr) || expr->ts.type != BT_LOGICAL || expr->rank != 0) gfc_error ("FINAL clause at %L requires a scalar LOGICAL expression", &expr->where); @@ -830,7 +827,7 @@ resolve_omp_clauses (gfc_code *code) if (omp_clauses->num_threads) { gfc_expr *expr = omp_clauses->num_threads; - if (gfc_resolve_expr (expr) == FAILURE + if (!gfc_resolve_expr (expr) || expr->ts.type != BT_INTEGER || expr->rank != 0) gfc_error ("NUM_THREADS clause at %L requires a scalar " "INTEGER expression", &expr->where); @@ -838,7 +835,7 @@ resolve_omp_clauses (gfc_code *code) if (omp_clauses->chunk_size) { gfc_expr *expr = omp_clauses->chunk_size; - if (gfc_resolve_expr (expr) == FAILURE + if (!gfc_resolve_expr (expr) || expr->ts.type != BT_INTEGER || expr->rank != 0) gfc_error ("SCHEDULE clause's chunk_size at %L requires " "a scalar INTEGER expression", &expr->where); -- cgit v1.2.3