Merge pull request #92 from AjayBrahmakshatriya/master

Fixed bug with dyn_var<T*> requiring T to be completely defined

Author: AjayBrahmakshatriya

include/builder/dyn_var.h

@@ -440,12 +440,17 @@ class dyn_var<T *>
 		return (cast)(this->dyn_var_impl<T*>::operator*());
 	}
 	// Hack for creating a member that's live across return site
-	dyn_var<T> _p = as_member(this, "_p");
+	
+	std::unique_ptr<dyn_var<T>> _p = nullptr;
+
 	dyn_var<T> *operator->() {
 		auto b = this->operator[](0);
 		b.encompassing_expr->template setMetadata<bool>("deref_is_star", true);
-		_p = (cast)b;
-		return _p.addr();
+		if (_p == nullptr) {
+			_p = std::unique_ptr<dyn_var<T>>(new dyn_var<T>(as_member(this, "_p")));	
+		}
+		*_p = (cast)b;
+		return _p->addr();
 	}
 };
 

samples/outputs.var_names/sample63

@@ -0,0 +1,5 @@
+void bar (void) {
+  linked_list* x_0;
+  ((x_0->next)->next)->next = 0;
+}
+

samples/outputs/sample63

@@ -0,0 +1,5 @@
+void bar (void) {
+  linked_list* var0;
+  ((var0->next)->next)->next = 0;
+}
+

samples/sample63.cpp

@@ -0,0 +1,29 @@
+// Include the headers
+#include "blocks/c_code_generator.h"
+#include "builder/static_var.h"
+#include "builder/dyn_var.h"
+#include "blocks/rce.h"
+#include <iostream>
+
+// Include the BuildIt types
+using builder::dyn_var;
+using builder::static_var;
+
+struct linked_list {
+	static constexpr const char* type_name = "linked_list";
+	dyn_var<linked_list*> next = builder::with_name("next");
+};
+
+static void bar(void) {
+	dyn_var<struct linked_list*> x;
+	x->next->next->next = 0;
+}
+
+int main(int argc, char* argv[]) {
+	builder::builder_context context;
+	auto ast = context.extract_function_ast(bar, "bar");
+	block::c_code_generator::generate_code(ast, std::cout, 0);
+	return 0;
+}
+
+