Meta-Safe requirement

Author: Nyan11

src/ExecutableRequirements-Tests/ExReqMockRequirements.class.st

@@ -136,7 +136,7 @@ ExReqMockRequirements >> testReq7 [
 		  addVerification: [ :verify |
 			  verify
 				  addStepOnAST:
-					 ((ExReqMockRequirements methodNamed: #testReq1) ast allChildren
+					  ((ExReqMockRequirements methodNamed: #testReq1) ast allChildren
 						   select: [ :each | each isSequence ]) first
 				  withPrecondition: [ :obj :arguments :requirement | true ]
 				  withPostcondition: [ :obj :arguments :requirement | true ] ];

src/ExecutableRequirements-Tests/ExReqMockTestObject.class.st

@@ -9,9 +9,19 @@ Class {
 	#tag : 'Safe-Passing-Control'
 }
 
+{ #category : 'as yet unclassified' }
+ExReqMockTestObject >> methodToTestMetaSafeRecursion [
+
+	^ true
+]
+
 { #category : 'as yet unclassified' }
 ExReqMockTestObject >> methodToTestTheNonLocalReturn [
 
 	x := [ true ifTrue: [ ^ Color red ] ] value.
 	^ Color blue
 ]
+
+{ #category : 'as yet unclassified' }
+ExReqMockTestObject >> methodToTestThread [
+]

src/ExecutableRequirements-Tests/ExReqSafePassingControlTest.class.st

@@ -16,6 +16,38 @@ ExReqSafePassingControlTest >> report [
 	^ report
 ]
 
+{ #category : 'as yet unclassified' }
+ExReqSafePassingControlTest >> req1 [
+
+	<ExReqSafePassingControl>
+	^ ExReqRequirement new
+		  title:
+			  'A requirement verifications shall handle meta-safe recursion';
+		  addVerification: [ :verify |
+			  verify
+				  addStepOnAST:
+					  (ExReqMockTestObject methodNamed:
+							   #methodToTestMetaSafeRecursion) ast
+				  withPrecondition: [
+					  ExReqMockTestObject new methodToTestMetaSafeRecursion ]
+				  withPostcondition: [
+					  ExReqMockTestObject new methodToTestMetaSafeRecursion ] ];
+		  yourself
+]
+
+{ #category : 'as yet unclassified' }
+ExReqSafePassingControlTest >> req2 [
+
+	<ExReqSafePassingControl>
+	^ ExReqRequirement new
+		  title:
+			  'A requirement verifications shall manage evaluation in a NON thread-specific maner.';
+		  addVerification: [ :verify |
+			  verify addStepOnAST:
+					  (ExReqMockTestObject methodNamed: #methodToTestThread) ast ];
+		  yourself
+]
+
 { #category : 'as yet unclassified' }
 ExReqSafePassingControlTest >> req3 [
 
@@ -53,6 +85,18 @@ ExReqSafePassingControlTest >> tearDown [
 	repository := nil
 ]
 
+{ #category : 'tests' }
+ExReqSafePassingControlTest >> testMetaSafeRecursion [
+
+	| requirement requirementReport |
+	self report installTracingPoints.
+	ExReqMockTestObject new methodToTestMetaSafeRecursion.
+	requirement := self req1.
+	requirementReport := self report findRequirementReport: requirement.
+	self assert: requirementReport isValid.
+	self report removeTracingPoints
+]
+
 { #category : 'tests' }
 ExReqSafePassingControlTest >> testNonLocalReturn [
 
@@ -64,3 +108,27 @@ ExReqSafePassingControlTest >> testNonLocalReturn [
 	self assert: requirementReport isValid.
 	self report removeTracingPoints
 ]
+
+{ #category : 'tests' }
+ExReqSafePassingControlTest >> testThread [
+
+	| block return checkAssert requirement requirementReport |
+	checkAssert := Semaphore new.
+	self report installTracingPoints.
+	requirement := self req2.
+	requirementReport := self report findRequirementReport: requirement.
+	
+	block := [
+	         ExReqMockTestObject new methodToTestThread.
+	         checkAssert signal ].
+	return := block fork.
+
+	"Returns immediately, forked block not yet run"
+	self deny: requirementReport isValid.
+
+	"Forked process has been scheduled"
+	checkAssert wait.
+	self assert: requirementReport isValid.
+
+	self report removeTracingPoints
+]

src/ExecutableRequirements/ExReqAbstractSourceDocument.class.st

@@ -11,17 +11,21 @@ Class {
 
 { #category : 'as yet unclassified' }
 ExReqAbstractSourceDocument >> equalsSource: anExReqSourceDocument [
-	self method == anExReqSourceDocument method
-		ifTrue: [ ^ true ].
-	self method class = anExReqSourceDocument method class
-		ifFalse: [ ^ false ].
-	self method size = anExReqSourceDocument method size
-		ifFalse: [ ^ false ].
-	self method header = anExReqSourceDocument method header
+
+	self method == anExReqSourceDocument method ifTrue: [ ^ true ].
+	self method ifNil: [ ^ false ].
+	anExReqSourceDocument method ifNil: [ ^ false ].
+	self method selector = anExReqSourceDocument method selector
 		ifFalse: [ ^ false ].
+	self method class = anExReqSourceDocument method class ifFalse: [
+		^ false ].
+	self method size = anExReqSourceDocument method size ifFalse: [
+		^ false ].
+	self method header = anExReqSourceDocument method header ifFalse: [
+		^ false ].
 	self method initialPC to: self method endPC do: [ :i |
-		(self method at: i) = (anExReqSourceDocument method at: i)
-			ifFalse: [ ^ false ] ].
+		(self method at: i) = (anExReqSourceDocument method at: i) ifFalse: [
+			^ false ] ].
 	^ true
 ]
 

src/ExecutableRequirements/ExReqStepReport.class.st

@@ -27,10 +27,6 @@ ExReqStepReport >> announceValidity [
 ExReqStepReport >> closeReport [
 
 	super closeReport.
-	step := nil.
-	requirement := nil.
-	previousStepReport := nil.
-	nextStepReport := nil
 ]
 
 { #category : 'accessing' }
@@ -190,6 +186,7 @@ ExReqStepReport >> verifyStepPostconditionWithContext: aContext [
 	3 - Postcondition not nil -> evaluation
 	"
 
+	self step ifNil: [ ^ self ].
 	postconditionValidity ifTrue: [ ^ self ].
 	self preconditionIsValid ifFalse: [ ^ self ].
 	self step postcondition ifNil: [