python-cmd2: cmd2.py comparison

comparison cmd2.py @ 203:68a609fc516b

limit < infile slurp to cases where infile found

author	catherine@dellzilla
date	Mon, 02 Mar 2009 14:53:27 -0500
parents	da8c265934ee
children	5d22be6d2f88

comparison

equal deleted inserted replaced

-:da8c265934ee
+:68a609fc516b
 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t')
 class ParsedString(str):
 pass
+class SkipToLast(pyparsing.SkipTo):
+def parseImpl( self, instring, loc, doActions=True ):
+resultStore = []
+startLoc = loc
+instrlen = len(instring)
+expr = self.expr
+failParse = False
+while loc <= instrlen:
+try:
+if self.failOn:
+failParse = True
+self.failOn.tryParse(instring, loc)
+failParse = False
+loc = expr._skipIgnorables( instring, loc )
+expr._parse( instring, loc, doActions=False, callPreParse=False )
+skipText = instring[startLoc:loc]
+if self.includeMatch:
+loc,mat = expr._parse(instring,loc,doActions,callPreParse=False)
+if mat:
+skipRes = ParseResults( skipText )
+skipRes += mat
+resultStore.append((loc, [ skipRes ]))
+else:
+resultStore,append((loc, [ skipText ]))
+else:
+resultStore.append((loc, [ skipText ]))
+loc += 1
+except (pyparsing.ParseException,IndexError):
+if failParse:
+raise
+else:
+loc += 1
+if resultStore:
+return resultStore[-1]
+else:
+exc = self.myException
+exc.loc = loc
+exc.pstr = instring
+raise exc
+def replace_with_file_contents(fname):
+if fname:
+try:
+result = open(os.path.expanduser(fname[0])).read()
+except IOError:
+result = '< %s' % fname[0]  # wasn't a file after all
+else:
+result = getPasteBuffer()
+return result
 class Cmd(cmd.Cmd):
 echo = False
 caseInsensitive = True
 continuationPrompt = '> '
 timing = False
 shortcuts = {'?': 'help', '!': 'shell', '@': 'load' }
 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
 noSpecialParse = 'set ed edit exit'.split()
 defaultExtension = 'txt'
 defaultFileName = 'command.txt'
-settable = ['prompt', 'continuationPrompt', 'defaultFileName', 'editor', 'caseInsensitive', 'echo', 'timing']
+settable = ['prompt', 'continuationPrompt', 'defaultFileName', 'editor', 'caseInsensitive',
+'echo', 'timing']
 settable.sort()
 editor = os.environ.get('EDITOR')
 _STOP_AND_EXIT = 2
 if not editor:
 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator')
 stringEnd = pyparsing.stringEnd ^ '\nEOF'
 self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.caseInsensitive) for c in self.multilineCommands])('multilineCommand')
 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command')
 pipe = pyparsing.Keyword('|', identChars='|')
-self.commentGrammars.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).setParseAction(lambda x: '')
+self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '')
-self.commentInProgress.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(pyparsing.cStyleComment)
+self.commentInProgress.ignore(pyparsing.quotedString).ignore(pyparsing.cStyleComment)
 afterElements = \
 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \
 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo'))
 if self.caseInsensitive:
 self.multilineCommand.setParseAction(lambda x: x[0].lower())
 self.blankLineTerminationParser = pyparsing.NoMatch
 else:
 self.blankLineTerminator = (pyparsing.lineEnd + pyparsing.lineEnd)('terminator')
 self.blankLineTerminator.setResultsName('terminator')
 self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement')
-self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') +
+self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') +
 pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements)
 self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') +
 pyparsing.Optional(terminatorParser) + afterElements)
 #self.multilineParser = self.multilineParser.setResultsName('multilineParser')
 #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
 self.multilineParser |
 self.singleLineParser |
 self.blankLineTerminationParser |
 self.multilineCommand + pyparsing.SkipTo(stringEnd)
 )
-self.parser.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
+self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
 inputMark = pyparsing.Literal('<')
 inputMark.setParseAction(lambda x: '')
 inputFrom = pyparsing.Word(self.legalChars + '/\\')('inputFrom')
-inputFrom.setParseAction(lambda x: (x and open(os.path.expanduser(x[0])).read()) or getPasteBuffer())
+inputFrom.setParseAction(replace_with_file_contents)
 self.inputParser = inputMark + pyparsing.Optional(inputFrom)
-self.inputParser.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
+self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
 def parsed(self, raw, **kwargs):
 if isinstance(raw, ParsedString):
 p = raw
 else:

Mercurial > python-cmd2

comparison cmd2.py @ 203:68a609fc516b