int type;
const char *pat;
int plen;
- int (*parse)(const char *buf, struct jp_opcode *op);
+ int (*parse)(const char *buf, struct jp_opcode *op, struct jp_state *s);
};
#define dec(o) \
*/
static int
-parse_string(const char *buf, struct jp_opcode *op)
+parse_string(const char *buf, struct jp_opcode *op, struct jp_state *s)
{
char q = *(buf++);
char str[128] = { 0 };
hex(in[2]) * 16 * 16 +
hex(in[3]) * 16 +
hex(in[4])))
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
in += 5;
}
else
{
+ s->error_pos = s->off + (in - buf);
return -2;
}
}
if (isxdigit(in[1]) && isxdigit(in[2]))
{
if (!utf8enc(&out, &rem, hex(in[1]) * 16 + hex(in[2])))
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
in += 3;
}
else
{
+ s->error_pos = s->off + (in - buf);
return -2;
}
}
dec(in[2]);
if (code > 255)
+ {
+ s->error_pos = s->off + (in - buf);
return -2;
+ }
if (!utf8enc(&out, &rem, code))
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
in += 3;
}
else if (in[1] >= '0' && in[1] <= '7')
{
if (!utf8enc(&out, &rem, dec(in[0]) * 8 + dec(in[1])))
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
in += 2;
}
else
{
if (!utf8enc(&out, &rem, dec(in[0])))
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
in += 1;
}
else
{
if (rem-- < 1)
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
switch (in[0])
{
else
{
if (rem-- < 1)
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
*out++ = *in++;
}
*/
static int
-parse_label(const char *buf, struct jp_opcode *op)
+parse_label(const char *buf, struct jp_opcode *op, struct jp_state *s)
{
char str[128] = { 0 };
char *out = str;
while (*in == '_' || isalnum(*in))
{
if (rem-- < 1)
+ {
+ s->error_pos = s->off + (in - buf);
return -3;
+ }
*out++ = *in++;
}
*/
static int
-parse_number(const char *buf, struct jp_opcode *op)
+parse_number(const char *buf, struct jp_opcode *op, struct jp_state *s)
{
char *e;
int n = strtol(buf, &e, 10);
if (e == buf)
+ {
+ s->error_pos = s->off;
return -2;
+ }
op->num = n;
static int
-match_token(const char *ptr, struct jp_opcode *op)
+match_token(const char *ptr, struct jp_opcode *op, struct jp_state *s)
{
int i;
const struct token *tok;
op->type = tok->type;
if (tok->parse)
- return tok->parse(ptr, op);
+ return tok->parse(ptr, op, s);
return tok->plen;
}
}
- return -1;
+ s->error_pos = s->off;
+ return -4;
}
struct jp_opcode *
{
struct jp_opcode op = { 0 };
- *mlen = match_token(input, &op);
+ *mlen = match_token(input, &op, s);
- if (*mlen < 0 || op.type == 0)
+ if (*mlen < 0)
+ {
+ s->error_code = *mlen;
return NULL;
+ }
+ else if (op.type == 0)
+ {
+ return NULL;
+ }
return jp_alloc_op(s, op.type, op.num, op.str, NULL);
}