forked from Mirrors/wine-wine
vbscript: Added concatenation expression parser/compiler support.
parent
e5d25a170a
commit
e06017b2a3
|
@ -236,6 +236,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr)
|
|||
switch(expr->type) {
|
||||
case EXPR_BOOL:
|
||||
return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value);
|
||||
case EXPR_CONCAT:
|
||||
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat);
|
||||
case EXPR_DOUBLE:
|
||||
return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value);
|
||||
case EXPR_EMPTY:
|
||||
|
|
|
@ -367,6 +367,12 @@ static HRESULT interp_equal(exec_ctx_t *ctx)
|
|||
return stack_push(ctx, &v);
|
||||
}
|
||||
|
||||
static HRESULT interp_concat(exec_ctx_t *ctx)
|
||||
{
|
||||
FIXME("\n");
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const instr_func_t op_funcs[] = {
|
||||
#define X(x,n,a,b) interp_ ## x,
|
||||
OP_LIST
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
typedef enum {
|
||||
EXPR_BOOL,
|
||||
EXPR_CONCAT,
|
||||
EXPR_DOUBLE,
|
||||
EXPR_EMPTY,
|
||||
EXPR_EQUAL,
|
||||
|
|
|
@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*);
|
|||
|
||||
%type <statement> Statement StatementNl
|
||||
%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression
|
||||
%type <expression> ConcatExpression
|
||||
%type <expression> ConcatExpression AdditiveExpression
|
||||
%type <expression> NotExpression
|
||||
%type <member> MemberExpression
|
||||
%type <expression> Arguments_opt ArgumentList_opt ArgumentList
|
||||
|
@ -141,6 +141,10 @@ EqualityExpression
|
|||
| EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; }
|
||||
|
||||
ConcatExpression
|
||||
: AdditiveExpression { $$ = $1; }
|
||||
| ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; }
|
||||
|
||||
AdditiveExpression
|
||||
: LiteralExpression /* FIXME */ { $$ = $1; }
|
||||
| CallExpression /* FIXME */ { $$ = $1; }
|
||||
|
||||
|
|
|
@ -89,6 +89,7 @@ typedef enum {
|
|||
|
||||
#define OP_LIST \
|
||||
X(bool, 1, ARG_INT, 0) \
|
||||
X(concat, 1, 0, 0) \
|
||||
X(double, 1, ARG_DOUBLE, 0) \
|
||||
X(empty, 1, 0, 0) \
|
||||
X(equal, 1, 0, 0) \
|
||||
|
|
Loading…
Reference in New Issue