Implemented +replacing for non-functions

README.md

@@ -1,6 +1,6 @@
 # Inform 7
 
-[Version](notes/versioning.md): 10.2.0-beta+6V80 'Krypton' (9 October 2022)
+[Version](notes/versioning.md): 10.2.0-beta+6V81 'Krypton' (10 October 2022)
 
 ## About Inform
 

build.txt

@@ -1,3 +1,3 @@
 Prerelease: beta
-Build Date: 9 October 2022
-Build Number: 6V80
+Build Date: 10 October 2022
+Build Number: 6V81

inform7/Internal/Inter/BasicInformExtrasKit/kit_metadata.json

@@ -2,7 +2,7 @@
     "is": {
         "type": "kit",
         "title": "BasicInformExtrasKit",
-        "version": "10.2.0-beta+6V80"
+        "version": "10.2.0-beta+6V81"
     },
     "kit-details": {
         "has-priority": 1

inform7/Internal/Inter/BasicInformKit/kit_metadata.json

@@ -2,7 +2,7 @@
     "is": {
         "type": "kit",
         "title": "BasicInformKit",
-        "version": "10.2.0-beta+6V80"
+        "version": "10.2.0-beta+6V81"
     },
     "needs": [ {
         "unless": {

inform7/Internal/Inter/CommandParserKit/kit_metadata.json

@@ -2,7 +2,7 @@
     "is": {
         "type": "kit",
         "title": "CommandParserKit",
-        "version": "10.2.0-beta+6V80"
+        "version": "10.2.0-beta+6V81"
     },
     "needs": [ {
         "need": {

inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json

@@ -2,7 +2,7 @@
     "is": {
         "type": "kit",
         "title": "EnglishLanguageKit",
-        "version": "10.2.0-beta+6V80"
+        "version": "10.2.0-beta+6V81"
     },
     "needs": [ {
         "need": {

inform7/Internal/Inter/WorldModelKit/kit_metadata.json

@@ -2,7 +2,7 @@
     "is": {
         "type": "kit",
         "title": "WorldModelKit",
-        "version": "10.2.0-beta+6V80"
+        "version": "10.2.0-beta+6V81"
     },
     "needs": [ {
         "need": {

inter/pipeline-module/Chapter 3/Compile Splats Stage.w

@@ -232,6 +232,7 @@ the result, declare a symbol for it, and then define that symbol.
 
 	inter_symbol *made_s;
 	@<Declare the Inter symbol for what we will shortly make@>;
+	CompileSplatsStage::apply_annotations(SplatInstruction::I6_annotation(P), made_s);
 	if ((directive == ATTRIBUTE_PLM) || (directive == PROPERTY_PLM))
 	    @<Declare a property ID symbol to go with it@>;
 	

notes/working_notes.md

@@ -37,7 +37,16 @@ implemented. So for example, placing this function in (say) `ExampleKit`...
 	];
 
 ...causes it to replace the more arithmetical definition of a function with
-the same name in `BasicInformKit`. Equally, source text for a project could say:
+the same name in `BasicInformKit`. More specifically:
+
+	+replacing(from BasicInformKit) [ SquareRoot num;
+		"Nobody cares about square roots, son.";
+	];
+
+replaces the definition if it occurs in `BasicInformKit` but not from anywhere
+else. This all gives kits an ability to make replacements which they didn't
+previously have. The same annotation can also be used in the source text for
+a project:
 
 	Include (-
 		+replacing [ SquareRoot num;
@@ -45,8 +54,18 @@ the same name in `BasicInformKit`. Equally, source text for a project could say:
 		];
 	-).	
 
-(Note that this use of `Include` does not end with `replacing "SquareRoot"`,
-the previous best way to do this.) Either way, given something like:
+This is, in a sense, not a new ability since it was already possible to write:
+
+	Include (-
+		[ SquareRoot num;
+			"Nobody cares about square roots, son.";
+		];
+	-) replacing "SquareRoot".
+
+But the new notation allows individual definitions to be marked as replacements
+and makes it much easier to make long runs of replacements.
+
+The effect of all of these alternatives is that given something like:
 
 	When play begins:
 		showme the square root of 100.