Edited parser

Changed types. Variable declarations are now stored in tuples,
(variable name, variable type).