reverted compiler change that didn't work out so well
--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402011
This commit is contained in:
parent
53d11eae63
commit
13e8cf9ed8
@ -2777,21 +2777,16 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
|
|||||||
constvalue *enumroot,int *errorfound)
|
constvalue *enumroot,int *errorfound)
|
||||||
{
|
{
|
||||||
cell dsize,totalsize;
|
cell dsize,totalsize;
|
||||||
int idx,abortparse,needbrace;
|
int idx,abortparse;
|
||||||
|
|
||||||
assert(cur>=0 && cur<numdim);
|
assert(cur>=0 && cur<numdim);
|
||||||
assert(startlit>=0);
|
assert(startlit>=0);
|
||||||
assert(cur+2<=numdim);/* there must be 2 dimensions or more to do */
|
assert(cur+2<=numdim);/* there must be 2 dimensions or more to do */
|
||||||
assert(errorfound!=NULL && *errorfound==FALSE);
|
assert(errorfound!=NULL && *errorfound==FALSE);
|
||||||
totalsize=0;
|
totalsize=0;
|
||||||
needbrace=1;
|
|
||||||
needtoken('{');
|
needtoken('{');
|
||||||
for (idx=0,abortparse=FALSE; !abortparse; idx++) {
|
for (idx=0,abortparse=FALSE; !abortparse; idx++) {
|
||||||
if (matchtoken('}'))
|
|
||||||
{
|
|
||||||
needbrace=0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* In case the major dimension is zero, we need to store the offset
|
/* In case the major dimension is zero, we need to store the offset
|
||||||
* to the newly detected sub-array into the indirection table; i.e.
|
* to the newly detected sub-array into the indirection table; i.e.
|
||||||
* this table needs to be expanded and updated.
|
* this table needs to be expanded and updated.
|
||||||
@ -2821,10 +2816,7 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
|
|||||||
if (*errorfound || !matchtoken(','))
|
if (*errorfound || !matchtoken(','))
|
||||||
abortparse=TRUE;
|
abortparse=TRUE;
|
||||||
} /* for */
|
} /* for */
|
||||||
if (needbrace)
|
|
||||||
{
|
|
||||||
needtoken('}');
|
needtoken('}');
|
||||||
}
|
|
||||||
assert(counteddim!=NULL);
|
assert(counteddim!=NULL);
|
||||||
if (counteddim[cur]>0) {
|
if (counteddim[cur]>0) {
|
||||||
if (idx<counteddim[cur])
|
if (idx<counteddim[cur])
|
||||||
|
Loading…
Reference in New Issue
Block a user