Added preprocessor-token to token conversion.
Added start of #if expression parsing.