If x= 1- q and y = 2q + 1, then for what value of q, r is equal to y?