archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Allow some of FutureReservedWords in non-strict mode

Browse Source
This commit is contained in:
Ilmir Usmanov 2014-10-15 17:52:40 +04:00
parent 41b7ca2faa
commit 49d990ad32
2 changed files with 211 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
src/libjsparser/lexer.c
View File

@ -145,6 +145,43 @@ current_token_equals_to_lp (lp_string str)
return false;
}
static token
convert_current_token_to_token (token_type tt)
{
JERRY_ASSERT (token_start);
for (uint8_t i = 0; i < STACK_SIZE (strings); i++)
{
if (current_token_equals_to_lp (STACK_ELEMENT (strings, i)))
{
if (tt == TOK_STRING)
{
// locus must point to the first '"'
return (token)
{
.type = tt,
.loc = current_locus () - 1,
.uid = i
};
}
else
{
return create_token (tt, i);
}
}
}
const lp_string str = (lp_string)
{
.length = (uint8_t) (buffer - token_start),
.str = (ecma_char_t *) token_start
};
STACK_PUSH (strings, str);
return create_token (tt, (idx_t) (STACK_SIZE (strings) - 1));
}
/* If TOKEN represents a keyword, return decoded keyword,
if TOKEN represents a Future Reserved Word, return KW_RESERVED,
otherwise return KW_NONE. */
@ -165,11 +202,11 @@ decode_keyword (void)
}
if (current_token_equals_to ("class"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'class' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("const"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'const' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("continue"))
{
@ -197,15 +234,15 @@ decode_keyword (void)
}
if (current_token_equals_to ("enum"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'enum' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("export"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'export' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("extends"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'extends' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("false"))
{
@ -233,7 +270,14 @@ decode_keyword (void)
}
if (current_token_equals_to ("interface"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'interface' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("in"))
{
@ -241,15 +285,29 @@ decode_keyword (void)
}
if (current_token_equals_to ("import"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'import' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("implements"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'implements' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("let"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'let' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("new"))
{
@ -261,19 +319,47 @@ decode_keyword (void)
}
if (current_token_equals_to ("package"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'package' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("private"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'private' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("protected"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'protected' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("public"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'public' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("return"))
{
@ -281,11 +367,18 @@ decode_keyword (void)
}
if (current_token_equals_to ("static"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'static' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("super"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
PARSE_SORRY ("'super' is reseved keyword and not supported yet", current_locus ());
}
if (current_token_equals_to ("switch"))
{
@ -329,7 +422,14 @@ decode_keyword (void)
}
if (current_token_equals_to ("yield"))
{
return create_token (TOK_KEYWORD, KW_RESERVED);
if (parser_strict_mode ())
{
PARSE_ERROR ("'yield' is reseved keyword and not allowed in strict mode", current_locus ());
}
else
{
return convert_current_token_to_token (TOK_NAME);
}
}
if (current_token_equals_to ("undefined"))
{
@ -338,43 +438,6 @@ decode_keyword (void)
return empty_token;
}
static token
convert_current_token_to_token (token_type tt)
{
JERRY_ASSERT (token_start);
for (uint8_t i = 0; i < STACK_SIZE (strings); i++)
{
if (current_token_equals_to_lp (STACK_ELEMENT (strings, i)))
{
if (tt == TOK_STRING)
{
// locus must point to the first '"'
return (token)
{
.type = tt,
.loc = current_locus () - 1,
.uid = i
};
}
else
{
return create_token (tt, i);
}
}
}
const lp_string str = (lp_string)
{
.length = (uint8_t) (buffer - token_start),
.str = (ecma_char_t *) token_start
};
STACK_PUSH (strings, str);
return create_token (tt, (idx_t) (STACK_SIZE (strings) - 1));
}
static token
convert_seen_num_to_token (ecma_number_t num)
{

188
src/libjsparser/lexer.h
View File

@ -21,118 +21,120 @@
#include "lp-string.h"
/* Keywords. */
typedef uint8_t keyword;
typedef enum
{
/* Not a keyword. */
KW_NONE = 0,
KW_BREAK,
KW_CASE,
KW_CATCH,
KW_CONTINUE,
/* Not a keyword. */
#define KW_NONE 0
/* Future reserved keyword. */
#define KW_RESERVED 1
#define KW_BREAK 2
#define KW_CASE 3
#define KW_CATCH 4
KW_DEBUGGER,
KW_DEFAULT,
KW_DELETE,
KW_DO,
KW_ELSE,
#define KW_CONTINUE 5
#define KW_DEBUGGER 6
#define KW_DEFAULT 7
#define KW_DELETE 8
#define KW_DO 9
KW_FINALLY,
KW_FOR,
KW_FUNCTION,
KW_IF,
KW_IN,
#define KW_ELSE 10
#define KW_FINALLY 11
#define KW_FOR 12
#define KW_FUNCTION 13
#define KW_IF 14
KW_INSTANCEOF,
KW_NEW,
KW_RETURN,
KW_SWITCH,
KW_THIS,
#define KW_IN 15
#define KW_INSTANCEOF 16
#define KW_NEW 17
#define KW_RETURN 18
#define KW_SWITCH 19
KW_THROW,
KW_TRY,
KW_TYPEOF,
KW_VAR,
KW_VOID,
#define KW_THIS 20
#define KW_THROW 21
#define KW_TRY 22
#define KW_TYPEOF 23
#define KW_VAR 24
#define KW_VOID 25
#define KW_WHILE 26
#define KW_WITH 27
KW_WHILE,
KW_WITH,
}
keyword;
/* Type of tokens. */
typedef uint8_t token_type;
typedef enum
{
TOK_EOF = 0, // End of file
TOK_NAME, // Identifier
TOK_KEYWORD, // Keyword
TOK_SMALL_INT,
TOK_NUMBER,
#define TOK_EOF 0 // End of file
#define TOK_NAME 1 // Identifier
#define TOK_KEYWORD 2 // Keyword
#define TOK_SMALL_INT 3
#define TOK_NUMBER 4
TOK_NULL,
TOK_BOOL,
TOK_NEWLINE,
TOK_STRING,
TOK_OPEN_BRACE, // {
#define TOK_NULL 5
#define TOK_BOOL 6
#define TOK_NEWLINE 7
#define TOK_STRING 8
#define TOK_OPEN_BRACE 9 // {
TOK_CLOSE_BRACE, // }
TOK_OPEN_PAREN, // (
TOK_CLOSE_PAREN, //)
TOK_OPEN_SQUARE, // [
TOK_CLOSE_SQUARE, // [
#define TOK_CLOSE_BRACE 10 // }
#define TOK_OPEN_PAREN 11 // (
#define TOK_CLOSE_PAREN 12 //)
#define TOK_OPEN_SQUARE 13 // [
#define TOK_CLOSE_SQUARE 14 // [
TOK_DOT, // .
TOK_SEMICOLON, // ;
TOK_COMMA, // ,
TOK_LESS, // <
TOK_GREATER, // >
#define TOK_DOT 15 // .
#define TOK_SEMICOLON 16 // ;
#define TOK_COMMA 17 // ,
#define TOK_LESS 18 // <
#define TOK_GREATER 19 // >
TOK_LESS_EQ, // <=
TOK_GREATER_EQ, // <=
TOK_DOUBLE_EQ, // ==
TOK_NOT_EQ, // !=
TOK_TRIPLE_EQ, // ===
#define TOK_LESS_EQ 20 // <=
#define TOK_GREATER_EQ 21 // <=
#define TOK_DOUBLE_EQ 22 // ==
#define TOK_NOT_EQ 23 // !=
#define TOK_TRIPLE_EQ 24 // ===
TOK_NOT_DOUBLE_EQ, // !==
TOK_PLUS, // +
TOK_MINUS, // -
TOK_MULT, // *
TOK_MOD, // %
#define TOK_NOT_DOUBLE_EQ 25 // !==
#define TOK_PLUS 26 // +
#define TOK_MINUS 27 // -
#define TOK_MULT 28 // *
#define TOK_MOD 29 // %
TOK_DOUBLE_PLUS, // ++
TOK_DOUBLE_MINUS, // --
TOK_LSHIFT, // <<
TOK_RSHIFT, // >>
TOK_RSHIFT_EX, // >>>
#define TOK_DOUBLE_PLUS 30 // ++
#define TOK_DOUBLE_MINUS 31 // --
#define TOK_LSHIFT 32 // <<
#define TOK_RSHIFT 33 // >>
#define TOK_RSHIFT_EX 34 // >>>
TOK_AND, // &
TOK_OR, // |
TOK_XOR, // ^
TOK_NOT, // !
TOK_COMPL, // ~
#define TOK_AND 35 // &
#define TOK_OR 36 // |
#define TOK_XOR 37 // ^
#define TOK_NOT 38 // !
#define TOK_COMPL 39 // ~
TOK_DOUBLE_AND, // &&
TOK_DOUBLE_OR, // ||
TOK_QUERY, // ?
TOK_COLON, // :
TOK_EQ, // =
#define TOK_DOUBLE_AND 40 // &&
#define TOK_DOUBLE_OR 41 // ||
#define TOK_QUERY 42 // ?
#define TOK_COLON 43 // :
#define TOK_EQ 44 // =
TOK_PLUS_EQ, // +=
TOK_MINUS_EQ, // -=
TOK_MULT_EQ, // *=
TOK_MOD_EQ, // %=
TOK_LSHIFT_EQ, // <<=
#define TOK_PLUS_EQ 45 // +=
#define TOK_MINUS_EQ 46 // -=
#define TOK_MULT_EQ 47 // *=
#define TOK_MOD_EQ 48 // %=
#define TOK_LSHIFT_EQ 49 // <<=
TOK_RSHIFT_EQ, // >>=
TOK_RSHIFT_EX_EQ, // >>>=
TOK_AND_EQ, // &=
TOK_OR_EQ, // |=
TOK_XOR_EQ, // ^=
#define TOK_RSHIFT_EQ 50 // >>=
#define TOK_RSHIFT_EX_EQ 51 // >>>=
#define TOK_AND_EQ 52 // &=
#define TOK_OR_EQ 53 // |=
#define TOK_XOR_EQ 54 // ^=
#define TOK_DIV 55 // /
#define TOK_DIV_EQ 56 // /=
#define TOK_UNDEFINED 57 // undefined
#define TOK_EMPTY 58
TOK_DIV, // /
TOK_DIV_EQ, // /=
TOK_UNDEFINED, // undefined
TOK_EMPTY,
}
token_type;
typedef size_t locus;