Jacek Caban : jscript: Use HRESULTs instead of IDSs in parser.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5e469f4fff8890552513180178c5ad7d59546376
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5e469f4fff8890552513180178...

Author: Jacek Caban 
Date:   Tue Dec 28 15:05:13 2010 +0100

jscript: Use HRESULTs instead of IDSs in parser.

---

dlls/jscript/lex.c    |    4 ++--
 dlls/jscript/parser.y |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index 2db2d39..bfa3568 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -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;

diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index 340d515..47fcc34 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -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;
 }