Jacek Caban : jscript: Rename prop_val_t to property_definition_t.
Alexandre Julliard
julliard at winehq.org
Mon Dec 3 15:28:52 CST 2018
Module: wine
Branch: master
Commit: 9193b9f52c5c77951ac6dff581a22f2152570260
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9193b9f52c5c77951ac6dff581a22f2152570260
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 30 22:44:07 2018 +0100
jscript: Rename prop_val_t to property_definition_t.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/jscript/compile.c | 4 ++--
dlls/jscript/parser.h | 8 ++++----
dlls/jscript/parser.y | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 3f9db7a..a498abd 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -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)
{
- prop_val_t *iter;
+ property_definition_t *iter;
unsigned instr;
BSTR name;
HRESULT hres;
@@ -1999,7 +1999,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr)
hres = visit_expression(ctx, ((member_expression_t*)expr)->expression);
break;
case EXPR_PROPVAL: {
- prop_val_t *iter;
+ property_definition_t *iter;
for(iter = ((property_value_expression_t*)expr)->property_list; iter; iter = iter->next) {
hres = visit_expression(ctx, iter->value);
if(FAILED(hres))
diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h
index 65297b9..908d6b6 100644
--- a/dlls/jscript/parser.h
+++ b/dlls/jscript/parser.h
@@ -358,16 +358,16 @@ typedef struct {
int length;
} array_literal_expression_t;
-typedef struct _prop_val_t {
+typedef struct _property_definition_t {
literal_t *name;
expression_t *value;
- struct _prop_val_t *next;
-} prop_val_t;
+ struct _property_definition_t *next;
+} property_definition_t;
typedef struct {
expression_t expr;
- prop_val_t *property_list;
+ property_definition_t *property_list;
} property_value_expression_t;
BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index 0bb8856..5979ef0 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -41,8 +41,8 @@ static literal_t *new_string_literal(parser_ctx_t*,const WCHAR*);
static literal_t *new_null_literal(parser_ctx_t*);
typedef struct _property_list_t {
- prop_val_t *head;
- prop_val_t *tail;
+ property_definition_t *head;
+ property_definition_t *tail;
} property_list_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)
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->value = value;
@@ -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));
- ret->head = ret->tail = new_prop_val(ctx, name, value);
+ ret->head = ret->tail = new_property_definition(ctx, name, value);
return ret;
}
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;
}
More information about the wine-cvs
mailing list