Codegen: remove global object counter

The object counter was a relic from earlier versions of the compiler. In the
current implementation (that is, the latest-released version), the counter
is completely unnecessary.

This change makes an object's (or pointer's) address completely determined
by properties of the Object entity, without reference to any mutable state
at the time of code generation (e.g., the number of objects we've already
instantiated, etc)

This, incidentally, is also a bug fix.
 - File A instantiates object 1
 - File A dynamically includes file B
 - File B instantiates object 2

Since file B is dynamically included, the two units are compiled separately.
When File B is compiled, its object counter never goes higher than 1 -- it
only ever instantiates a single object.
When File A is compiled, by the time we reach object 2, our object counter
has already been incremented once by an earlier object instantiation.
Therefore the two counters disagree with each other, and when File A later
references object 2, it guesses the *wrong address*.

Removing any dependency on mutable codegen state for address determination
means that the two units, despite being independently compiled, will always
agree on an object's address.

Author: rail5

src/bpp_include/bpp_program.cpp

@@ -190,14 +190,6 @@ uint64_t bpp_program::get_typeof_counter() const {
 	return typeof_counter;
 }
 
-void bpp_program::increment_object_counter() {
-	object_counter++;
-}
-
-uint64_t bpp_program::get_object_counter() const {
-	return object_counter;
-}
-
 void bpp_program::set_target_bash_version(BashVersion target_bash_version) {
 	this->target_bash_version = target_bash_version;
 }

src/bpp_include/bpp_program.h

@@ -32,7 +32,6 @@ class bpp_program : public bpp_code_entity, public std::enable_shared_from_this<
 		uint64_t function_counter = 0;
 		uint64_t dynamic_cast_counter = 0;
 		uint64_t typeof_counter = 0;
-		uint64_t object_counter = 0;
 
 		BashVersion target_bash_version = {5, 2};
 
@@ -97,9 +96,6 @@ class bpp_program : public bpp_code_entity, public std::enable_shared_from_this<
 		void increment_typeof_counter();
 		uint64_t get_typeof_counter() const;
 
-		void increment_object_counter();
-		uint64_t get_object_counter() const;
-
 		void set_target_bash_version(BashVersion target_bash_version);
 		BashVersion get_target_bash_version() const;
 

src/listener/handlers/ObjectInstantiation.cpp

@@ -65,8 +65,7 @@ void BashppListener::enterObjectInstantiation(std::shared_ptr<AST::ObjectInstant
 	// Note:
 	// Here, we're incrementing an internal object counter and determining the location of the object in memory AT COMPILE-TIME
 	// Should this be determined at run-time instead?
-	new_object->set_address("bpp__" + std::to_string(program->get_object_counter()) + "__" + object_class->get_name() + "__" + new_object->get_name());
-	program->increment_object_counter();
+	new_object->set_address("bpp__" + object_class->get_name() + "__" + new_object->get_name());
 
 	// Verify the object's name is valid
 	if (!bpp::is_valid_identifier(new_object->get_name())) {

src/listener/handlers/PointerDeclaration.cpp

@@ -62,8 +62,7 @@ void BashppListener::enterPointerDeclaration(std::shared_ptr<AST::PointerDeclara
 		object_type.getCharPositionInLine()
 	);
 
-	new_object->set_address("bpp____ptr__" + std::to_string(program->get_object_counter()) + "__" + new_object->get_class()->get_name() + "__" + new_object->get_name());
-	program->increment_object_counter();
+	new_object->set_address("bpp____ptr__" + new_object->get_class()->get_name() + "__" + new_object->get_name());
 
 	// Verify the object's name is valid
 	if (!bpp::is_valid_identifier(new_object->get_name())) {

test-suite/TestRunner.bpp

@@ -1,4 +1,5 @@
 @include_once "TestStats.bpp"
+@include_once "Test.bpp"
 
 @class TestRunner {
 	@public @TestStats* stats=@new TestStats

test-suite/tests/expected/dynamic-includes

@@ -0,0 +1,4 @@
+default value
+default value
+new value 1
+new value 2

test-suite/tests/expected/pointer-dereferencing

@@ -13,7 +13,7 @@ hello
 bpp__MyClass__[0-9]+
 default value
 default value
-bpp__[0-9]+__ContainingClass__containingObject
+bpp__ContainingClass__containingObject
 ContainingClass Instance
 bpp__MyClass__[0-9]+
 MyClass Instance
@@ -25,13 +25,13 @@ Displaying default value
 Displaying default value
 .+line [0-9]+: bpp__MyClass__[0-9]+: command not found
 MyClass Instance
-.+line [0-9]+: bpp__[0-9]+__ContainingClass__containingObject: command not found
+.+line [0-9]+: bpp__ContainingClass__containingObject: command not found
 ContainingClass Instance
 hello again
 hello again
 hello
 hello
-bpp__[0-9]+__ContainingClass__containingObject
+bpp__ContainingClass__containingObject
 echo hello again
 echo hello again
 new value

test-suite/tests/expected/super

@@ -3,18 +3,18 @@ Base class
 Non-virtual method in base class
 default value
 default value
-bpp__0__Derived__d
-bpp__0__Derived__d
+bpp__Derived__d
+bpp__Derived__d
 __this
 __this
 Example Instance
 Derived Instance
-bpp__Example__something bpp__0__Derived__d
-bpp__Derived__something bpp__0__Derived__d
-bpp__Example__nonVirtual bpp__0__Derived__d
-bpp__Example__nonVirtual bpp__0__Derived__d
-bpp__0__Derived__d__member
-bpp__0__Derived__d__member
+bpp__Example__something bpp__Derived__d
+bpp__Derived__something bpp__Derived__d
+bpp__Example__nonVirtual bpp__Derived__d
+bpp__Example__nonVirtual bpp__Derived__d
+bpp__Derived__d__member
+bpp__Derived__d__member
 Example Instance
 Derived Instance
 protected value

test-suite/tests/extra/dynamic-includes-helper1.bpp

@@ -0,0 +1,3 @@
+@class Object {
+	@public member="default value"
+}

test-suite/tests/extra/dynamic-includes-helper2.bpp

@@ -0,0 +1,3 @@
+@include_once "dynamic-includes-helper1.bpp"
+
+@Object obj2