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

Make the AST mutable (#849)

Browse Source 
The code is pretty intertwined: having the AST be truly mutable means (to me) changing parser.ypp to return non-const values, but then the way things are passed around between objects should be non-const (particularly an issue with lists), which then creates issues with construction of lists in the TypeChecker, which then TypeChecker needs to mostly be non-const.

Due to the difficulties in breaking this apart, whereas I'd previously considering refactoring accessor naming in the same PR, I've largely avoided doing so. The intent is then that this PR focuses mainly on const -> non-const AST behavior.

call_main moves out of interpreter.cpp so that interpreter.cpp can receive a fully const AST.
This commit is contained in:
Jon Meow
2021-09-27 10:57:31 -07:00
committed by GitHub
parent 721743bc58
commit 04ab30f231
15 changed files with 282 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/function_definition.h
+9 -8
View File
@@ -26,13 +26,12 @@ class FunctionDefinition {
public:
FunctionDefinition(SourceLocation source_loc, std::string name,
std::vector<GenericBinding> deduced_params,
Nonnull<const TuplePattern*> param_pattern,
Nonnull<const Pattern*> return_type,
bool is_omitted_return_type,
std::optional<Nonnull<const Statement*>> body)
Nonnull<TuplePattern*> param_pattern,
Nonnull<Pattern*> return_type, bool is_omitted_return_type,
std::optional<Nonnull<Statement*>> body)
: source_loc_(source_loc),
name_(std::move(name)),
deduced_parameters_(deduced_params),
deduced_parameters_(std::move(deduced_params)),
param_pattern_(param_pattern),
return_type_(return_type),
is_omitted_return_type_(is_omitted_return_type),
@@ -48,6 +47,7 @@ class FunctionDefinition {
return deduced_parameters_;
}
auto param_pattern() const -> const TuplePattern& { return *param_pattern_; }
auto param_pattern() -> TuplePattern& { return *param_pattern_; }
auto return_type() const -> const Pattern& { return *return_type_; }
auto is_omitted_return_type() const -> bool {
return is_omitted_return_type_;
@@ -55,15 +55,16 @@ class FunctionDefinition {
auto body() const -> std::optional<Nonnull<const Statement*>> {
return body_;
}
auto body() -> std::optional<Nonnull<Statement*>> { return body_; }
private:
SourceLocation source_loc_;
std::string name_;
std::vector<GenericBinding> deduced_parameters_;
Nonnull<const TuplePattern*> param_pattern_;
Nonnull<const Pattern*> return_type_;
Nonnull<TuplePattern*> param_pattern_;
Nonnull<Pattern*> return_type_;
bool is_omitted_return_type_;
std::optional<Nonnull<const Statement*>> body_;
std::optional<Nonnull<Statement*>> body_;
};
} // namespace Carbon