system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 02:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

jscript: Use HRESULTs instead of IDSs in parser.

Browse source
This commit is contained in:
Jacek Caban 2010-12-28 15:05:13 +01:00 committed by Alexandre Julliard
parent 7774a0a4c1
commit 5e469f4fff
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/jscript/lex.c
View file

@ -99,7 +99,7 @@ static const struct {
static int lex_error(parser_ctx_t *ctx, HRESULT hres)
{
ctx->hres = MAKE_JSERROR(hres);
ctx->hres = hres;
ctx->lexer_error = TRUE;
return -1;
}
@ -346,7 +346,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret, WCHAR endc
}
if(ctx->ptr == ctx->end)
return lex_error(ctx, IDS_UNTERMINATED_STR);
return lex_error(ctx, JS_E_UNTERMINATED_STRING);
len = ctx->ptr-ptr;

12
dlls/jscript/parser.y
View file

@ -496,7 +496,7 @@ Expression_opt
Expression_err
: Expression { $$ = $1; }
| error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; }
| error { set_error(ctx, JS_E_SYNTAX); YYABORT; }
/* ECMA-262 3rd Edition 11.14 */
Expression
@ -818,15 +818,15 @@ semicolon_opt
left_bracket
: '('
| error { set_error(ctx, IDS_LBRACKET); YYABORT; }
| error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; }
right_bracket
: ')'
| error { set_error(ctx, IDS_RBRACKET); YYABORT; }
| error { set_error(ctx, JS_E_MISSING_RBRACKET); YYABORT; }
semicolon
: ';'
| error { set_error(ctx, IDS_SEMICOLON); YYABORT; }
| error { set_error(ctx, JS_E_MISSING_SEMICOLON); YYABORT; }
%%
@ -1459,14 +1459,14 @@ static int parser_error(const char *str)
static void set_error(parser_ctx_t *ctx, UINT error)
{
ctx->hres = MAKE_JSERROR(error);
ctx->hres = error;
}
static BOOL explicit_error(parser_ctx_t *ctx, void *obj, WCHAR next)
{
if(obj || *(ctx->ptr-1)==next) return TRUE;
set_error(ctx, IDS_SYNTAX_ERROR);
set_error(ctx, JS_E_SYNTAX);
return FALSE;
}