Changed Scanner to Support C Preprocessor Macros