GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-03 08:32:42 +01:00
Code Issues Projects Releases Wiki Activity

Improve paren/prec module

Browse Source
This commit is contained in:
Pragmatic Software 2013-12-01 13:36:21 +00:00
parent 9c1a077d2e
commit 8adc766dc4
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/VERSION.pm
View File

@ -13,8 +13,8 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 475, BUILD_REVISION => 476,
BUILD_DATE => "2013-11-27", BUILD_DATE => "2013-12-01",
}; };
1; 1;

33
modules/paren/paren.py
View File

@ -12,10 +12,9 @@ with open("paren/stddef") as f:
class CParser(c_parser.CParser): class CParser(c_parser.CParser):
def __init__(self, *a, **kw): def __init__(self, *a, **kw):
super(CParser, self).__init__(*a, **kw) super(CParser, self).__init__(*a, **kw)
self.p_expression_hack = self._expression_hack
self.cparser = yacc.yacc( self.cparser = yacc.yacc(
module=self, module=self,
start='expression_hack', start='expression',
debug=kw.get('yacc_debug', False), debug=kw.get('yacc_debug', False),
errorlog=yacc.NullLogger(), errorlog=yacc.NullLogger(),
optimize=kw.get('yacc_optimize', True), optimize=kw.get('yacc_optimize', True),
@ -33,12 +32,6 @@ class CParser(c_parser.CParser):
input=text, input=text,
lexer=self.clex, lexer=self.clex,
debug=debuglevel) debug=debuglevel)
def _expression_hack(self, p):
""" expression_hack : translation_unit expression
| expression
"""
p[0] = c_ast.ExprList([p[2] if len(p) == 3 else p[1]])
class CGenerator(c_generator.CGenerator): class CGenerator(c_generator.CGenerator):
@ -49,25 +42,35 @@ class CGenerator(c_generator.CGenerator):
return 'sizeof (%s)' % self.visit(n.expr) return 'sizeof (%s)' % self.visit(n.expr)
else: else:
return 'sizeof %s' % self._parenthesize_unless_simple(n.expr) return 'sizeof %s' % self._parenthesize_unless_simple(n.expr)
return super(CGenerator, self).visit_UnaryOp(n) else:
operand = self.visit(n.expr)
if isinstance(n.expr, c_ast.ArrayRef) or not self._is_simple_node(n.expr):
operand = '(%s)' % operand
if n.op in ('p++', 'p--'):
return operand + n.op[1:]
else:
return n.op + operand
def visit_Assignment(self, n): def visit_Assignment(self, n):
return '%s %s %s' % (self.visit(n.lvalue), n.op, self._parenthesize_unless_simple(n.rvalue)) return '%s %s %s' % (self.visit(n.lvalue), n.op, self._parenthesize_unless_simple(n.rvalue))
def translate_to_c(input):
def parenthesize(source):
parser = CParser(yacc_optimize=False) parser = CParser(yacc_optimize=False)
try: try:
ast = parser.parse(input, '<input>') ast = parser.parse(source, '<input>')
except plyparser.ParseError as e: except plyparser.ParseError as e:
print(sys.argv[1] + ': ' + "Error: {0}".format(e.args[0])) print("{0}: Error: {1}".format(sys.argv[1], e.args[0]))
return return
generator = CGenerator() generator = CGenerator()
print(sys.argv[1] + ': ' + generator.visit(ast)) print("{0}: {1}".format(sys.argv[1], generator.visit(ast)))
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) > 2: if len(sys.argv) > 2:
translate_to_c(' '.join(sys.argv[2:])) parenthesize(' '.join(sys.argv[2:]))
elif len(sys.argv) == 2:
print(sys.argv[1] + ': ' + "Usage: paren <expression>")
else: else:
print(sys.argv[1] + ': ' + "Usage: paren <expression>") print('error')