search

wf49670 / ppgen

Post-processing generator for DP
6 stars 4 forks source link

More robust error handling for .dm command #32

Closed wf49670 closed 10 years ago

wf49670 commented 10 years ago

Enhanced .dm to detect several error situations and issue error message rather than terminating with Python stack trace: (1) .dm without a macro name (2) missing .dm- (either hit another .dm or end-of-file)

ghost commented 10 years ago

Thank you Walt. I'll merge this into develop now.

This will be interesting. I am working off of develop for the .dv command (which is more complicated than it looks) so when I do to merge my changes back into develop, I'm wondering if I will overwrite yours. There must be a way. I'll figure it out before I merge my code back in.

wf49670 commented 10 years ago

On 10/14/2014 3:49 PM, rfrank wrote:

Thank you Walt. I'll merge this into develop now.

This will be interesting. I am working off of develop for the .dv command (which is more complicated than it looks) so when I do to merge my changes back into develop, I'm wondering if I will overwrite yours. There must be a way. I'll figure it out before I merge my code back in.

Unless you hit the same lines of code as I did (unlikely, given the localized nature of my changes) Git should handle the merge automatically.

If it can't handle the merge automatically, it will (I think) do what it can and leave error flags of some sort in the other places for you to handle manually.

Walt