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

Unify function declarations and definitions. (#896)

Browse Source
This commit is contained in:
Geoff Romer
2021-10-18 16:21:39 -07:00
committed by GitHub
parent c4d7adde9a
commit a3eac75a5b
13 changed files with 113 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/BUILD
+1 -13
View File
@@ -32,10 +32,10 @@ cc_library(
],
deps = [
":class_definition",
":function_definition",
":member",
":pattern",
":source_location",
":statement",
"//common:ostream",
"//executable_semantics/common:nonnull",
"@llvm-project//llvm:Support",
@@ -67,18 +67,6 @@ cc_test(
],
)
cc_library(
name = "function_definition",
srcs = ["function_definition.cpp"],
hdrs = ["function_definition.h"],
deps = [
":expression",
":source_location",
":statement",
"@llvm-project//llvm:Support",
],
)
cc_library(
name = "member",
srcs = ["member.cpp"],
executable_semantics/ast/declaration.cpp
+29 -1
View File
@@ -13,7 +13,7 @@ using llvm::cast;
void Declaration::Print(llvm::raw_ostream& out) const {
switch (kind()) {
case Kind::FunctionDeclaration:
out << cast<FunctionDeclaration>(*this).definition();
cast<FunctionDeclaration>(*this).PrintDepth(-1, out);
break;
case Kind::ClassDeclaration: {
@@ -45,4 +45,32 @@ void Declaration::Print(llvm::raw_ostream& out) const {
}
}
void FunctionDeclaration::PrintDepth(int depth, llvm::raw_ostream& out) const {
out << "fn " << name_ << " ";
if (!deduced_parameters_.empty()) {
out << "[";
unsigned int i = 0;
for (const auto& deduced : deduced_parameters_) {
if (i != 0) {
out << ", ";
}
out << deduced.name << ":! ";
deduced.type->Print(out);
++i;
}
out << "]";
}
out << *param_pattern_;
if (!is_omitted_return_type_) {
out << " -> " << *return_type_;
}
if (body_) {
out << " {\n";
(*body_)->PrintDepth(depth, out);
out << "\n}\n";
} else {
out << ";\n";
}
}
} // namespace Carbon
executable_semantics/ast/declaration.h
+58 -7
View File
@@ -10,10 +10,10 @@
#include "common/ostream.h"
#include "executable_semantics/ast/class_definition.h"
#include "executable_semantics/ast/function_definition.h"
#include "executable_semantics/ast/member.h"
#include "executable_semantics/ast/pattern.h"
#include "executable_semantics/ast/source_location.h"
#include "executable_semantics/ast/statement.h"
#include "executable_semantics/common/nonnull.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Support/Compiler.h"
@@ -61,21 +61,72 @@ class Declaration {
SourceLocation source_loc_;
};
// TODO: expand the kinds of things that can be deduced parameters.
// For now, only generic parameters are supported.
struct GenericBinding {
std::string name;
Nonnull<const Expression*> type;
};
class FunctionDeclaration : public Declaration {
public:
FunctionDeclaration(Nonnull<FunctionDefinition*> definition)
: Declaration(Kind::FunctionDeclaration, definition->source_loc()),
definition_(definition) {}
FunctionDeclaration(SourceLocation source_loc, std::string name,
std::vector<GenericBinding> deduced_params,
Nonnull<TuplePattern*> param_pattern,
Nonnull<Pattern*> return_type,
bool is_omitted_return_type,
std::optional<Nonnull<Statement*>> body)
: Declaration(Kind::FunctionDeclaration, source_loc),
name_(std::move(name)),
deduced_parameters_(std::move(deduced_params)),
param_pattern_(param_pattern),
return_type_(return_type),
is_omitted_return_type_(is_omitted_return_type),
body_(body) {}
static auto classof(const Declaration* decl) -> bool {
return decl->kind() == Kind::FunctionDeclaration;
}
auto definition() const -> const FunctionDefinition& { return *definition_; }
auto definition() -> FunctionDefinition& { return *definition_; }
void PrintDepth(int depth, llvm::raw_ostream& out) const;
auto name() const -> const std::string& { return name_; }
auto deduced_parameters() const -> llvm::ArrayRef<GenericBinding> {
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 return_type() -> Pattern& { return *return_type_; }
auto is_omitted_return_type() const -> bool {
return is_omitted_return_type_;
}
auto body() const -> std::optional<Nonnull<const Statement*>> {
return body_;
}
auto body() -> std::optional<Nonnull<Statement*>> { return body_; }
// The static type of this function. Cannot be called before typechecking.
auto static_type() const -> const Value& { return **static_type_; }
// Sets the static type of this expression. Can only be called once, during
// typechecking.
void set_static_type(Nonnull<const Value*> type) { static_type_ = type; }
// Returns whether the static type has been set. Should only be called
// during typechecking: before typechecking it's guaranteed to be false,
// and after typechecking it's guaranteed to be true.
auto has_static_type() const -> bool { return static_type_.has_value(); }
private:
Nonnull<FunctionDefinition*> definition_;
std::string name_;
std::vector<GenericBinding> deduced_parameters_;
Nonnull<TuplePattern*> param_pattern_;
Nonnull<Pattern*> return_type_;
bool is_omitted_return_type_;
std::optional<Nonnull<Statement*>> body_;
std::optional<Nonnull<const Value*>> static_type_;
};
class ClassDeclaration : public Declaration {
executable_semantics/ast/function_definition.cpp
-37
View File
@@ -1,37 +0,0 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#include "executable_semantics/ast/function_definition.h"
namespace Carbon {
void FunctionDefinition::PrintDepth(int depth, llvm::raw_ostream& out) const {
out << "fn " << name_ << " ";
if (!deduced_parameters_.empty()) {
out << "[";
unsigned int i = 0;
for (const auto& deduced : deduced_parameters_) {
if (i != 0) {
out << ", ";
}
out << deduced.name << ":! ";
deduced.type->Print(out);
++i;
}
out << "]";
}
out << *param_pattern_;
if (!is_omitted_return_type_) {
out << " -> " << *return_type_;
}
if (body_) {
out << " {\n";
(*body_)->PrintDepth(depth, out);
out << "\n}\n";
} else {
out << ";\n";
}
}
} // namespace Carbon
executable_semantics/ast/function_definition.h
-89
View File
@@ -1,89 +0,0 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#ifndef EXECUTABLE_SEMANTICS_AST_FUNCTION_DEFINITION_H_
#define EXECUTABLE_SEMANTICS_AST_FUNCTION_DEFINITION_H_
#include "common/ostream.h"
#include "executable_semantics/ast/expression.h"
#include "executable_semantics/ast/pattern.h"
#include "executable_semantics/ast/source_location.h"
#include "executable_semantics/ast/statement.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Support/Compiler.h"
namespace Carbon {
class Value;
// TODO: expand the kinds of things that can be deduced parameters.
// For now, only generic parameters are supported.
struct GenericBinding {
std::string name;
Nonnull<const Expression*> type;
};
class FunctionDefinition {
public:
FunctionDefinition(SourceLocation source_loc, std::string name,
std::vector<GenericBinding> deduced_params,
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_(std::move(deduced_params)),
param_pattern_(param_pattern),
return_type_(return_type),
is_omitted_return_type_(is_omitted_return_type),
body_(body) {}
void Print(llvm::raw_ostream& out) const { PrintDepth(-1, out); }
void PrintDepth(int depth, llvm::raw_ostream& out) const;
LLVM_DUMP_METHOD void Dump() const { Print(llvm::errs()); }
auto source_loc() const -> SourceLocation { return source_loc_; }
auto name() const -> const std::string& { return name_; }
auto deduced_parameters() const -> llvm::ArrayRef<GenericBinding> {
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 return_type() -> Pattern& { return *return_type_; }
auto is_omitted_return_type() const -> bool {
return is_omitted_return_type_;
}
auto body() const -> std::optional<Nonnull<const Statement*>> {
return body_;
}
auto body() -> std::optional<Nonnull<Statement*>> { return body_; }
// The static type of this function. Cannot be called before typechecking.
auto static_type() const -> const Value& { return **static_type_; }
// Sets the static type of this expression. Can only be called once, during
// typechecking.
void set_static_type(Nonnull<const Value*> type) { static_type_ = type; }
// Returns whether the static type has been set. Should only be called
// during typechecking: before typechecking it's guaranteed to be false,
// and after typechecking it's guaranteed to be true.
auto has_static_type() const -> bool { return static_type_.has_value(); }
private:
SourceLocation source_loc_;
std::string name_;
std::vector<GenericBinding> deduced_parameters_;
Nonnull<TuplePattern*> param_pattern_;
Nonnull<Pattern*> return_type_;
bool is_omitted_return_type_;
std::optional<Nonnull<Statement*>> body_;
std::optional<Nonnull<const Value*>> static_type_;
};
} // namespace Carbon
#endif // EXECUTABLE_SEMANTICS_AST_FUNCTION_DEFINITION_H_