OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Renamed "VectorInitializer" to "VectorValue"

Browse source 
This was really confusing for me as this is an actual vector "value" rather than an "initializer"
This commit is contained in:
Leonard2 2016-10-30 04:35:01 +01:00
commit 94410accf4
6 changed files with 37 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/zscript/ast.cpp
View file

@ -623,7 +623,7 @@ static void PrintExprTrinary(FLispString &out, ZCC_TreeNode *node)
static void PrintVectorInitializer(FLispString &out, ZCC_TreeNode *node)
{
ZCC_VectorInitializer *enode = (ZCC_VectorInitializer *)node;
ZCC_VectorValue *enode = (ZCC_VectorValue *)node;
OpenExprType(out, enode->Operation);
PrintNodes(out, enode->X);
PrintNodes(out, enode->Y);

46
src/scripting/zscript/zcc-parse.lemon
View file

@ -945,7 +945,6 @@ func_param_flags(X) ::= func_param_flags(A) OPTIONAL(T). { X.Int = A.Int | ZCC_O
%type expr{ZCC_Expression *}
%type primary{ZCC_Expression *}
%type vectorinit{ZCC_VectorInitializer*}
%type unary_expr{ZCC_Expression *}
%type constant{ZCC_ExprConstant *}
@ -967,8 +966,26 @@ primary(X) ::= SUPER(T).
X = expr;
}
primary(X) ::= constant(A). { X = A; /*X-overwrites-A*/ }
primary(X) ::= vectorinit(A). { X = A; /*X-overwrites-A*/ }
primary(XX) ::= LPAREN expr(A) COMMA expr(B) COMMA expr(C) RPAREN. [DOT]
{
NEW_AST_NODE(VectorValue, expr, A);
expr->Operation = PEX_Vector;
expr->Type = TypeVector3;
expr->X = A;
expr->Y = B;
expr->Z = C;
XX = expr;
}
primary(XX) ::= LPAREN expr(A) COMMA expr(B) RPAREN. [DOT]
{
NEW_AST_NODE(VectorValue, expr, A);
expr->Operation = PEX_Vector;
expr->Type = TypeVector2;
expr->X = A;
expr->Y = B;
expr->Z = nullptr;
XX = expr;
}
primary(X) ::= LPAREN expr(A) RPAREN.
{
X = A; /*X-overwrites-A*/
@ -1019,29 +1036,6 @@ primary(X) ::= SCOPE primary(B).
}
*/
vectorinit(XX) ::= LPAREN expr(A) COMMA expr(B) COMMA expr(C) RPAREN. [DOT]
{
NEW_AST_NODE(VectorInitializer, expr, A);
expr->Operation = PEX_Vector;
expr->Type = TypeVector3;
expr->X = A;
expr->Y = B;
expr->Z = C;
XX = expr;
}
vectorinit(XX) ::= LPAREN expr(A) COMMA expr(B) RPAREN. [DOT]
{
NEW_AST_NODE(VectorInitializer, expr, A);
expr->Operation = PEX_Vector;
expr->Type = TypeVector2;
expr->X = A;
expr->Y = B;
expr->Z = nullptr;
XX = expr;
}
/*----- Unary Expressions -----*/
unary_expr(X) ::= primary(X).

6
src/scripting/zscript/zcc_compile.cpp
View file

@ -2712,13 +2712,13 @@ FxExpression *ZCCCompiler::ConvertNode(ZCC_TreeNode *ast)
return new FxConditional(condition, left, right);
}
case AST_VectorInitializer:
case AST_VectorValue:
{
auto vecini = static_cast<ZCC_VectorInitializer *>(ast);
auto vecini = static_cast<ZCC_VectorValue *>(ast);
auto xx = ConvertNode(vecini->X);
auto yy = ConvertNode(vecini->Y);
auto zz = ConvertNode(vecini->Z);
return new FxVectorInitializer(xx, yy, zz, *ast);
return new FxVectorValue(xx, yy, zz, *ast);
}
case AST_LocalVarStmt:

4
src/scripting/zscript/zcc_parser.h
View file

@ -98,7 +98,7 @@ enum EZCCTreeNodeType
AST_Default,
AST_FlagStmt,
AST_PropertyStmt,
AST_VectorInitializer,
AST_VectorValue,
NUM_AST_NODE_TYPES
};
@ -385,7 +385,7 @@ struct ZCC_ExprTrinary : ZCC_Expression
ZCC_Expression *Right;
};
struct ZCC_VectorInitializer : ZCC_Expression
struct ZCC_VectorValue : ZCC_Expression
{
ZCC_Expression *X, *Y, *Z;
};