gccrs: libproc_macro: Add remaining drop functions

Remaining structures from the rust bridge that missed a drop function
now have one.

libgrust/ChangeLog:

	* libproc_macro/group.cc (Group::drop): Add drop
	implementation.
	* libproc_macro/group.h: Add drop prototype.
	* libproc_macro/tokenstream.cc (TokenStream::drop): Add
	drop implementation.
	(TokenStream__drop): Change to a call to TokenStream::drop.
	* libproc_macro/tokenstream.h: Add drop prototype.
	* libproc_macro/tokentree.cc (TokenTree::drop): Add
	drop implementation.
	* libproc_macro/tokentree.h: Add drop prototype.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

diff --git a/libgrust/libproc_macro/group.cc b/libgrust/libproc_macro/group.cc
index e6fdce5f84e2689d5282b3d4b8137b258948b9e0..c5948ed03c79d97e8d0dcf98240a8cb54816aa93 100644 (file)
--- a/libgrust/libproc_macro/group.cc
+++ b/libgrust/libproc_macro/group.cc
@@ -30,4 +30,10 @@ Group::make_group (TokenStream::TokenStream stream, Delimiter delim)
   return {delim, stream};
 }
 
+void
+Group::drop (Group *g)
+{
+  TokenStream::TokenStream::drop (&g->stream);
+}
+
 } // namespace Group

diff --git a/libgrust/libproc_macro/group.h b/libgrust/libproc_macro/group.h
index 09a7add70e086f01d8d62d2a37899f25a452ab96..bf2a23ff3ecfd8fbe1a00ba4837f91d033db1dee 100644 (file)
--- a/libgrust/libproc_macro/group.h
+++ b/libgrust/libproc_macro/group.h
@@ -42,6 +42,8 @@ struct Group
 
 public:
   static Group make_group (TokenStream::TokenStream stream, Delimiter delim);
+
+  static void drop (Group *g);
 };
 
 } // namespace Group

diff --git a/libgrust/libproc_macro/tokenstream.cc b/libgrust/libproc_macro/tokenstream.cc
index b8116c1735ac1d93b8cf684cca405631a53d0c09..921cc22bf13960e70b95dbe000760d976a8e82cb 100644 (file)
--- a/libgrust/libproc_macro/tokenstream.cc
+++ b/libgrust/libproc_macro/tokenstream.cc
@@ -64,6 +64,18 @@ TokenStream::push (TokenTree::TokenTree tree)
   size++;
 }
 
+void
+TokenStream::drop (TokenStream *stream)
+{
+  for (std::uint64_t i = 0; i < stream->size; i++)
+    {
+      TokenTree::TokenTree::drop (&stream->data[i]);
+    }
+  delete[] stream->data;
+  stream->capacity = 0;
+  stream->size = 0;
+}
+
 extern "C" TokenStream
 TokenStream__new ()
 {
@@ -101,10 +113,7 @@ TokenStream__clone (const TokenStream *ts)
 extern "C" void
 TokenStream__drop (TokenStream *stream)
 {
-  // FIXME: Also drop stream components
-  delete[] stream->data;
-  stream->capacity = 0;
-  stream->size = 0;
+  TokenStream::drop (stream);
 }
 
 } // namespace TokenStream

diff --git a/libgrust/libproc_macro/tokenstream.h b/libgrust/libproc_macro/tokenstream.h
index 513553e1b2b46e03944806dea91c1401f267df82..909e6f441b2be11fd91497d51cbe881335b3b1e3 100644 (file)
--- a/libgrust/libproc_macro/tokenstream.h
+++ b/libgrust/libproc_macro/tokenstream.h
@@ -49,6 +49,8 @@ public:
   static TokenStream make_tokenstream (std::vector<TokenTree::TokenTree> vec);
   static TokenStream make_tokenstream (std::uint64_t capacity
                                       = DEFAULT_CAPACITY);
+
+  static void drop (TokenStream *stream);
 };
 
 extern "C" TokenStream

diff --git a/libgrust/libproc_macro/tokentree.cc b/libgrust/libproc_macro/tokentree.cc
index fd9d9815a890c57e4e1fdd94b542ac90ed779613..924e50c6f3b85ee0358a7781fc8854d5d858ffbd 100644 (file)
--- a/libgrust/libproc_macro/tokentree.cc
+++ b/libgrust/libproc_macro/tokentree.cc
@@ -56,4 +56,23 @@ TokenTree::make_tokentree (Literal::Literal literal)
   return {LITERAL, payload};
 }
 
+void
+TokenTree::drop (TokenTree *tt)
+{
+  switch (tt->tag)
+    {
+    case GROUP:
+      Group::Group::drop (&tt->payload.group);
+      break;
+    case IDENT:
+      Ident::Ident::drop (&tt->payload.ident);
+      break;
+    case LITERAL:
+      Literal::Literal::drop (&tt->payload.literal);
+      break;
+    case PUNCT:
+      break;
+    }
+}
+
 } // namespace TokenTree

diff --git a/libgrust/libproc_macro/tokentree.h b/libgrust/libproc_macro/tokentree.h
index a982bfcc1ee373bc93f7acbf7aa999084c298cc5..86fc5eb2688653be50674bc629c9c52c798ce42b 100644 (file)
--- a/libgrust/libproc_macro/tokentree.h
+++ b/libgrust/libproc_macro/tokentree.h
@@ -56,6 +56,8 @@ public:
   static TokenTree make_tokentree (Ident::Ident ident);
   static TokenTree make_tokentree (Punct::Punct punct);
   static TokenTree make_tokentree (Literal::Literal literal);
+
+  static void drop (TokenTree *tt);
 };
 
 } // namespace TokenTree