YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new coding style rules and fix appeared issues.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov a.shitov@samsung.com
This commit is contained in:
Andrey Shitov
2015-05-12 19:17:07 +03:00
parent ca12c16607
commit 9763a93df3
89 changed files with 1152 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/collections/array-list.cpp
+1 -2
View File
@@ -22,8 +22,7 @@ typedef struct
uint8_t element_size;
size_t len;
size_t size;
}
array_list_header;
} array_list_header;
static array_list_header *
extract_header (array_list al)
jerry-core/parser/collections/hash-table.cpp
+1 -2
View File
@@ -26,8 +26,7 @@ typedef struct
uint8_t key_size;
uint8_t value_size;
mem_heap_alloc_term_t alloc_term;
}
hash_table_int;
} hash_table_int;
static hash_table_int *
extract_header (hash_table ht)
jerry-core/parser/collections/linked-list.cpp
+1 -2
View File
@@ -23,8 +23,7 @@ typedef struct linked_list_header
{
struct linked_list_header *next;
uint16_t element_size;
}
linked_list_header;
} linked_list_header;
#define ASSERT_LIST(list) \
do { \
jerry-core/parser/collections/lit-id-hash-table.h
+1 -2
View File
@@ -25,8 +25,7 @@ typedef struct
size_t current_bucket_pos;
literal_index_t *raw_buckets;
literal_index_t **buckets;
}
lit_id_hash_table;
} lit_id_hash_table;
lit_id_hash_table *lit_id_hash_table_init (size_t, size_t);
void lit_id_hash_table_free (lit_id_hash_table *);
jerry-core/parser/collections/lp-string.h
+1 -2
View File
@@ -24,8 +24,7 @@ typedef struct
const ecma_char_t *str;
ecma_length_t length;
ecma_string_hash_t hash;
}
lp_string;
} lp_string;
bool lp_string_equal (lp_string, lp_string);
bool lp_string_equal_s (lp_string, const char *);
jerry-core/parser/collections/stack.h
+26 -27
View File
@@ -37,30 +37,30 @@
max_temp_name,
temp_names_global_size
};
STACK(temp_names, uint8_t, uint8_t)
STACK (temp_names, uint8_t, uint8_t)
#define GLOBAL(NAME, VAR) \
STACK_ELEMENT (NAME, VAR)
#define MAX_TEMP_NAME() \
GLOBAL(temp_names, max_temp_name)
GLOBAL (temp_names, max_temp_name)
#define MIN_TEMP_NAME() \
GLOBAL(temp_names, min_temp_name)
GLOBAL (temp_names, min_temp_name)
#define TEMP_NAME() \
GLOBAL(temp_names, temp_name)
GLOBAL (temp_names, temp_name)
void
parser_init (void)
{
STACK_INIT(temp_names)
STACK_INIT (temp_names)
}
void
parser_free (void)
{
STACK_FREE(temp_names)
STACK_FREE (temp_names)
}
*/
#ifndef STACK_H
@@ -124,8 +124,7 @@ static TYPE *convert_##NAME##_to_raw_data (void) { \
{ \
return NULL; \
} \
size_t size = mem_heap_recommend_allocation_size ( \
array_list_len (NAME.data) * sizeof (NAME##_stack_value_type)); \
size_t size = mem_heap_recommend_allocation_size (array_list_len (NAME.data) * sizeof (NAME##_stack_value_type)); \
TYPE *DATA = (TYPE *) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_LONG_TERM); \
if (DATA == NULL) \
{ \
@@ -164,9 +163,9 @@ STACK_HEAD (NAME, 1)
#define STACK_SWAP(NAME) \
do { \
NAME##_stack_value_type temp = STACK_TOP(NAME); \
STACK_SET_HEAD(NAME, 1, STACK_HEAD(NAME, 2)); \
STACK_SET_HEAD(NAME, 2, temp); \
NAME##_stack_value_type temp = STACK_TOP (NAME); \
STACK_SET_HEAD (NAME, 1, STACK_HEAD (NAME, 2)); \
STACK_SET_HEAD (NAME, 2, temp); \
} while (0)
#define STACK_SIZE(NAME) \
@@ -182,10 +181,10 @@ do { set_##NAME##_stack_element ((size_t) I, VALUE); } while (0)
do { DATA = convert_##NAME##_to_raw_data (); } while (0)
#define STACK_INCR_ELEMENT(NAME, I) \
do { STACK_SET_ELEMENT (NAME, I, (NAME##_stack_value_type) (STACK_ELEMENT(NAME, I) + 1)); } while (0)
do { STACK_SET_ELEMENT (NAME, I, (NAME##_stack_value_type) (STACK_ELEMENT (NAME, I) + 1)); } while (0)
#define STACK_DECR_ELEMENT(NAME, I) \
do { STACK_SET_ELEMENT (NAME, I, (NAME##_stack_value_type) (STACK_ELEMENT(NAME, I) - 1)); } while (0)
do { STACK_SET_ELEMENT (NAME, I, (NAME##_stack_value_type) (STACK_ELEMENT (NAME, I) - 1)); } while (0)
#define STACK_ITERATE(NAME, VAL, FROM) \
for (size_t NAME##_i = FROM; \
@@ -203,24 +202,24 @@ do { for (size_t i = FROM; i < array_list_len (NAME.data); i++) { \
} } while (0)
#define STACK(NAME, TYPE) \
DEFINE_STACK_TYPE(NAME, TYPE) \
DEFINE_STACK_TYPE (NAME, TYPE) \
NAME##_stack NAME; \
DEFINE_STACK_ELEMENT(NAME, TYPE) \
DEFINE_SET_STACK_ELEMENT(NAME, TYPE) \
DEFINE_STACK_HEAD(NAME, TYPE) \
DEFINE_CONVERT_TO_RAW_DATA(NAME, TYPE) \
DEFINE_SET_STACK_HEAD(NAME, TYPE) \
DEFINE_STACK_PUSH(NAME, TYPE)
DEFINE_STACK_ELEMENT (NAME, TYPE) \
DEFINE_SET_STACK_ELEMENT (NAME, TYPE) \
DEFINE_STACK_HEAD (NAME, TYPE) \
DEFINE_CONVERT_TO_RAW_DATA (NAME, TYPE) \
DEFINE_SET_STACK_HEAD (NAME, TYPE) \
DEFINE_STACK_PUSH (NAME, TYPE)
#define STATIC_STACK(NAME, TYPE) \
DEFINE_STACK_TYPE(NAME, TYPE) \
DEFINE_STACK_TYPE (NAME, TYPE) \
static NAME##_stack NAME; \
DEFINE_STACK_ELEMENT(NAME, TYPE) \
DEFINE_SET_STACK_ELEMENT(NAME, TYPE) \
DEFINE_STACK_HEAD(NAME, TYPE) \
DEFINE_CONVERT_TO_RAW_DATA(NAME, TYPE) \
DEFINE_SET_STACK_HEAD(NAME, TYPE) \
DEFINE_STACK_PUSH(NAME, TYPE)
DEFINE_STACK_ELEMENT (NAME, TYPE) \
DEFINE_SET_STACK_ELEMENT (NAME, TYPE) \
DEFINE_STACK_HEAD (NAME, TYPE) \
DEFINE_CONVERT_TO_RAW_DATA (NAME, TYPE) \
DEFINE_SET_STACK_HEAD (NAME, TYPE) \
DEFINE_STACK_PUSH (NAME, TYPE)
#ifndef JERRY_NDEBUG
#define STACK_DECLARE_USAGE(NAME) \
jerry-core/parser/js/lexer.h
+3 -6
View File
@@ -76,8 +76,7 @@ typedef enum __attr_packed___
KW_WHILE,
KW_WITH,
KW_YIELD
}
keyword;
} keyword;
/* Type of tokens. */
@@ -152,8 +151,7 @@ typedef enum __attr_packed___
TOK_DIV, // /
TOK_DIV_EQ, // /=
TOK_EMPTY,
}
token_type;
} token_type;
typedef size_t locus;
@@ -163,8 +161,7 @@ typedef struct
locus loc;
token_type type;
literal_index_t uid;
}
token;
} token;
void lexer_init (const char *, size_t, bool);
void lexer_free (void);
jerry-core/parser/js/literal.h
+3 -6
View File
@@ -25,8 +25,7 @@ typedef enum __attr_packed___
LIT_STR,
LIT_MAGIC_STR,
LIT_NUMBER
}
literal_type;
} literal_type;
typedef struct
{
@@ -36,11 +35,9 @@ typedef struct
ecma_number_t num;
lp_string lp;
void *none;
}
data;
} data;
literal_type type;
}
literal;
} literal;
#define LITERAL_TO_REWRITE (INVALID_VALUE - 1)
jerry-core/parser/js/opcodes-dumper.cpp
+2 -2
View File
@@ -2173,7 +2173,7 @@ rewrite_breaks (void)
break_op_meta.op.data.jmp_down.opcode_2 = id2;
serializer_rewrite_op_meta (break_oc, break_op_meta);
}
STACK_ITERATE_END();
STACK_ITERATE_END ();
STACK_DROP (break_targets, 1);
STACK_DROP (breaks, STACK_SIZE (breaks) - STACK_TOP (U8));
@@ -2195,7 +2195,7 @@ rewrite_continues (void)
continue_op_meta.op.data.jmp_down.opcode_2 = id2;
serializer_rewrite_op_meta (continue_oc, continue_op_meta);
}
STACK_ITERATE_END();
STACK_ITERATE_END ();
STACK_DROP (continue_targets, 1);
STACK_DROP (continues, STACK_SIZE (continues) - STACK_TOP (U8));
jerry-core/parser/js/opcodes-dumper.h
+4 -8
View File
@@ -24,8 +24,7 @@ typedef enum __attr_packed___
{
OPERAND_LITERAL,
OPERAND_TMP
}
operand_type;
} operand_type;
typedef struct
{
@@ -34,10 +33,8 @@ typedef struct
{
idx_t uid;
literal_index_t lit_id;
}
data;
}
operand;
} data;
} operand;
typedef enum __attr_packed___
{
@@ -47,8 +44,7 @@ typedef enum __attr_packed___
VARG_OBJ_DECL,
VARG_CONSTRUCT_EXPR,
VARG_CALL_EXPR
}
varg_list_type;
} varg_list_type;
operand empty_operand (void);
operand literal_operand (literal_index_t);
jerry-core/parser/js/parser.cpp
+2 -2
View File
@@ -86,7 +86,7 @@ static void
must_be_inside_but_not_in (uint8_t not_in, uint8_t insides_count, ...)
{
va_list insides_list;
if (STACK_SIZE(nestings) == 0)
if (STACK_SIZE (nestings) == 0)
{
EMIT_ERROR ("Shall be inside a nesting");
}
@@ -111,7 +111,7 @@ must_be_inside_but_not_in (uint8_t not_in, uint8_t insides_count, ...)
}
if (STACK_ELEMENT (nestings, i - 1) == not_in)
{
EMIT_ERROR_VARG ("Shall not be inside a '%s' nesting", NESTING_TO_STRING(not_in));
EMIT_ERROR_VARG ("Shall not be inside a '%s' nesting", NESTING_TO_STRING (not_in));
}
}
EMIT_ERROR ("Shall be inside a nesting");
jerry-core/parser/js/scopes-tree.h
+3 -6
View File
@@ -29,16 +29,14 @@ typedef struct
{
literal_index_t lit_id[3];
opcode_t op;
}
op_meta;
} op_meta;
typedef struct tree_header
{
struct tree_header *parent;
linked_list children;
uint8_t children_num;
}
tree_header;
} tree_header;
typedef struct
{
@@ -46,8 +44,7 @@ typedef struct
linked_list opcodes;
opcode_counter_t opcodes_num;
unsigned strict_mode:1;
}
scopes_tree_int;
} scopes_tree_int;
typedef scopes_tree_int * scopes_tree;
jerry-core/parser/js/serializer.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ serializer_print_opcodes (void)
opm.op = bytecode_data.opcodes[loc];
for (int i = 0; i < 3; i++)
{
opm.lit_id [i] = NOT_A_LITERAL;
opm.lit_id[i] = NOT_A_LITERAL;
}
pp_op_meta (loc, opm, false);
jerry-core/parser/js/syntax-errors.cpp
+1 -2
View File
@@ -24,8 +24,7 @@ typedef struct
{
prop_type type;
literal lit;
}
prop_literal;
} prop_literal;
enum
{
jerry-core/parser/js/syntax-errors.h
+1 -2
View File
@@ -85,8 +85,7 @@ typedef enum __attr_packed___
PROP_SET,
PROP_GET,
VARG
}
prop_type;
} prop_type;
void syntax_init (void);
void syntax_free (void);