carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-25 06:10:14 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/statement.cpp
+23 -18
View File
@@ -8,7 +8,7 @@
namespace Carbon {
auto MakeExpStmt(int line_num, Expression* exp) -> Statement* {
auto MakeExpStmt(int line_num, const Expression* exp) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::ExpressionStatement;
@@ -16,7 +16,8 @@ auto MakeExpStmt(int line_num, Expression* exp) -> Statement* {
return s;
}
auto MakeAssign(int line_num, Expression* lhs, Expression* rhs) -> Statement* {
auto MakeAssign(int line_num, const Expression* lhs, const Expression* rhs)
-> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Assign;
@@ -25,7 +26,8 @@ auto MakeAssign(int line_num, Expression* lhs, Expression* rhs) -> Statement* {
return s;
}
auto MakeVarDef(int line_num, Expression* pat, Expression* init) -> Statement* {
auto MakeVarDef(int line_num, const Expression* pat, const Expression* init)
-> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::VariableDefinition;
@@ -34,8 +36,8 @@ auto MakeVarDef(int line_num, Expression* pat, Expression* init) -> Statement* {
return s;
}
auto MakeIf(int line_num, Expression* cond, Statement* then_stmt,
Statement* else_stmt) -> Statement* {
auto MakeIf(int line_num, const Expression* cond, const Statement* then_stmt,
const Statement* else_stmt) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::If;
@@ -45,7 +47,8 @@ auto MakeIf(int line_num, Expression* cond, Statement* then_stmt,
return s;
}
auto MakeWhile(int line_num, Expression* cond, Statement* body) -> Statement* {
auto MakeWhile(int line_num, const Expression* cond, const Statement* body)
-> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::While;
@@ -54,21 +57,21 @@ auto MakeWhile(int line_num, Expression* cond, Statement* body) -> Statement* {
return s;
}
auto MakeBreak(int line_num) -> Statement* {
auto MakeBreak(int line_num) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Break;
return s;
}
auto MakeContinue(int line_num) -> Statement* {
auto MakeContinue(int line_num) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Continue;
return s;
}
auto MakeReturn(int line_num, Expression* e) -> Statement* {
auto MakeReturn(int line_num, const Expression* e) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Return;
@@ -76,7 +79,8 @@ auto MakeReturn(int line_num, Expression* e) -> Statement* {
return s;
}
auto MakeSeq(int line_num, Statement* s1, Statement* s2) -> Statement* {
auto MakeSeq(int line_num, const Statement* s1, const Statement* s2)
-> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Sequence;
@@ -85,7 +89,7 @@ auto MakeSeq(int line_num, Statement* s1, Statement* s2) -> Statement* {
return s;
}
auto MakeBlock(int line_num, Statement* stmt) -> Statement* {
auto MakeBlock(int line_num, const Statement* stmt) -> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Block;
@@ -93,9 +97,10 @@ auto MakeBlock(int line_num, Statement* stmt) -> Statement* {
return s;
}
auto MakeMatch(int line_num, Expression* exp,
std::list<std::pair<Expression*, Statement*>>* clauses)
-> Statement* {
auto MakeMatch(
int line_num, const Expression* exp,
std::list<std::pair<const Expression*, const Statement*>>* clauses)
-> const Statement* {
auto* s = new Statement();
s->line_num = line_num;
s->tag = StatementKind::Match;
@@ -107,7 +112,7 @@ auto MakeMatch(int line_num, Expression* exp,
// Returns an AST node for a continuation statement give its line number and
// parts.
auto MakeContinuationStatement(int line_num, std::string continuation_variable,
Statement* body) -> Statement* {
const Statement* body) -> const Statement* {
auto* continuation = new Statement();
continuation->line_num = line_num;
continuation->tag = StatementKind::Continuation;
@@ -118,7 +123,7 @@ auto MakeContinuationStatement(int line_num, std::string continuation_variable,
}
// Returns an AST node for a run statement give its line number and argument.
auto MakeRun(int line_num, Expression* argument) -> Statement* {
auto MakeRun(int line_num, const Expression* argument) -> const Statement* {
auto* run = new Statement();
run->line_num = line_num;
run->tag = StatementKind::Run;
@@ -127,14 +132,14 @@ auto MakeRun(int line_num, Expression* argument) -> Statement* {
}
// Returns an AST node for an await statement give its line number.
auto MakeAwait(int line_num) -> Statement* {
auto MakeAwait(int line_num) -> const Statement* {
auto* await = new Statement();
await->line_num = line_num;
await->tag = StatementKind::Await;
return await;
}
void PrintStatement(Statement* s, int depth) {
void PrintStatement(const Statement* s, int depth) {
if (!s) {
return;
}