From 2288ef3edf8730a1ff1b6933a03c756551ad14c7 Mon Sep 17 00:00:00 2001 From: ALEXks Date: Sun, 5 Nov 2023 10:25:29 +0300 Subject: [PATCH] fixed --- dvm/fdvm/trunk/fdvm/dvm.cpp | 16 ++++++++++++++++ sapfor/experts/Sapfor_2017/_src/Utils/errors.h | 2 +- sapfor/experts/Sapfor_2017/_src/Utils/version.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dvm/fdvm/trunk/fdvm/dvm.cpp b/dvm/fdvm/trunk/fdvm/dvm.cpp index f2fe069..2ed78be 100644 --- a/dvm/fdvm/trunk/fdvm/dvm.cpp +++ b/dvm/fdvm/trunk/fdvm/dvm.cpp @@ -6263,6 +6263,14 @@ SgExpression *doShapeList(SgSymbol *ar, SgStatement *st) /* RTS2 */ l_bound = &(c1.copy()); } else { + if(sbe->ubound() && sbe->ubound()->variant() == STAR_RANGE) { + if(st->variant()==DVM_PARALLEL_ON_DIR ) + Error("Assumed-size array in parallel loop: %s",ar->identifier(), 162,st); + else if( st->variant()==ACC_REGION_DIR) + Error("Assumed-size array in region: %s",ar->identifier(), 162,st); + else + Error("Assumed-size array: %s",ar->identifier(), 162,st); + } u_bound = UBOUNDFunction(ar,i+1); l_bound = LBOUNDFunction(ar,i+1); } @@ -6274,6 +6282,14 @@ SgExpression *doShapeList(SgSymbol *ar, SgStatement *st) /* RTS2 */ l_bound = &(c1.copy()); } else { + if(pe->variant() == STAR_RANGE) { + if(st->variant()==DVM_PARALLEL_ON_DIR ) + Error("Assumed-size array in parallel loop: %s",ar->identifier(), 162,st); + else if( st->variant()==ACC_REGION_DIR) + Error("Assumed-size array in region: %s",ar->identifier(), 162,st); + else + Error("Assumed-size array: %s",ar->identifier(), 162,st); + } u_bound = UBOUNDFunction(ar,i+1); l_bound = LBOUNDFunction(ar,i+1); } diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h b/sapfor/experts/Sapfor_2017/_src/Utils/errors.h index 85662ac..dbc94b2 100644 --- a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h +++ b/sapfor/experts/Sapfor_2017/_src/Utils/errors.h @@ -532,7 +532,7 @@ static const wchar_t *R197 = L"R197:"; //2024 static const wchar_t *R198 = L"R198:%d"; //2025 -static const wchar_t *R203 = L"R203:%s%s"; +static const wchar_t *R203 = L"R203:%s#%s"; //3001 static const wchar_t *R108 = L"R108:%s"; diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h index 7a63d6f..1861ff9 100644 --- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h +++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h @@ -1,3 +1,3 @@ #pragma once -#define VERSION_SPF "2230" +#define VERSION_SPF "2231"