change all expression and statement pointers to be const (#449)

* change all expression and statement pointers to be const

* const in paren tests
This commit is contained in:
Jeremy G. Siek
2021-04-19 21:47:19 -04:00
committed by GitHub
parent 153d92b390
commit 34f1a03f7b
21 changed files with 258 additions and 229 deletions
+41 -36
View File
@@ -33,71 +33,76 @@ struct Statement {
StatementKind tag;
union {
Expression* exp;
const Expression* exp;
struct {
Expression* lhs;
Expression* rhs;
const Expression* lhs;
const Expression* rhs;
} assign;
struct {
Expression* pat;
Expression* init;
const Expression* pat;
const Expression* init;
} variable_definition;
struct {
Expression* cond;
Statement* then_stmt;
Statement* else_stmt;
const Expression* cond;
const Statement* then_stmt;
const Statement* else_stmt;
} if_stmt;
Expression* return_stmt;
const Expression* return_stmt;
struct {
Statement* stmt;
Statement* next;
const Statement* stmt;
const Statement* next;
} sequence;
struct {
Statement* stmt;
const Statement* stmt;
} block;
struct {
Expression* cond;
Statement* body;
const Expression* cond;
const Statement* body;
} while_stmt;
struct {
Expression* exp;
std::list<std::pair<Expression*, Statement*>>* clauses;
const Expression* exp;
std::list<std::pair<const Expression*, const Statement*>>* clauses;
} match_stmt;
struct {
std::string* continuation_variable;
Statement* body;
const Statement* body;
} continuation;
struct {
Expression* argument;
const Expression* argument;
} run;
} u;
};
auto MakeExpStmt(int line_num, Expression* exp) -> Statement*;
auto MakeAssign(int line_num, Expression* lhs, Expression* rhs) -> Statement*;
auto MakeVarDef(int line_num, Expression* pat, Expression* init) -> Statement*;
auto MakeIf(int line_num, Expression* cond, Statement* then_stmt,
Statement* else_stmt) -> Statement*;
auto MakeReturn(int line_num, Expression* e) -> Statement*;
auto MakeSeq(int line_num, Statement* s1, Statement* s2) -> Statement*;
auto MakeBlock(int line_num, Statement* s) -> Statement*;
auto MakeWhile(int line_num, Expression* cond, Statement* body) -> Statement*;
auto MakeBreak(int line_num) -> Statement*;
auto MakeContinue(int line_num) -> Statement*;
auto MakeMatch(int line_num, Expression* exp,
std::list<std::pair<Expression*, Statement*>>* clauses)
-> Statement*;
auto MakeExpStmt(int line_num, const Expression* exp) -> const Statement*;
auto MakeAssign(int line_num, const Expression* lhs, const Expression* rhs)
-> const Statement*;
auto MakeVarDef(int line_num, const Expression* pat, const Expression* init)
-> const Statement*;
auto MakeIf(int line_num, const Expression* cond, const Statement* then_stmt,
const Statement* else_stmt) -> const Statement*;
auto MakeReturn(int line_num, const Expression* e) -> const Statement*;
auto MakeSeq(int line_num, const Statement* s1, const Statement* s2)
-> const Statement*;
auto MakeBlock(int line_num, const Statement* s) -> const Statement*;
auto MakeWhile(int line_num, const Expression* cond, const Statement* body)
-> const Statement*;
auto MakeBreak(int line_num) -> const Statement*;
auto MakeContinue(int line_num) -> const Statement*;
auto MakeMatch(
int line_num, const Expression* exp,
std::list<std::pair<const Expression*, const Statement*>>* clauses)
-> const Statement*;
// Returns an AST node for a continuation statement give its line number and
// contituent parts.
//
@@ -105,17 +110,17 @@ auto MakeMatch(int line_num, Expression* exp,
// <body>
// }
auto MakeContinuationStatement(int line_num, std::string continuation_variable,
Statement* body) -> Statement*;
const Statement* body) -> const Statement*;
// Returns an AST node for a run statement give its line number and argument.
//
// __run <argument>;
auto MakeRun(int line_num, Expression* argument) -> Statement*;
auto MakeRun(int line_num, const Expression* argument) -> const Statement*;
// Returns an AST node for an await statement give its line number.
//
// __await;
auto MakeAwait(int line_num) -> Statement*;
auto MakeAwait(int line_num) -> const Statement*;
void PrintStatement(Statement*, int);
void PrintStatement(const Statement*, int);
} // namespace Carbon