Tue, 11 Feb 2014 03:29:03 +0200
- implemented arrays, don't quite work 100% yet
- restructured Expression::ParseSymbol, local exception no longer needed
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
1 | #include "Expression.h" |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
2 | #include "DataBuffer.h" |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
3 | #include "Lexer.h" |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
4 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
5 | struct OperatorInfo |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
6 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
7 | EToken token; |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
8 | int priority; |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
9 | int numoperands; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
10 | EDataHeader header; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
11 | }; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
12 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
13 | static const OperatorInfo gOperators[] = |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
14 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
15 | { tkExclamationMark, 0, 1, dhNegateLogical, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
16 | { tkMinus, 0, 1, dhUnaryMinus, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
17 | { tkMultiply, 10, 2, dhMultiply, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
18 | { tkDivide, 10, 2, dhDivide, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
19 | { tkModulus, 10, 2, dhModulus, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
20 | { tkPlus, 20, 2, dhAdd, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
21 | { tkMinus, 20, 2, dhSubtract, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
22 | { tkLeftShift, 30, 2, dhLeftShift, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
23 | { tkRightShift, 30, 2, dhRightShift, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
24 | { tkLesser, 40, 2, dhLessThan, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
25 | { tkGreater, 40, 2, dhGreaterThan, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
26 | { tkAtLeast, 40, 2, dhAtLeast, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
27 | { tkAtMost, 40, 2, dhAtMost, }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
28 | { tkEquals, 50, 2, dhEquals }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
29 | { tkNotEquals, 50, 2, dhNotEquals }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
30 | { tkAmperstand, 60, 2, dhAndBitwise }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
31 | { tkCaret, 70, 2, dhEorBitwise }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
32 | { tkBar, 80, 2, dhOrBitwise }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
33 | { tkDoubleAmperstand, 90, 2, dhAndLogical }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
34 | { tkDoubleBar, 100, 2, dhOrLogical }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
35 | { tkQuestionMark, 110, 3, (EDataHeader) 0 }, |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
36 | }; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
37 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
38 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
39 | // |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
40 | Expression::Expression (BotscriptParser* parser, Lexer* lx, EType reqtype) : |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
41 | mParser (parser), |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
42 | mLexer (lx), |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
43 | mType (reqtype) |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
44 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
45 | ExpressionSymbol* sym; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
46 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
47 | while ((sym = ParseSymbol()) != null) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
48 | mSymbols << sym; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
49 | |
106
9174be9ac686
- improved error handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents:
105
diff
changeset
|
50 | // If we were unable to get any expression symbols, something's wonky with |
9174be9ac686
- improved error handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents:
105
diff
changeset
|
51 | // the script. Report an error. mBadTokenText is set to the token that |
9174be9ac686
- improved error handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents:
105
diff
changeset
|
52 | // ParseSymbol ends at when it returns false. |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
53 | if (mSymbols.IsEmpty()) |
106
9174be9ac686
- improved error handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents:
105
diff
changeset
|
54 | Error ("unknown identifier '%1'", mBadTokenText); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
55 | |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
56 | AdjustOperators(); |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
57 | Verify(); |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
58 | Evaluate(); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
59 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
60 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
61 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
62 | // |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
63 | Expression::~Expression() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
64 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
65 | for (ExpressionSymbol* sym : mSymbols) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
66 | delete sym; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
67 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
68 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
69 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
70 | // |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
71 | // Try to parse an expression symbol (i.e. an operator or operand or a colon) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
72 | // from the lexer. |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
73 | // |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
74 | ExpressionSymbol* Expression::ParseSymbol() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
75 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
76 | int pos = mLexer->GetPosition(); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
77 | ExpressionValue* op = null; |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
78 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
79 | if (mLexer->GetNext (tkColon)) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
80 | return new ExpressionColon; |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
81 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
82 | // Check for operator |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
83 | for (const OperatorInfo& op : gOperators) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
84 | if (mLexer->GetNext (op.token)) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
85 | return new ExpressionOperator ((EOperator) (&op - &gOperators[0])); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
86 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
87 | // Check sub-expression |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
88 | if (mLexer->GetNext (tkParenStart)) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
89 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
90 | Expression expr (mParser, mLexer, mType); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
91 | mLexer->MustGetNext (tkParenEnd); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
92 | return expr.GetResult()->Clone(); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
93 | } |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
94 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
95 | op = new ExpressionValue (mType); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
96 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
97 | // Check function |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
98 | if (CommandInfo* comm = FindCommandByName (mLexer->PeekNextString())) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
99 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
100 | mLexer->Skip(); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
101 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
102 | if (mType != EUnknownType && comm->returnvalue != mType) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
103 | Error ("%1 returns an incompatible data type", comm->name); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
104 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
105 | op->SetBuffer (mParser->ParseCommand (comm)); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
106 | return op; |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
107 | } |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
108 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
109 | // Check for variables |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
110 | if (mLexer->GetNext (tkDollarSign)) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
111 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
112 | mLexer->MustGetNext (tkSymbol); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
113 | Variable* var = mParser->FindVariable (GetTokenString()); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
114 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
115 | if (var == null) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
116 | Error ("unknown variable %1", GetTokenString()); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
117 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
118 | if (var->type != mType) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
119 | Error ("expression requires %1, variable $%2 is of type %3", |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
120 | GetTypeName (mType), var->name, GetTypeName (var->type)); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
121 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
122 | if (var->isarray) |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
123 | { |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
124 | mLexer->MustGetNext (tkBracketStart); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
125 | Expression expr (mParser, mLexer, EIntType); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
126 | expr.GetResult()->ConvertToBuffer(); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
127 | DataBuffer* buf = expr.GetResult()->GetBuffer()->Clone(); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
128 | buf->WriteDWord (dhPushGlobalArray); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
129 | buf->WriteDWord (var->index); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
130 | op->SetBuffer (buf); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
131 | mLexer->MustGetNext (tkBracketEnd); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
132 | } |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
133 | elif (var->writelevel == Variable::WRITE_Constexpr) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
134 | op->SetValue (var->value); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
135 | else |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
136 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
137 | DataBuffer* buf = new DataBuffer (8); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
138 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
139 | if (var->IsGlobal()) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
140 | buf->WriteDWord (dhPushGlobalVar); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
141 | else |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
142 | buf->WriteDWord (dhPushLocalVar); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
143 | |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
144 | buf->WriteDWord (var->index); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
145 | op->SetBuffer (buf); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
146 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
147 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
148 | return op; |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
149 | } |
101
9ffae10ef76f
- variables: merged const and mutable variables into one system, added constexpr variable support. still no locals
Teemu Piippo <crimsondusk64@gmail.com>
parents:
100
diff
changeset
|
150 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
151 | // Check for literal |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
152 | switch (mType) |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
153 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
154 | case EVoidType: |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
155 | case EUnknownType: |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
156 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
157 | Error ("unknown identifier `%1` (expected keyword, function or variable)", GetTokenString()); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
158 | break; |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
159 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
160 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
161 | case EBoolType: |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
162 | { |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
163 | if (mLexer->GetNext (tkTrue) || mLexer->GetNext (tkFalse)) |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
164 | { |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
165 | EToken tt = mLexer->GetTokenType(); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
166 | op->SetValue (tt == tkTrue ? 1 : 0); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
167 | return op; |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
168 | } |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
169 | } |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
170 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
171 | case EIntType: |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
172 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
173 | if (mLexer->GetNext (tkNumber)) |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
174 | { |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
175 | op->SetValue (GetTokenString().ToLong()); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
176 | return op; |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
177 | } |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
178 | } |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
179 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
180 | case EStringType: |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
181 | { |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
182 | if (mLexer->GetNext (tkString)) |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
183 | { |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
184 | op->SetValue (GetStringTableIndex (GetTokenString())); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
185 | return op; |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
186 | } |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
187 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
188 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
189 | |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
190 | mBadTokenText = mLexer->GetToken()->text; |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
191 | mLexer->SetPosition (pos); |
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
192 | delete op; |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
193 | return null; |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
194 | } |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
195 | |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
196 | // ============================================================================= |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
197 | // |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
198 | // The symbol parsing process only does token-based checking for operators. Thus |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
199 | // ALL minus operators are actually unary minuses simply because both have |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
200 | // tkMinus as their token and the unary minus is prior to the binary minus in |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
201 | // the operator table. Now that we have all symbols present, we can correct |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
202 | // cases like this. |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
203 | // |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
204 | void Expression::AdjustOperators() |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
205 | { |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
206 | for (auto it = mSymbols.begin() + 1; it != mSymbols.end(); ++it) |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
207 | { |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
208 | if ((*it)->GetType() != eOperatorSymbol) |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
209 | continue; |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
210 | |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
211 | ExpressionOperator* op = static_cast<ExpressionOperator*> (*it); |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
212 | |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
213 | // Unary minus with a value as the previous symbol cannot really be |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
214 | // unary; replace with binary minus. |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
215 | if (op->GetID() == opUnaryMinus && (*(it - 1))->GetType() == eValueSymbol) |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
216 | op->SetID (opSubtraction); |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
217 | } |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
218 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
219 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
220 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
221 | // |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
222 | // Verifies a single value. Helper function for Expression::Verify. |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
223 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
224 | void Expression::TryVerifyValue (bool* verified, SymbolList::Iterator it) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
225 | { |
95
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
226 | // If it's an unary operator we skip to its value. The actual operator will |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
227 | // be verified separately. |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
228 | if ((*it)->GetType() == eOperatorSymbol && |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
229 | gOperators[static_cast<ExpressionOperator*> (*it)->GetID()].numoperands == 1) |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
230 | { |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
231 | ++it; |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
232 | } |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
233 | |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
234 | int i = it - mSymbols.begin(); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
235 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
236 | // Ensure it's an actual value |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
237 | if ((*it)->GetType() != eValueSymbol) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
238 | Error ("malformed expression (symbol #%1 is not a value)", i); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
239 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
240 | verified[i] = true; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
241 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
242 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
243 | // ============================================================================= |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
244 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
245 | // Ensures the expression is valid and well-formed and not OMGWTFBBQ. Throws an |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
246 | // error if this is not the case. |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
247 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
248 | void Expression::Verify() |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
249 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
250 | if (mSymbols.Size() == 1) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
251 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
252 | if (mSymbols[0]->GetType() != eValueSymbol) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
253 | Error ("bad expression"); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
254 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
255 | return; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
256 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
257 | |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
258 | if (mType == EStringType) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
259 | Error ("Cannot perform operations on strings"); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
260 | |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
261 | bool* verified = new bool[mSymbols.Size()]; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
262 | memset (verified, 0, mSymbols.Size() * sizeof (decltype (*verified))); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
263 | const auto last = mSymbols.end() - 1; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
264 | const auto first = mSymbols.begin(); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
265 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
266 | for (auto it = mSymbols.begin(); it != mSymbols.end(); ++it) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
267 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
268 | int i = (it - first); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
269 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
270 | if ((*it)->GetType() != eOperatorSymbol) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
271 | continue; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
272 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
273 | ExpressionOperator* op = static_cast<ExpressionOperator*> (*it); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
274 | int numoperands = gOperators[op->GetID()].numoperands; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
275 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
276 | switch (numoperands) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
277 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
278 | case 1: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
279 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
280 | // Ensure that: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
281 | // - unary operator is not the last symbol |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
282 | // - unary operator is succeeded by a value symbol |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
283 | // - neither symbol overlaps with something already verified |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
284 | TryVerifyValue (verified, it + 1); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
285 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
286 | if (it == last || verified[i] == true) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
287 | Error ("malformed expression"); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
288 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
289 | verified[i] = true; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
290 | break; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
291 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
292 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
293 | case 2: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
294 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
295 | // Ensure that: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
296 | // - binary operator is not the first or last symbol |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
297 | // - is preceded and succeeded by values |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
298 | // - none of the three tokens are already verified |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
299 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
300 | // Basically similar logic as above. |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
301 | if (it == first || it == last || verified[i] == true) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
302 | Error ("malformed expression"); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
303 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
304 | TryVerifyValue (verified, it + 1); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
305 | TryVerifyValue (verified, it - 1); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
306 | verified[i] = true; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
307 | break; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
308 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
309 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
310 | case 3: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
311 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
312 | // Ternary operator case. This goes a bit nuts. |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
313 | // This time we have the following: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
314 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
315 | // (VALUE) ? (VALUE) : (VALUE) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
316 | // ^ |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
317 | // --------/ we are here |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
318 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
319 | // Check that the: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
320 | // - questionmark operator is not misplaced (first or last) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
321 | // - the value behind the operator (-1) is valid |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
322 | // - the value after the operator (+1) is valid |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
323 | // - the value after the colon (+3) is valid |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
324 | // - none of the five tokens are verified |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
325 | // |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
326 | TryVerifyValue (verified, it - 1); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
327 | TryVerifyValue (verified, it + 1); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
328 | TryVerifyValue (verified, it + 3); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
329 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
330 | if (it == first || |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
331 | it >= mSymbols.end() - 3 || |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
332 | verified[i] == true || |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
333 | verified[i + 2] == true || |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
334 | (*(it + 2))->GetType() != eColonSymbol) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
335 | { |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
336 | Error ("malformed expression"); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
337 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
338 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
339 | verified[i] = true; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
340 | verified[i + 2] = true; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
341 | break; |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
342 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
343 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
344 | default: |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
345 | Error ("WTF operator with %1 operands", numoperands); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
346 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
347 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
348 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
349 | for (int i = 0; i < mSymbols.Size(); ++i) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
350 | if (verified[i] == false) |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
351 | Error ("malformed expression: expr symbol #%1 is was left unverified", i); |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
352 | |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
353 | delete verified; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
354 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
355 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
356 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
357 | // ============================================================================= |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
358 | // |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
359 | // Which operator to evaluate? |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
360 | // |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
361 | Expression::SymbolList::Iterator Expression::FindPrioritizedOperator() |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
362 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
363 | SymbolList::Iterator best = mSymbols.end(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
364 | int bestpriority = INT_MAX; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
365 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
366 | for (SymbolList::Iterator it = mSymbols.begin(); it != mSymbols.end(); ++it) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
367 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
368 | if ((*it)->GetType() != eOperatorSymbol) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
369 | continue; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
370 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
371 | ExpressionOperator* op = static_cast<ExpressionOperator*> (*it); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
372 | const OperatorInfo* info = &gOperators[op->GetID()]; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
373 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
374 | if (info->priority < bestpriority) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
375 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
376 | best = it; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
377 | bestpriority = info->priority; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
378 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
379 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
380 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
381 | return best; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
382 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
383 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
384 | // ============================================================================= |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
385 | // |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
386 | // Process the given operator and values into a new value. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
387 | // |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
388 | ExpressionValue* Expression::EvaluateOperator (const ExpressionOperator* op, |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
389 | const List<ExpressionValue*>& values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
390 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
391 | const OperatorInfo* info = &gOperators[op->GetID()]; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
392 | bool isconstexpr = true; |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
393 | assert (values.Size() == info->numoperands); |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
394 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
395 | for (ExpressionValue* val : values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
396 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
397 | if (val->IsConstexpr() == false) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
398 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
399 | isconstexpr = false; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
400 | break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
401 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
402 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
403 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
404 | // If not all of the values are constant expressions, none of them shall be. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
405 | if (isconstexpr == false) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
406 | for (ExpressionValue* val : values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
407 | val->ConvertToBuffer(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
408 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
409 | ExpressionValue* newval = new ExpressionValue (mType); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
410 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
411 | if (isconstexpr == false) |
95
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
412 | { |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
413 | // This is not a constant expression so we'll have to use databuffers |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
414 | // to convey the expression to bytecode. Actual value cannot be evaluated |
4db95b92c29a
- fixed verification with unary operators
Teemu Piippo <crimsondusk64@gmail.com>
parents:
94
diff
changeset
|
415 | // until Zandronum processes it at run-time. |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
416 | newval->SetBuffer (new DataBuffer); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
417 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
418 | if (op->GetID() == opTernary) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
419 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
420 | // There isn't a dataheader for ternary operator. Instead, we use dhIfNotGoto |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
421 | // to create an "if-block" inside an expression. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
422 | // Behold, big block of writing madness! :P |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
423 | // |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
424 | DataBuffer* buf = newval->GetBuffer(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
425 | DataBuffer* b0 = values[0]->GetBuffer(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
426 | DataBuffer* b1 = values[1]->GetBuffer(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
427 | DataBuffer* b2 = values[2]->GetBuffer(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
428 | ByteMark* mark1 = buf->AddMark (""); // start of "else" case |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
429 | ByteMark* mark2 = buf->AddMark (""); // end of expression |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
430 | buf->MergeAndDestroy (b0); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
431 | buf->WriteDWord (dhIfNotGoto); // if the first operand (condition) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
432 | buf->AddReference (mark1); // didn't eval true, jump into mark1 |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
433 | buf->MergeAndDestroy (b1); // otherwise, perform second operand (true case) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
434 | buf->WriteDWord (dhGoto); // afterwards, jump to the end, which is |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
435 | buf->AddReference (mark2); // marked by mark2. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
436 | buf->AdjustMark (mark1); // move mark1 at the end of the true case |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
437 | buf->MergeAndDestroy (b2); // perform third operand (false case) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
438 | buf->AdjustMark (mark2); // move the ending mark2 here |
96
3384d7aa036a
- ternary operator now works properly
Teemu Piippo <crimsondusk64@gmail.com>
parents:
95
diff
changeset
|
439 | |
3384d7aa036a
- ternary operator now works properly
Teemu Piippo <crimsondusk64@gmail.com>
parents:
95
diff
changeset
|
440 | for (int i = 0; i < 3; ++i) |
3384d7aa036a
- ternary operator now works properly
Teemu Piippo <crimsondusk64@gmail.com>
parents:
95
diff
changeset
|
441 | values[i]->SetBuffer (null); |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
442 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
443 | else |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
444 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
445 | // Generic case: write all arguments and apply the operator's |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
446 | // data header. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
447 | for (ExpressionValue* val : values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
448 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
449 | newval->GetBuffer()->MergeAndDestroy (val->GetBuffer()); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
450 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
451 | // Null the pointer out so that the value's destructor will not |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
452 | // attempt to double-free it. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
453 | val->SetBuffer (null); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
454 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
455 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
456 | newval->GetBuffer()->WriteDWord (info->header); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
457 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
458 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
459 | else |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
460 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
461 | // We have a constant expression. We know all the values involved and |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
462 | // can thus compute the result of this expression on compile-time. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
463 | List<int> nums; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
464 | int a; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
465 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
466 | for (ExpressionValue* val : values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
467 | nums << val->GetValue(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
468 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
469 | switch (op->GetID()) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
470 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
471 | case opAddition: a = nums[0] + nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
472 | case opSubtraction: a = nums[0] - nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
473 | case opMultiplication: a = nums[0] * nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
474 | case opUnaryMinus: a = -nums[0]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
475 | case opNegateLogical: a = !nums[0]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
476 | case opLeftShift: a = nums[0] << nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
477 | case opRightShift: a = nums[0] >> nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
478 | case opCompareLesser: a = (nums[0] < nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
479 | case opCompareGreater: a = (nums[0] > nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
480 | case opCompareAtLeast: a = (nums[0] <= nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
481 | case opCompareAtMost: a = (nums[0] >= nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
482 | case opCompareEquals: a = (nums[0] == nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
483 | case opCompareNotEquals: a = (nums[0] != nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
484 | case opBitwiseAnd: a = nums[0] & nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
485 | case opBitwiseOr: a = nums[0] | nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
486 | case opBitwiseXOr: a = nums[0] ^ nums[1]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
487 | case opLogicalAnd: a = (nums[0] && nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
488 | case opLogicalOr: a = (nums[0] || nums[1]) ? 1 : 0; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
489 | case opTernary: a = (nums[0] != 0) ? nums[1] : nums[2]; break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
490 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
491 | case opDivision: |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
492 | { |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
493 | if (nums[1] == 0) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
494 | Error ("division by zero in constant expression"); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
495 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
496 | a = nums[0] / nums[1]; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
497 | break; |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
498 | } |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
499 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
500 | case opModulus: |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
501 | { |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
502 | if (nums[1] == 0) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
503 | Error ("modulus by zero in constant expression"); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
504 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
505 | a = nums[0] % nums[1]; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
506 | break; |
107
55c2bcd8ed5c
- implemented arrays, don't quite work 100% yet
Teemu Piippo <crimsondusk64@gmail.com>
parents:
106
diff
changeset
|
507 | } |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
508 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
509 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
510 | newval->SetValue (a); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
511 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
512 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
513 | // The new value has been generated. We don't need the old stuff anymore. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
514 | for (ExpressionValue* val : values) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
515 | delete val; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
516 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
517 | delete op; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
518 | return newval; |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
519 | } |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
520 | |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
521 | // ============================================================================= |
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
522 | // |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
523 | ExpressionValue* Expression::Evaluate() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
524 | { |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
525 | SymbolList::Iterator it; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
526 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
527 | while ((it = FindPrioritizedOperator()) != mSymbols.end()) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
528 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
529 | int i = it - mSymbols.begin(); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
530 | List<SymbolList::Iterator> operands; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
531 | ExpressionOperator* op = static_cast<ExpressionOperator*> (*it); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
532 | const OperatorInfo* info = &gOperators[op->GetID()]; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
533 | int lower, upper; // Boundaries of area to replace |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
534 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
535 | switch (info->numoperands) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
536 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
537 | case 1: |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
538 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
539 | lower = i; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
540 | upper = i + 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
541 | operands << it + 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
542 | break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
543 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
544 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
545 | case 2: |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
546 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
547 | lower = i - 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
548 | upper = i + 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
549 | operands << it - 1 |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
550 | << it + 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
551 | break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
552 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
553 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
554 | case 3: |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
555 | { |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
556 | lower = i - 1; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
557 | upper = i + 3; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
558 | operands << it - 1 |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
559 | << it + 1 |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
560 | << it + 3; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
561 | break; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
562 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
563 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
564 | default: |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
565 | assert (false); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
566 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
567 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
568 | List<ExpressionValue*> values; |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
569 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
570 | for (auto it : operands) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
571 | values << static_cast<ExpressionValue*> (*it); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
572 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
573 | // Note: @op and all of @values are invalid after this call. |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
574 | ExpressionValue* newvalue = EvaluateOperator (op, values); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
575 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
576 | for (int i = upper; i >= lower; --i) |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
577 | mSymbols.RemoveAt (i); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
578 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
579 | mSymbols.Insert (lower, newvalue); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
580 | } |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
581 | |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
582 | assert (mSymbols.Size() == 1 && mSymbols.First()->GetType() == eValueSymbol); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
583 | ExpressionValue* val = static_cast<ExpressionValue*> (mSymbols.First()); |
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
584 | return val; |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
585 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
586 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
587 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
588 | // |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
589 | ExpressionValue* Expression::GetResult() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
590 | { |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
591 | return static_cast<ExpressionValue*> (mSymbols.First()); |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
592 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
593 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
594 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
595 | // |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
596 | String Expression::GetTokenString() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
597 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
598 | return mLexer->GetToken()->text; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
599 | } |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
600 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
601 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
602 | // |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
603 | ExpressionOperator::ExpressionOperator (EOperator id) : |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
604 | ExpressionSymbol (Expression::eOperatorSymbol), |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
605 | mID (id) {} |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
606 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
607 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
608 | // |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
609 | ExpressionValue::ExpressionValue (EType valuetype) : |
93
11a24b697f43
- Expression verification done
Teemu Piippo <crimsondusk64@gmail.com>
parents:
92
diff
changeset
|
610 | ExpressionSymbol (Expression::eValueSymbol), |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
611 | mBuffer (null), |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
612 | mValueType (valuetype) {} |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
613 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
614 | // ============================================================================= |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
615 | // |
92
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
616 | ExpressionValue::~ExpressionValue() |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
617 | { |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
618 | delete mBuffer; |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
619 | } |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
620 | |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
621 | // ============================================================================= |
3a00d396bce2
- now compiles again, further work on expressions (proper parsing + assignment operator handling (albeit unrelated) + operator adjusting)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
91
diff
changeset
|
622 | // |
91
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
623 | void ExpressionValue::ConvertToBuffer() |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
624 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
625 | if (IsConstexpr() == false) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
626 | return; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
627 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
628 | SetBuffer (new DataBuffer); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
629 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
630 | switch (mValueType) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
631 | { |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
632 | case EBoolType: |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
633 | case EIntType: |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
634 | GetBuffer()->WriteDWord (dhPushNumber); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
635 | GetBuffer()->WriteDWord (abs (mValue)); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
636 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
637 | if (mValue < 0) |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
638 | GetBuffer()->WriteDWord (dhUnaryMinus); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
639 | break; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
640 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
641 | case EStringType: |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
642 | GetBuffer()->WriteDWord (dhPushStringIndex); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
643 | GetBuffer()->WriteDWord (mValue); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
644 | break; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
645 | |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
646 | case EVoidType: |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
647 | case EUnknownType: |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
648 | assert (false); |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
649 | break; |
427eb377d53e
- committed work so far done on expressions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
650 | } |
94
8915ee6a277d
- expression evaluation implemented! Expressions are now complete for the most part aside from some unary operator quirks in verification.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
93
diff
changeset
|
651 | } |