Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5e469f4f
Commit
5e469f4f
authored
Dec 28, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 28, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Use HRESULTs instead of IDSs in parser.
parent
7774a0a4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
lex.c
dlls/jscript/lex.c
+2
-2
parser.y
dlls/jscript/parser.y
+6
-6
No files found.
dlls/jscript/lex.c
View file @
5e469f4f
...
...
@@ -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
;
...
...
dlls/jscript/parser.y
View file @
5e469f4f
...
...
@@ -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;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment