@@ -848,19 +848,13 @@ module Redux {
848
848
)
849
849
}
850
850
851
- private class ActionToReducerStep extends DataFlow:: AdditionalFlowStep {
852
- ActionToReducerStep ( ) {
853
- actionToReducerStep ( _, this )
854
- or
855
- actionToReducerPromiseStep ( _, this )
856
- }
857
-
851
+ private class ActionToReducerStep extends DataFlow:: SharedFlowStep {
858
852
override predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) {
859
- actionToReducerStep ( pred , succ ) and succ = this
853
+ actionToReducerStep ( pred , succ )
860
854
}
861
855
862
856
override predicate loadStep ( DataFlow:: Node pred , DataFlow:: Node succ , string prop ) {
863
- actionToReducerPromiseStep ( pred , succ ) and succ = this and prop = Promises:: valueProp ( )
857
+ actionToReducerPromiseStep ( pred , succ ) and prop = Promises:: valueProp ( )
864
858
}
865
859
}
866
860
@@ -919,11 +913,9 @@ module Redux {
919
913
)
920
914
}
921
915
922
- private class ReducerToStateStep extends DataFlow:: AdditionalFlowStep {
923
- ReducerToStateStep ( ) { reducerToStateStep ( _, this ) }
924
-
916
+ private class ReducerToStateStep extends DataFlow:: SharedFlowStep {
925
917
override predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) {
926
- reducerToStateStep ( pred , succ ) and succ = this
918
+ reducerToStateStep ( pred , succ )
927
919
}
928
920
}
929
921
@@ -981,8 +973,8 @@ module Redux {
981
973
/**
982
974
* Defines a flow step to be used for propagating tracking access to `state`.
983
975
*
984
- * An `AdditionalFlowStep ` is generated for these steps as well.
985
- * It is distinct from `AdditionalFlowStep ` to avoid recursion between that and the propagation of `state`.
976
+ * A `SharedFlowStep ` is generated for these steps as well.
977
+ * It is distinct from `SharedFlowStep ` to avoid recursion between that and the propagation of `state`.
986
978
*/
987
979
private class StateStep extends Unit {
988
980
abstract predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) ;
@@ -992,11 +984,9 @@ module Redux {
992
984
any ( StateStep s ) .step ( pred , succ )
993
985
}
994
986
995
- private class StateStepAsFlowStep extends DataFlow:: AdditionalFlowStep {
996
- StateStepAsFlowStep ( ) { stateStep ( _, this ) }
997
-
987
+ private class StateStepAsFlowStep extends DataFlow:: SharedFlowStep {
998
988
override predicate step ( DataFlow:: Node pred , DataFlow:: Node succ ) {
999
- stateStep ( pred , succ ) and succ = this
989
+ stateStep ( pred , succ )
1000
990
}
1001
991
}
1002
992
0 commit comments