That is correct. Both options and warrants have expiry dates. The difference is that options have a vesting period. When options are granted, not all are immediately exercisable. Generally 25% are immediately exercisable with the remainder vesting over 6 month intervals.
The term fully diluted share count always refers to all oustanding issued shares, plus warrants, plus all options whether they are exercised/vested or not.