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

Replace int lines with file-associated SourceLocations (#779)

Browse Source 
Most interesting changes should be ast/source_location.h and syntax/parse_and_lex_context.h
This commit is contained in:
Jon Meow
2021-08-26 10:07:16 -07:00
committed by GitHub
parent 33daf64329
commit 3ec550a85f
46 changed files with 607 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/statement.h
+29 -27
View File
@@ -10,6 +10,7 @@
#include "common/ostream.h"
#include "executable_semantics/ast/expression.h"
#include "executable_semantics/ast/pattern.h"
#include "executable_semantics/ast/source_location.h"
#include "llvm/Support/Compiler.h"
namespace Carbon {
@@ -37,7 +38,7 @@ class Statement {
// object.
auto Tag() const -> Kind { return tag; }
auto LineNumber() const -> int { return line_num; }
auto SourceLoc() const -> SourceLocation { return loc; }
void Print(llvm::raw_ostream& out) const { PrintDepth(-1, out); }
void PrintDepth(int depth, llvm::raw_ostream& out) const;
@@ -47,17 +48,17 @@ class Statement {
// Constructs an Statement representing syntax at the given line number.
// `tag` must be the enumerator corresponding to the most-derived type being
// constructed.
Statement(Kind tag, int line_num) : tag(tag), line_num(line_num) {}
Statement(Kind tag, SourceLocation loc) : tag(tag), loc(loc) {}
private:
const Kind tag;
int line_num;
SourceLocation loc;
};
class ExpressionStatement : public Statement {
public:
ExpressionStatement(int line_num, const Expression* exp)
: Statement(Kind::ExpressionStatement, line_num), exp(exp) {}
ExpressionStatement(SourceLocation loc, const Expression* exp)
: Statement(Kind::ExpressionStatement, loc), exp(exp) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::ExpressionStatement;
@@ -71,8 +72,8 @@ class ExpressionStatement : public Statement {
class Assign : public Statement {
public:
Assign(int line_num, const Expression* lhs, const Expression* rhs)
: Statement(Kind::Assign, line_num), lhs(lhs), rhs(rhs) {}
Assign(SourceLocation loc, const Expression* lhs, const Expression* rhs)
: Statement(Kind::Assign, loc), lhs(lhs), rhs(rhs) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Assign;
@@ -88,8 +89,9 @@ class Assign : public Statement {
class VariableDefinition : public Statement {
public:
VariableDefinition(int line_num, const Pattern* pat, const Expression* init)
: Statement(Kind::VariableDefinition, line_num), pat(pat), init(init) {}
VariableDefinition(SourceLocation loc, const Pattern* pat,
const Expression* init)
: Statement(Kind::VariableDefinition, loc), pat(pat), init(init) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::VariableDefinition;
@@ -105,9 +107,9 @@ class VariableDefinition : public Statement {
class If : public Statement {
public:
If(int line_num, const Expression* cond, const Statement* then_stmt,
If(SourceLocation loc, const Expression* cond, const Statement* then_stmt,
const Statement* else_stmt)
: Statement(Kind::If, line_num),
: Statement(Kind::If, loc),
cond(cond),
then_stmt(then_stmt),
else_stmt(else_stmt) {}
@@ -128,7 +130,7 @@ class If : public Statement {
class Return : public Statement {
public:
Return(int line_num, const Expression* exp, bool is_omitted_exp);
Return(SourceLocation loc, const Expression* exp, bool is_omitted_exp);
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Return;
@@ -144,8 +146,8 @@ class Return : public Statement {
class Sequence : public Statement {
public:
Sequence(int line_num, const Statement* stmt, const Statement* next)
: Statement(Kind::Sequence, line_num), stmt(stmt), next(next) {}
Sequence(SourceLocation loc, const Statement* stmt, const Statement* next)
: Statement(Kind::Sequence, loc), stmt(stmt), next(next) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Sequence;
@@ -161,8 +163,8 @@ class Sequence : public Statement {
class Block : public Statement {
public:
Block(int line_num, const Statement* stmt)
: Statement(Kind::Block, line_num), stmt(stmt) {}
Block(SourceLocation loc, const Statement* stmt)
: Statement(Kind::Block, loc), stmt(stmt) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Block;
@@ -176,8 +178,8 @@ class Block : public Statement {
class While : public Statement {
public:
While(int line_num, const Expression* cond, const Statement* body)
: Statement(Kind::While, line_num), cond(cond), body(body) {}
While(SourceLocation loc, const Expression* cond, const Statement* body)
: Statement(Kind::While, loc), cond(cond), body(body) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::While;
@@ -193,7 +195,7 @@ class While : public Statement {
class Break : public Statement {
public:
explicit Break(int line_num) : Statement(Kind::Break, line_num) {}
explicit Break(SourceLocation loc) : Statement(Kind::Break, loc) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Break;
@@ -202,7 +204,7 @@ class Break : public Statement {
class Continue : public Statement {
public:
explicit Continue(int line_num) : Statement(Kind::Continue, line_num) {}
explicit Continue(SourceLocation loc) : Statement(Kind::Continue, loc) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Continue;
@@ -211,9 +213,9 @@ class Continue : public Statement {
class Match : public Statement {
public:
Match(int line_num, const Expression* exp,
Match(SourceLocation loc, const Expression* exp,
std::list<std::pair<const Pattern*, const Statement*>>* clauses)
: Statement(Kind::Match, line_num), exp(exp), clauses(clauses) {}
: Statement(Kind::Match, loc), exp(exp), clauses(clauses) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Match;
@@ -237,9 +239,9 @@ class Match : public Statement {
// }
class Continuation : public Statement {
public:
Continuation(int line_num, std::string continuation_variable,
Continuation(SourceLocation loc, std::string continuation_variable,
const Statement* body)
: Statement(Kind::Continuation, line_num),
: Statement(Kind::Continuation, loc),
continuation_variable(std::move(continuation_variable)),
body(body) {}
@@ -262,8 +264,8 @@ class Continuation : public Statement {
// __run <argument>;
class Run : public Statement {
public:
Run(int line_num, const Expression* argument)
: Statement(Kind::Run, line_num), argument(argument) {}
Run(SourceLocation loc, const Expression* argument)
: Statement(Kind::Run, loc), argument(argument) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Run;
@@ -280,7 +282,7 @@ class Run : public Statement {
// __await;
class Await : public Statement {
public:
explicit Await(int line_num) : Statement(Kind::Await, line_num) {}
explicit Await(SourceLocation loc) : Statement(Kind::Await, loc) {}
static auto classof(const Statement* stmt) -> bool {
return stmt->Tag() == Kind::Await;