Commit 9193b9f5 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

jscript: Rename prop_val_t to property_definition_t.

parent c7335204
...@@ -888,7 +888,7 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi ...@@ -888,7 +888,7 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi
static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr)
{ {
prop_val_t *iter; property_definition_t *iter;
unsigned instr; unsigned instr;
BSTR name; BSTR name;
HRESULT hres; HRESULT hres;
...@@ -1999,7 +1999,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) ...@@ -1999,7 +1999,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr)
hres = visit_expression(ctx, ((member_expression_t*)expr)->expression); hres = visit_expression(ctx, ((member_expression_t*)expr)->expression);
break; break;
case EXPR_PROPVAL: { case EXPR_PROPVAL: {
prop_val_t *iter; property_definition_t *iter;
for(iter = ((property_value_expression_t*)expr)->property_list; iter; iter = iter->next) { for(iter = ((property_value_expression_t*)expr)->property_list; iter; iter = iter->next) {
hres = visit_expression(ctx, iter->value); hres = visit_expression(ctx, iter->value);
if(FAILED(hres)) if(FAILED(hres))
......
...@@ -358,16 +358,16 @@ typedef struct { ...@@ -358,16 +358,16 @@ typedef struct {
int length; int length;
} array_literal_expression_t; } array_literal_expression_t;
typedef struct _prop_val_t { typedef struct _property_definition_t {
literal_t *name; literal_t *name;
expression_t *value; expression_t *value;
struct _prop_val_t *next; struct _property_definition_t *next;
} prop_val_t; } property_definition_t;
typedef struct { typedef struct {
expression_t expr; expression_t expr;
prop_val_t *property_list; property_definition_t *property_list;
} property_value_expression_t; } property_value_expression_t;
BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN; BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN;
......
...@@ -41,8 +41,8 @@ static literal_t *new_string_literal(parser_ctx_t*,const WCHAR*); ...@@ -41,8 +41,8 @@ static literal_t *new_string_literal(parser_ctx_t*,const WCHAR*);
static literal_t *new_null_literal(parser_ctx_t*); static literal_t *new_null_literal(parser_ctx_t*);
typedef struct _property_list_t { typedef struct _property_list_t {
prop_val_t *head; property_definition_t *head;
prop_val_t *tail; property_definition_t *tail;
} property_list_t; } property_list_t;
static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*);
...@@ -921,9 +921,9 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) ...@@ -921,9 +921,9 @@ static literal_t *new_null_literal(parser_ctx_t *ctx)
return ret; return ret;
} }
static prop_val_t *new_prop_val(parser_ctx_t *ctx, literal_t *name, expression_t *value) static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, expression_t *value)
{ {
prop_val_t *ret = parser_alloc(ctx, sizeof(prop_val_t)); property_definition_t *ret = parser_alloc(ctx, sizeof(property_definition_t));
ret->name = name; ret->name = name;
ret->value = value; ret->value = value;
...@@ -936,14 +936,14 @@ static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, ex ...@@ -936,14 +936,14 @@ static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, ex
{ {
property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t)); property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t));
ret->head = ret->tail = new_prop_val(ctx, name, value); ret->head = ret->tail = new_property_definition(ctx, name, value);
return ret; return ret;
} }
static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value) static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value)
{ {
list->tail = list->tail->next = new_prop_val(ctx, name, value); list->tail = list->tail->next = new_property_definition(ctx, name, value);
return list; return list;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment