comparison cmd2.py @ 141:fc31b73cb04d

attempt reconcile with released version
author catherine@Elli.myhome.westell.com
date Mon, 17 Nov 2008 09:17:00 -0500
parents e49ded85ba4c
children c05afe3b5501
comparison
equal deleted inserted replaced
140:e49ded85ba4c 141:fc31b73cb04d
264 if result.terminator: 264 if result.terminator:
265 result['statement'] = result.upToIncluding 265 result['statement'] = result.upToIncluding
266 result['unterminated'] = result.before 266 result['unterminated'] = result.before
267 result['parseable'] = result.after 267 result['parseable'] = result.after
268 else: 268 else:
269 result['statement'] = result['unterminated'] = result.before 269 result['statement'] = result['unterminated'] = result.before # does not catch output marks
270 if command in self.multilineCommands: 270 if command in self.multilineCommands:
271 return result # don't bother with the rest, we're still collecting input 271 return result # don't bother with the rest, we're still collecting input
272 result += parseSearchResults(self.punctuationPattern, s) 272 result += parseSearchResults(self.punctuationPattern, s)
273 result += parseSearchResults(self.pipePattern, result.parseable) 273 result += parseSearchResults(self.pipePattern, result.parseable)
274 result += parseSearchResults(self.redirectInPattern, result.parseable) 274 result += parseSearchResults(self.redirectInPattern, result.parseable)