ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Added "Expected ';'" error.

This commit is contained in:
Piotr Caban 2009-07-24 09:36:20 +02:00 committed by Alexandre Julliard
parent c6412d98d9
commit 67c8a3e919
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/jscript/jscript_En.rc
View File

@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE
IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_NO_PROPERTY "Object doesn't support this property or method"
IDS_ARG_NOT_OPT "Argument not optional" IDS_ARG_NOT_OPT "Argument not optional"
IDS_SYNTAX_ERROR "Syntax error" IDS_SYNTAX_ERROR "Syntax error"
IDS_SEMICOLON "Expected ';'"
IDS_LBRACKET "Expected '('" IDS_LBRACKET "Expected '('"
IDS_RBRACKET "Expected ')'" IDS_RBRACKET "Expected ')'"
IDS_NOT_FUNC "Function expected" IDS_NOT_FUNC "Function expected"

30
dlls/jscript/parser.y
View File

@ -26,6 +26,7 @@
static int parser_error(const char*); static int parser_error(const char*);
static void set_error(parser_ctx_t*,UINT); static void set_error(parser_ctx_t*,UINT);
static BOOL explicit_error(parser_ctx_t*,void*,WCHAR);
static BOOL allow_auto_semicolon(parser_ctx_t*); static BOOL allow_auto_semicolon(parser_ctx_t*);
static void program_parsed(parser_ctx_t*,source_elements_t*); static void program_parsed(parser_ctx_t*,source_elements_t*);
static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*);
@ -391,10 +392,18 @@ IterationStatement
{ $$ = new_while_statement(ctx, TRUE, $5, $2); } { $$ = new_while_statement(ctx, TRUE, $5, $2); }
| kWHILE left_bracket Expression right_bracket Statement | kWHILE left_bracket Expression right_bracket Statement
{ $$ = new_while_statement(ctx, FALSE, $3, $5); } { $$ = new_while_statement(ctx, FALSE, $3, $5); }
| kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt right_bracket Statement | kFOR left_bracket ExpressionNoIn_opt
{ $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } { if(!explicit_error(ctx, $3, ';')) YYABORT; }
| kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt right_bracket Statement semicolon Expression_opt
{ $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } { if(!explicit_error(ctx, $6, ';')) YYABORT; }
semicolon Expression_opt right_bracket Statement
{ $$ = new_for_statement(ctx, NULL, $3, $6, $9, $11); }
| kFOR left_bracket kVAR VariableDeclarationListNoIn
{ if(!explicit_error(ctx, $4, ';')) YYABORT; }
semicolon Expression_opt
{ if(!explicit_error(ctx, $7, ';')) YYABORT; }
semicolon Expression_opt right_bracket Statement
{ $$ = new_for_statement(ctx, $4, NULL, $7, $10, $12); }
| kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement
{ $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); }
| kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement
@ -494,7 +503,6 @@ Expression
ExpressionNoIn_opt ExpressionNoIn_opt
: /* empty */ { $$ = NULL; } : /* empty */ { $$ = NULL; }
| ExpressionNoIn { $$ = $1; } | ExpressionNoIn { $$ = $1; }
| error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; }
/* ECMA-262 3rd Edition 11.14 */ /* ECMA-262 3rd Edition 11.14 */
ExpressionNoIn ExpressionNoIn
@ -806,6 +814,10 @@ right_bracket
: ')' : ')'
| error { set_error(ctx, IDS_RBRACKET); YYABORT; } | error { set_error(ctx, IDS_RBRACKET); YYABORT; }
semicolon
: ';'
| error { set_error(ctx, IDS_SEMICOLON); YYABORT; }
%% %%
static BOOL allow_auto_semicolon(parser_ctx_t *ctx) static BOOL allow_auto_semicolon(parser_ctx_t *ctx)
@ -1449,6 +1461,14 @@ static void set_error(parser_ctx_t *ctx, UINT error)
ctx->hres = JSCRIPT_ERROR|error; ctx->hres = JSCRIPT_ERROR|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);
return FALSE;
}
static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier) static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier)
{ {

1
dlls/jscript/resource.h
View File

@ -23,6 +23,7 @@
#define IDS_NO_PROPERTY 0x01B6 #define IDS_NO_PROPERTY 0x01B6
#define IDS_ARG_NOT_OPT 0x01c1 #define IDS_ARG_NOT_OPT 0x01c1
#define IDS_SYNTAX_ERROR 0x03EA #define IDS_SYNTAX_ERROR 0x03EA
#define IDS_SEMICOLON 0x03EC
#define IDS_LBRACKET 0x03ED #define IDS_LBRACKET 0x03ED
#define IDS_RBRACKET 0x03EE #define IDS_RBRACKET 0x03EE
#define IDS_NOT_FUNC 0x138A #define IDS_NOT_FUNC 0x138A

2
dlls/jscript/tests/api.js
View File

@ -1329,5 +1329,7 @@ exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282);
exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282);
exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282);
exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); exception_test(function() {test = function() {}}, "ReferenceError", -2146823280);
exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284);
exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284);
reportSuccess(); reportSuccess();