Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tayshawnna Jackson
wine
Commits
79dc3bc7
Commit
79dc3bc7
authored
10 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
jscript: Added new ccval_t type for CC variable values.
parent
166c97d5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/jscript/lex.c
+13
-30
13 additions, 30 deletions
dlls/jscript/lex.c
dlls/jscript/parser.h
+24
-0
24 additions, 0 deletions
dlls/jscript/parser.h
with
37 additions
and
30 deletions
dlls/jscript/lex.c
+
13
−
30
View file @
79dc3bc7
...
...
@@ -789,11 +789,7 @@ static int next_token(parser_ctx_t *ctx, void *lval)
}
struct
_cc_var_t
{
BOOL
is_num
;
union
{
BOOL
b
;
DOUBLE
n
;
}
u
;
ccval_t
val
;
struct
_cc_var_t
*
next
;
unsigned
name_len
;
WCHAR
name
[
0
];
...
...
@@ -811,18 +807,18 @@ void release_cc(cc_ctx_t *cc)
heap_free
(
cc
);
}
static
BOOL
add
_cc_var
(
cc_ctx_t
*
cc
,
const
WCHAR
*
name
,
cc
_
va
r
_t
*
v
)
static
BOOL
new
_cc_var
(
cc_ctx_t
*
cc
,
const
WCHAR
*
name
,
int
len
,
ccva
l
_t
v
)
{
cc_var_t
*
new_v
;
unsigned
len
;
len
=
strlenW
(
name
);
if
(
len
==
-
1
)
len
=
strlenW
(
name
);
new_v
=
heap_alloc
(
sizeof
(
cc_var_t
)
+
(
len
+
1
)
*
sizeof
(
WCHAR
));
if
(
!
new_v
)
return
FALSE
;
memcpy
(
new_v
,
v
,
sizeof
(
*
v
))
;
new_v
->
val
=
v
;
memcpy
(
new_v
->
name
,
name
,
(
len
+
1
)
*
sizeof
(
WCHAR
));
new_v
->
name_len
=
len
;
new_v
->
next
=
cc
->
vars
;
...
...
@@ -845,7 +841,6 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len)
static
int
init_cc
(
parser_ctx_t
*
ctx
)
{
cc_ctx_t
*
cc
;
cc_var_t
v
;
static
const
WCHAR
_win32W
[]
=
{
'_'
,
'w'
,
'i'
,
'n'
,
'3'
,
'2'
,
0
};
static
const
WCHAR
_win64W
[]
=
{
'_'
,
'w'
,
'i'
,
'n'
,
'6'
,
'4'
,
0
};
...
...
@@ -863,24 +858,12 @@ static int init_cc(parser_ctx_t *ctx)
return
lex_error
(
ctx
,
E_OUTOFMEMORY
);
cc
->
vars
=
NULL
;
v
.
is_num
=
FALSE
;
v
.
u
.
b
=
TRUE
;
if
(
!
add_cc_var
(
cc
,
_jscriptW
,
&
v
)
||
!
add_cc_var
(
cc
,
sizeof
(
void
*
)
==
8
?
_win64W
:
_win32W
,
&
v
)
||
!
add_cc_var
(
cc
,
sizeof
(
void
*
)
==
8
?
_amd64W
:
_x86W
,
&
v
))
{
release_cc
(
cc
);
return
lex_error
(
ctx
,
E_OUTOFMEMORY
);
}
v
.
is_num
=
TRUE
;
v
.
u
.
n
=
JSCRIPT_BUILD_VERSION
;
if
(
!
add_cc_var
(
cc
,
_jscript_buildW
,
&
v
))
{
release_cc
(
cc
);
return
lex_error
(
ctx
,
E_OUTOFMEMORY
);
}
v
.
u
.
n
=
JSCRIPT_MAJOR_VERSION
+
(
DOUBLE
)
JSCRIPT_MINOR_VERSION
/
10
.
0
;
if
(
!
add_cc_var
(
cc
,
_jscript_versionW
,
&
v
))
{
if
(
!
new_cc_var
(
cc
,
_jscriptW
,
-
1
,
ccval_bool
(
TRUE
))
||
!
new_cc_var
(
cc
,
sizeof
(
void
*
)
==
8
?
_win64W
:
_win32W
,
-
1
,
ccval_bool
(
TRUE
))
||
!
new_cc_var
(
cc
,
sizeof
(
void
*
)
==
8
?
_amd64W
:
_x86W
,
-
1
,
ccval_bool
(
TRUE
))
||
!
new_cc_var
(
cc
,
_jscript_versionW
,
-
1
,
ccval_num
(
JSCRIPT_MAJOR_VERSION
+
(
DOUBLE
)
JSCRIPT_MINOR_VERSION
/
10
.
0
))
||
!
new_cc_var
(
cc
,
_jscript_buildW
,
-
1
,
ccval_num
(
JSCRIPT_BUILD_VERSION
)))
{
release_cc
(
cc
);
return
lex_error
(
ctx
,
E_OUTOFMEMORY
);
}
...
...
@@ -941,12 +924,12 @@ static int cc_token(parser_ctx_t *ctx, void *lval)
var
=
find_cc_var
(
ctx
->
script
->
cc
,
ctx
->
ptr
,
id_len
);
ctx
->
ptr
+=
id_len
;
if
(
!
var
||
var
->
is_num
)
{
*
(
literal_t
**
)
lval
=
new_double_literal
(
ctx
,
var
?
var
->
u
.
n
:
NAN
);
if
(
!
var
||
var
->
val
.
is_num
)
{
*
(
literal_t
**
)
lval
=
new_double_literal
(
ctx
,
var
?
var
->
val
.
u
.
n
:
NAN
);
return
tNumericLiteral
;
}
*
(
literal_t
**
)
lval
=
new_boolean_literal
(
ctx
,
var
->
u
.
b
);
*
(
literal_t
**
)
lval
=
new_boolean_literal
(
ctx
,
var
->
val
.
u
.
b
);
return
tBooleanLiteral
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/parser.h
+
24
−
0
View file @
79dc3bc7
...
...
@@ -20,6 +20,14 @@ typedef struct _source_elements_t source_elements_t;
typedef
struct
_expression_t
expression_t
;
typedef
struct
_statement_t
statement_t
;
typedef
struct
{
BOOL
is_num
;
union
{
BOOL
b
;
double
n
;
}
u
;
}
ccval_t
;
typedef
struct
_parser_ctx_t
{
const
WCHAR
*
begin
;
const
WCHAR
*
end
;
...
...
@@ -352,3 +360,19 @@ typedef struct {
expression_t
expr
;
prop_val_t
*
property_list
;
}
property_value_expression_t
;
static
inline
ccval_t
ccval_num
(
double
n
)
{
ccval_t
r
;
r
.
is_num
=
TRUE
;
r
.
u
.
n
=
n
;
return
r
;
}
static
inline
ccval_t
ccval_bool
(
BOOL
b
)
{
ccval_t
r
;
r
.
is_num
=
FALSE
;
r
.
u
.
b
=
b
;
return
r
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment