mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 08:54:47 +01:00
Add string parsing and a print builtin (#721)
It was in my mind to add String in order to support libraries in `package`. `print` is added in order to have a String go to stdout. I've tried to do `print` in a way that won't be too hard to add other printable types, but it's probably also somewhat optional here -- that is, if desired, I could remove it. But it was a lot easier to doublecheck `\n` behavior with it, and I suspect it'll be helpful in other tests if it supports more value types. On the side, this also fixes dereferencing in Pattern/Expression Print() calls, which I was noticing printing pointers instead of values. This may be another argument for moving away from passing pointers, since this seems to be a difficult-to-catch error. Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
committed by
GitHub
co-authored by
Geoff Romer
parent
ecb5a611e5
commit
250ce4ab00
@@ -29,9 +29,12 @@ class Expression {
|
||||
ContinuationTypeLiteral, // The type of a continuation value.
|
||||
IntLiteral,
|
||||
PrimitiveOperatorExpression,
|
||||
StringLiteral,
|
||||
StringTypeLiteral,
|
||||
TupleLiteral,
|
||||
TypeTypeLiteral,
|
||||
IdentifierExpression,
|
||||
IntrinsicExpression,
|
||||
};
|
||||
|
||||
// Returns the enumerator corresponding to the most-derived type of this
|
||||
@@ -178,6 +181,31 @@ class BoolLiteral : public Expression {
|
||||
bool val;
|
||||
};
|
||||
|
||||
class StringLiteral : public Expression {
|
||||
public:
|
||||
explicit StringLiteral(int line_num, std::string val)
|
||||
: Expression(Kind::StringLiteral, line_num), val(std::move(val)) {}
|
||||
|
||||
static auto classof(const Expression* exp) -> bool {
|
||||
return exp->Tag() == Kind::StringLiteral;
|
||||
}
|
||||
|
||||
auto Val() const -> const std::string& { return val; }
|
||||
|
||||
private:
|
||||
std::string val;
|
||||
};
|
||||
|
||||
class StringTypeLiteral : public Expression {
|
||||
public:
|
||||
explicit StringTypeLiteral(int line_num)
|
||||
: Expression(Kind::StringTypeLiteral, line_num) {}
|
||||
|
||||
static auto classof(const Expression* exp) -> bool {
|
||||
return exp->Tag() == Kind::StringTypeLiteral;
|
||||
}
|
||||
};
|
||||
|
||||
class TupleLiteral : public Expression {
|
||||
public:
|
||||
explicit TupleLiteral(int line_num) : TupleLiteral(line_num, {}) {}
|
||||
@@ -301,6 +329,25 @@ class TypeTypeLiteral : public Expression {
|
||||
}
|
||||
};
|
||||
|
||||
class IntrinsicExpression : public Expression {
|
||||
public:
|
||||
enum class IntrinsicKind {
|
||||
Print,
|
||||
};
|
||||
|
||||
explicit IntrinsicExpression(IntrinsicKind intrinsic)
|
||||
: Expression(Kind::IntrinsicExpression, -1), intrinsic(intrinsic) {}
|
||||
|
||||
static auto classof(const Expression* exp) -> bool {
|
||||
return exp->Tag() == Kind::IntrinsicExpression;
|
||||
}
|
||||
|
||||
auto Intrinsic() const -> IntrinsicKind { return intrinsic; }
|
||||
|
||||
private:
|
||||
IntrinsicKind intrinsic;
|
||||
};
|
||||
|
||||
} // namespace Carbon
|
||||
|
||||
#endif // EXECUTABLE_SEMANTICS_AST_EXPRESSION_H_
|
||||
|
||||
Reference in New Issue
Block a user