}
--level;
}
- else if(*end=='|')
+ else if(*end=='|' && level==0)
{
if(branch)
break;
- else if(level==0)
+ else
has_branches=true;
}
else if(*end=='[')
if(end==str.end())
throw InvalidParameterValue("Unmatched '['");
- uint8_t mask[32]={0};
+ unsigned char mask[32]={0};
unsigned type=0;
bool range=false;
unsigned char first=0, last=0;
}
else if(instr==MATCH_MASK)
{
- uint8_t mask[32];
- for(unsigned k=0; k<32; ++k)
- mask[k]=*j->citer++;
- match_result=mask[c>>3]&(1<<(c&7));
+ if(c>=0 && c<=0xFF)
+ {
+ unsigned char m=*(j->citer+(c>>3));
+ match_result=m&(1<<(c&7));
+ }
input_consumed=true;
+ j->citer+=32;
}
else if(instr==MATCH_ANY)
{