Closed Issue: Parser should return the correct line number for the error location when returning an error [1]

Fix the parser to return the correct line number for the error location when returning an
error.
Comments: substrate query case fixed in http://dkal.codeplex.com/SourceControl/changeset/11ad5a46237c