Tense and aspect diagram matching