fixed a regression bug from the last commit
--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401051
This commit is contained in:
parent
d8d13f1920
commit
9f38f9ae90
@ -2517,11 +2517,11 @@ static int base;
|
|||||||
* Global references: litidx (altered)
|
* Global references: litidx (altered)
|
||||||
*/
|
*/
|
||||||
static void initials2(int ident,int tag,cell *size,int dim[],int numdim,
|
static void initials2(int ident,int tag,cell *size,int dim[],int numdim,
|
||||||
constvalue *enumroot, int eq_match_override)
|
constvalue *enumroot, int eq_match_override, int curlit_override)
|
||||||
{
|
{
|
||||||
int ctag;
|
int ctag;
|
||||||
cell tablesize;
|
cell tablesize;
|
||||||
int curlit=litidx;
|
int curlit=(curlit_override == -1) ? litidx : curlit_override;
|
||||||
int err=0;
|
int err=0;
|
||||||
|
|
||||||
if (eq_match_override == -1) {
|
if (eq_match_override == -1) {
|
||||||
@ -2633,7 +2633,7 @@ static void initials2(int ident,int tag,cell *size,int dim[],int numdim,
|
|||||||
static void initials(int ident,int tag,cell *size,int dim[],int numdim,
|
static void initials(int ident,int tag,cell *size,int dim[],int numdim,
|
||||||
constvalue *enumroot)
|
constvalue *enumroot)
|
||||||
{
|
{
|
||||||
initials2(ident, tag, size, dim, numdim, enumroot, -1);
|
initials2(ident, tag, size, dim, numdim, enumroot, -1, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
|
static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
|
||||||
@ -4417,7 +4417,7 @@ static void doarg(char *name,int ident,int offset,int tags[],int numtags,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
initials2(ident,tags[0],&size,arg->dim,arg->numdim,enumroot, 1);
|
initials2(ident,tags[0],&size,arg->dim,arg->numdim,enumroot, 1, 0);
|
||||||
assert(size>=litidx);
|
assert(size>=litidx);
|
||||||
/* allocate memory to hold the initial values */
|
/* allocate memory to hold the initial values */
|
||||||
arg->defvalue.array.data=(cell *)malloc(litidx*sizeof(cell));
|
arg->defvalue.array.data=(cell *)malloc(litidx*sizeof(cell));
|
||||||
|
Loading…
Reference in New Issue
Block a user