escape: Add escape notes to export data.
Change-Id: Ibc54db9b703d543ea784edc97b03be1eb0038584
Reviewed-on: https://go-review.googlesource.com/22375
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/go/export.cc b/go/export.cc
index 5c0094d..e07246e 100644
--- a/go/export.cc
+++ b/go/export.cc
@@ -436,6 +436,21 @@
this->type_refs_[type] = index;
}
+// Export escape note.
+
+void
+Export::write_escape(std::string* note)
+{
+ if (note != NULL && *note != "esc:0x0")
+ {
+ this->write_c_string(" ");
+ char buf[50];
+ go_assert(note->find("esc:") != std::string::npos);
+ snprintf(buf, sizeof buf, "<%s>", note->c_str());
+ this->write_c_string(buf);
+ }
+}
+
// Add the builtin types to the export table.
void
diff --git a/go/export.h b/go/export.h
index 0526e9a..c3972d8 100644
--- a/go/export.h
+++ b/go/export.h
@@ -161,6 +161,11 @@
void
write_type(const Type*);
+ // Write the escape note to the export stream. If NOTE is NULL, write
+ // nothing.
+ void
+ write_escape(std::string* note);
+
private:
Export(const Export&);
Export& operator=(const Export&);
diff --git a/go/gogo.cc b/go/gogo.cc
index e373d8b..37760a7 100644
--- a/go/gogo.cc
+++ b/go/gogo.cc
@@ -4794,6 +4794,7 @@
exp->write_c_string("(");
const Typed_identifier* receiver = fntype->receiver();
exp->write_name(receiver->name());
+ exp->write_escape(receiver->note());
exp->write_c_string(" ");
exp->write_type(receiver->type());
exp->write_c_string(") ");
@@ -4817,6 +4818,7 @@
else
exp->write_c_string(", ");
exp->write_name(p->name());
+ exp->write_escape(p->note());
exp->write_c_string(" ");
if (!is_varargs || p + 1 != parameters->end())
exp->write_type(p->type());
@@ -4850,6 +4852,7 @@
else
exp->write_c_string(", ");
exp->write_name(p->name());
+ exp->write_escape(p->note());
exp->write_c_string(" ");
exp->write_type(p->type());
}
@@ -4875,9 +4878,11 @@
{
imp->require_c_string("(");
std::string name = imp->read_name();
+ std::string escape_note = imp->read_escape();
imp->require_c_string(" ");
Type* rtype = imp->read_type();
*preceiver = new Typed_identifier(name, rtype, imp->location());
+ (*preceiver)->set_note(escape_note);
imp->require_c_string(") ");
}
@@ -4894,6 +4899,7 @@
while (true)
{
std::string name = imp->read_name();
+ std::string escape_note = imp->read_escape();
imp->require_c_string(" ");
if (imp->match_c_string("..."))
@@ -4905,8 +4911,9 @@
Type* ptype = imp->read_type();
if (*is_varargs)
ptype = Type::make_array_type(ptype, NULL);
- parameters->push_back(Typed_identifier(name, ptype,
- imp->location()));
+ Typed_identifier t = Typed_identifier(name, ptype, imp->location());
+ t.set_note(escape_note);
+ parameters->push_back(t);
if (imp->peek_char() != ',')
break;
go_assert(!*is_varargs);
@@ -4934,10 +4941,13 @@
while (true)
{
std::string name = imp->read_name();
+ std::string note = imp->read_escape();
imp->require_c_string(" ");
Type* rtype = imp->read_type();
- results->push_back(Typed_identifier(name, rtype,
- imp->location()));
+ Typed_identifier t = Typed_identifier(name, rtype,
+ imp->location());
+ t.set_note(note);
+ results->push_back(t);
if (imp->peek_char() != ',')
break;
imp->require_c_string(", ");
diff --git a/go/import.cc b/go/import.cc
index 8a6dd78..b90ea83 100644
--- a/go/import.cc
+++ b/go/import.cc
@@ -762,6 +762,42 @@
return type;
}
+// Read an escape note.
+
+std::string
+Import::read_escape()
+{
+ if (this->match_c_string(" <esc:"))
+ {
+ Stream* stream = this->stream_;
+ this->require_c_string(" <esc:");
+
+ std::string escape = "esc:";
+ int c;
+ while (true)
+ {
+ c = stream->get_char();
+ if (c != 'x' && !ISXDIGIT(c))
+ break;
+ escape += c;
+ }
+
+ if (c != '>')
+ {
+ error_at(this->location(),
+ "error in import data at %d: expect %< %> or %<>%>, got %c",
+ stream->pos(), c);
+ stream->set_saw_error();
+ stream->advance(1);
+ escape = Escape_note::make_tag(Node::ESCAPE_UNKNOWN);
+ }
+ return escape;
+ }
+ else
+ return Escape_note::make_tag(Node::ESCAPE_UNKNOWN);
+}
+
+
// Register the builtin types.
void
diff --git a/go/import.h b/go/import.h
index 2a9ac80..9dbdaf7 100644
--- a/go/import.h
+++ b/go/import.h
@@ -197,6 +197,10 @@
Type*
read_type();
+ // Read an escape note.
+ std::string
+ read_escape();
+
private:
static Stream*
try_package_in_directory(const std::string&, Location);
