Preprocessor update

— do not allow the estimation of a parameter that appears in
  “planner_discount” (#1173)
— macro processor: fix bug in file reported when error encountered after a file
  has been included (preprocessor#42)