FPGA/myhdl
1
0
Fork 0
mirror of https://github.com/myhdl/myhdl.git synced 2025-01-24 21:52:56 +08:00
Code Issues Projects Releases Wiki Activity

UNSTABLE - move to ast

Browse Source 
test_bin2gray works
This commit is contained in:
Jan Decaluwe 2009-05-08 20:22:48 +02:00
parent d7c142ad18
commit 7bacfd9c9e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myhdl/conversion/_analyze.py
View File

@ -877,7 +877,7 @@ class _AnalyzeVisitor(ast.NodeVisitor, _ConversionMixin):
## node.expr.target = self.getObj(arg)
## arg.target = self.getObj(node.expr)
# detect specialized case for the test
if op == '==' and isinstance(node.left, ast.Name):
if isinstance(op, ast.Eq) and isinstance(node.left, ast.Name):
n = node.left.id
# check wether it can be a case
if isinstance(arg.obj, EnumItemType):

16
myhdl/conversion/_toVHDL.py
View File

@ -595,7 +595,7 @@ class _ConvertVisitor(ast.NodeVisitor, _ConversionMixin):
# self.binaryOp(node, "-")
def BinOp(self, node):
pre, suf = self.inferBinaryOpCast(node, node.left, node.right, op)
pre, suf = self.inferBinaryOpCast(node, node.left, node.right, node.op)
self.write(pre)
self.visit(node.left)
self.write(" %s " % opmap[type(node.op)])
@ -795,7 +795,7 @@ class _ConvertVisitor(ast.NodeVisitor, _ConversionMixin):
# e = getattr(obj, node.attrname)
# self.write(e._toVHDL())
def setAttr(self, node):
def getAttr(self, node):
assert isinstance(node.value, ast.Name)
n = node.value.id
if n in self.tree.symdict:
@ -1291,7 +1291,7 @@ class _ConvertVisitor(ast.NodeVisitor, _ConversionMixin):
self.write(pre)
self.visit(node.left)
op, right = node.ops[0], node.comparators[0]
self.write(" %s " % opmap[type.op])
self.write(" %s " % opmap[type(op)])
self.visit(right)
self.write(suf)
@ -2158,7 +2158,7 @@ class _ConvertVisitor(ast.NodeVisitor, _ConversionMixin):
break
else:
edges.append(s)
ifnode.else_.edge = edges
ifnode.edge = edges
senslist = [s.sig for s in senslist]
return senslist
@ -2846,12 +2846,12 @@ class _AnnotateTypesVisitor(ast.NodeVisitor, _ConversionMixin):
def visit_Compare(self, node):
node.vhd = vhd_boolean()
self.generic_visit(node)
left, op, right = node.left. node.ops[0], node.comparators[0]
left, op, right = node.left, node.ops[0], node.comparators[0]
if isinstance(left.vhd, vhd_std_logic) or isinstance(right.vhd, vhd_std_logic):
left.vhd = right.vhd = vhd_std_logic()
elif isinstance(expr.vhd, vhd_unsigned) and maybeNegative(right.vhd):
elif isinstance(left.vhd, vhd_unsigned) and maybeNegative(right.vhd):
left.vhd = vhd_signed(expr.vhd.size + 1)
elif maybeNegative(expr.vhd) and isinstance(right.vhd, vhd_unsigned):
elif maybeNegative(left.vhd) and isinstance(right.vhd, vhd_unsigned):
right.vhd = vhd_signed(right.vhd.size + 1)
node.vhdOri = copy(node.vhd)
@ -3012,7 +3012,7 @@ class _AnnotateTypesVisitor(ast.NodeVisitor, _ConversionMixin):
node.vhd = node.left.vhd = node.right.vhd = obj
node.vhdOri = copy(node.vhd)
def inferBinaryOpType(self, node):
def inferBinOpType(self, node):
left, op, right = node.left, node.op, node.right
if isinstance(left.vhd, (vhd_boolean, vhd_std_logic)):
left.vhd = vhd_unsigned(1)