Made it compilable on non-multiplicity perl again

Author: Leont

.gitignore

@@ -7,6 +7,7 @@ _build/
 perl++/headers/config.h
 perl++/headers/extend.h
 perl++/source/evaluate.C
+perl++/headers/multiplicity.h
 test.out
 Build
 MYMETA.yml

MANIFEST

@@ -50,6 +50,7 @@ perl++/source/hash.C
 perl++/source/helpers.C
 perl++/source/internal.h
 perl++/source/interpreter.C
+perl++/source/multiplicity.h.PL
 perl++/source/primitives.C
 perl++/source/reference.C
 perl++/source/regex.C

MANIFEST.SKIP

@@ -11,5 +11,6 @@ libperl\+\+-.*\.tar\.gz
 ^MYMETA\.yml$
 ^perl\+\+/headers/config\.h$
 ^perl\+\+/headers/extend\.h$
+^perl\+\+/headers/multiplicity.h$
 ^perl\+\+/source/evaluate\.C$
 ^ppport\.h$

inc/Perlpp/Build.pm

@@ -24,6 +24,11 @@ my %cpp_files = (
 	portable('perl++/source/extend.pre') => portable('perl++/headers/extend.h'),
 );
 
+my %perl_files = (
+	portable('perl++/source/evaluate.C.PL')     => portable('perl++/source/evaluate.C'),
+	portable('perl++/source/multiplicity.h.PL') => portable('perl++/headers/multiplicity.h'),
+);
+
 my %examples = (
 	executables => [ qw/combined game/ ],
 	libraries   => [ qw/Extend Extend2/ ]
@@ -46,7 +51,9 @@ my %action_map = (
 			$builder->process_cpp($input, $output);
 		}
 
-		$builder->process_perl(portable('perl++/source/evaluate.C.PL'), portable('perl++/source/evaluate.C'));
+		while (my ($input, $output) = each %perl_files) {
+			$builder->process_perl($input, $output);
+		}
 	},
 	'perl++'  => sub {
 		my $builder = shift;

perl++/headers/interpreter.h

@@ -45,7 +45,7 @@ namespace perl {
 
 		bool has_magic_string(interpreter*, SV*);
 
-		typedef int (*magic_fun)(interpreter*, SV*, MAGIC*);
+		typedef int (*magic_fun)(pTHX_ SV*, MAGIC*);
 		void attach_getset_magic(interpreter* interp, SV* var, magic_fun get_val, magic_fun set_val, const void* buffer, size_t buffer_length);
 
 		void* get_magic_ptr(const MAGIC*);
@@ -69,15 +69,15 @@ namespace perl {
 					(object.*writer)(arg);
 				}
 				public:
-				static int read(interpreter* interp, SV* var, MAGIC* magic_ptr) {
+				static int read(pTHX_ SV* var, MAGIC* magic_ptr) {
 					const Wrapper& tmp = *implementation::get_magic_ptr<Wrapper>(magic_ptr);
-					Scalar::Temp val(interp, var, false);
+					Scalar::Temp val(aTHX_ var, false);
 					tmp.read(val);
 					return 0;
 				}
-				static int write(interpreter* interp, SV* var, MAGIC* magic_ptr) {
+				static int write(pTHX_ SV* var, MAGIC* magic_ptr) {
 					const Wrapper& tmp = *implementation::get_magic_ptr<Wrapper>(magic_ptr);
-					Scalar::Temp val(interp, var, false);
+					Scalar::Temp val(aTHX_ var, false);
 					tmp.write(val);
 					return 0;
 				}

perl++/headers/perl++.h

@@ -37,6 +37,7 @@
 #endif
 
 // I split the header, to ease working with it.
+#include <perl++/multiplicity.h>
 #include <perl++/config.h>
 #include <perl++/helpers.h>
 #include <perl++/scalar.h>

perl++/source/exporter.C

@@ -67,7 +67,7 @@ namespace perl {
 		Perl_mark::Perl_mark(int _ax, SV** _mark, unsigned _items) : ax(_ax), mark(_mark), items(_items) {
 		}
 
-		const Code::Value export_as(interpreter* interp, const char* name, void (*func)(interpreter* , CV*), const void* buffer, int length) {
+		const Code::Value export_as(interpreter* interp, const char* name, void (*func)(pTHX_ CV*), const void* buffer, int length) {
 			static char nothing[] = "";
 			CV* const tmp = newXS(const_cast<char *>(name), func, nothing);
 			implementation::set_magic_string(interp, reinterpret_cast<SV*>(tmp), static_cast<const char*>(buffer), length);

perl++/source/interpreter.C

@@ -8,7 +8,7 @@
 extern "C" {
 	void boot_DynaLoader(pTHX_ CV* cv);
 
-	static void xs_init(interpreter* interp) {
+	static void xs_init(pTHX) {
 		dXSUB_SYS;
 		newXS(const_cast<char*>("DynaLoader::boot_DynaLoader"), boot_DynaLoader, const_cast<char*>(__FILE__));
 	}
@@ -69,9 +69,11 @@ namespace perl {
 	Interpreter::Interpreter(interpreter* other, const override&) : raw_interp(other, noop) {
 		eval(implementation::to_eval);
 	}
+#ifdef MULTIPLICITY
 	Interpreter Interpreter::clone() const {
 		return Interpreter(perl_clone(interp, CLONEf_KEEP_PTR_TABLE), override()); // FIXME reference counting
 	}
+#endif
 	bool operator==(const Interpreter& first, const Interpreter& second) {
 		return first.raw_interp == second.raw_interp;
 	}
@@ -199,7 +201,7 @@ namespace perl {
 			family.insert(&type);
 		}
 
-		MGVTBL* get_object_vtbl(const std::type_info& pre_key, int (*destruct_ptr)(interpreter*, SV*, MAGIC*)) {
+		MGVTBL* get_object_vtbl(const std::type_info& pre_key, int (*destruct_ptr)(pTHX_ SV*, MAGIC*)) {
 			static boost::ptr_map<const std::type_info*, MGVTBL> table;
 			const std::type_info* key = &pre_key;
 			if (table.find(key) == table.end()) {
@@ -253,7 +255,7 @@ namespace perl {
 			package_name = SvPV_nolen(ST(0));
 		}
 		Package Exporter_helper::get_package() {
-			return Package(aTHX_ package_name);
+			return Package(interp, package_name);
 		}
 		Exporter_helper::~Exporter_helper() {
 			int ax = axp;

perl++/source/multiplicity.h.PL

@@ -0,0 +1,21 @@
+#! /usr/bin/perl -T
+
+use strict;
+use warnings FATAL => 'all';
+use Config;
+
+local $\ = "\n";
+print q/#ifndef pTHX_/;
+if ($Config{usethreads}) {
+	print q/#define aTHX interp,/;
+	print q/#define aTHX_ aTHX,/;
+	print q/#define pTHX register interpreter* interp/;
+	print q/#define pTHX_ pTHX,/;
+}
+else {
+	print q/#define aTHX/;
+	print q/#define aTHX_/;
+	print q/#define pTHX/;
+	print q/#define pTHX_/;
+}
+print q/#endif/;