Skip to content

Commit 8af218d

Browse files
Make TokenTypeString static const and move it to the header(Token.hpp)
1 parent e5fa3e2 commit 8af218d

File tree

2 files changed

+39
-40
lines changed

2 files changed

+39
-40
lines changed

src/Token.cpp

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,6 @@
11
#include <Token.hpp>
22
#include <vector>
33

4-
std::string TokenTypeString[] = {
5-
"PUSH",
6-
"STRING",
7-
"STRING_DUMP",
8-
"STRING_PLUS",
9-
"DUP",
10-
"OVER",
11-
"DROP",
12-
"SWAP",
13-
"PLUS",
14-
"MINUS",
15-
"MULT",
16-
"DIV",
17-
"DUMP",
18-
"INPUT",
19-
"BIND",
20-
"SAVE",
21-
"LOAD",
22-
"TERNARY",
23-
"MAKEPROC",
24-
"ENDPROC",
25-
"INVOKEPROC",
26-
"IF",
27-
"ENDIF",
28-
"EQUAL",
29-
"NOTEQUAL",
30-
"LESS",
31-
"LESSEQUAL",
32-
"GREATER",
33-
"GREATEREQUAL",
34-
"LOR",
35-
"LAND",
36-
"LNOT",
37-
"TRUE",
38-
"FALSE",
39-
40-
"IDENT",
41-
};
42-
434
TokenType tokenTypeFromString(std::string str)
445
{
456
if (str == "s!") {

src/Token.hpp

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,45 @@ enum TokenType {
4747
IDENT,
4848
};
4949

50-
extern std::string TokenTypeString[];
50+
static const std::string TokenTypeString[] = {
51+
"PUSH",
52+
"STRING",
53+
"STRING_DUMP",
54+
"STRING_PLUS",
55+
"DUP",
56+
"OVER",
57+
"DROP",
58+
"SWAP",
59+
"PLUS",
60+
"MINUS",
61+
"MULT",
62+
"DIV",
63+
"DUMP",
64+
"INPUT",
65+
"BIND",
66+
"SAVE",
67+
"LOAD",
68+
"TERNARY",
69+
"MAKEPROC",
70+
"ENDPROC",
71+
"INVOKEPROC",
72+
"IF",
73+
"ENDIF",
74+
"EQUAL",
75+
"NOTEQUAL",
76+
"LESS",
77+
"LESSEQUAL",
78+
"GREATER",
79+
"GREATEREQUAL",
80+
"LOR",
81+
"LAND",
82+
"LNOT",
83+
"TRUE",
84+
"FALSE",
85+
86+
"IDENT",
87+
};
88+
5189
static const std::vector<std::string> Keywords = {
5290
"s!",
5391
"s+",

0 commit comments

Comments
 (0)