mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-28 20:24:54 +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
@@ -67,7 +67,7 @@ static void PrintFields(llvm::raw_ostream& out,
|
||||
const std::vector<FieldInitializer>& fields) {
|
||||
llvm::ListSeparator sep;
|
||||
for (const auto& field : fields) {
|
||||
out << sep << field.name << " = " << field.expression;
|
||||
out << sep << field.name << " = " << *field.expression;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,6 +129,14 @@ void Expression::Print(llvm::raw_ostream& out) const {
|
||||
case Expression::Kind::IntTypeLiteral:
|
||||
out << "i32";
|
||||
break;
|
||||
case Expression::Kind::StringLiteral:
|
||||
out << "\"";
|
||||
out.write_escaped(cast<StringLiteral>(*this).Val());
|
||||
out << "\"";
|
||||
break;
|
||||
case Expression::Kind::StringTypeLiteral:
|
||||
out << "String";
|
||||
break;
|
||||
case Expression::Kind::TypeTypeLiteral:
|
||||
out << "Type";
|
||||
break;
|
||||
@@ -140,6 +148,13 @@ void Expression::Print(llvm::raw_ostream& out) const {
|
||||
out << "fn " << *fn.Parameter() << " -> " << *fn.ReturnType();
|
||||
break;
|
||||
}
|
||||
case Expression::Kind::IntrinsicExpression:
|
||||
out << "intrinsic_expression(";
|
||||
switch (cast<IntrinsicExpression>(*this).Intrinsic()) {
|
||||
case IntrinsicExpression::IntrinsicKind::Print:
|
||||
out << "print";
|
||||
}
|
||||
out << ")";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user