From 126960b7443905cccc54a9aa5ca8e1205762a0e7 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Mon, 14 Feb 2000 21:33:10 +0000
Subject: [PATCH] looks like everything is working except for try/except
(pystone compiles correctly)
---
Lib/compiler/pycodegen.py | 20 ++++++++++++++------
Tools/compiler/compiler/pycodegen.py | 20 ++++++++++++++------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index ac933487c3..1c804994d4 100644
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -153,11 +153,6 @@ class CodeGenerator:
"""TODO
EmptyNode
- Exec
- Invert
- LeftShift
- Power
- RightShift
Sliceobj
Tryexcept
Tryfinally
@@ -276,6 +271,8 @@ class CodeGenerator:
self.emit('SET_LINENO', node.lineno)
self.emit('IMPORT_NAME', node.modname)
for name in node.names:
+ if name == '*':
+ self.namespace = 0
self.emit('IMPORT_FROM', name)
self.emit('POP_TOP')
@@ -524,7 +521,6 @@ class CodeGenerator:
return 1
def visitAssign(self, node):
- print "ASSIGN", node.expr
self.emit('SET_LINENO', node.lineno)
self.visit(node.expr)
dups = len(node.nodes) - 1
@@ -583,6 +579,18 @@ class CodeGenerator:
def visitMod(self, node):
return self.binaryOp(node, 'BINARY_MODULO')
+ def visitPower(self, node):
+ return self.binaryOp(node, 'BINARY_POWER')
+
+ def visitLeftShift(self, node):
+ return self.binaryOp(node, 'BINARY_LSHIFT')
+
+ def visitRightShift(self, node):
+ return self.binaryOp(node, 'BINARY_RSHIFT')
+
+ def visitInvert(self, node):
+ return self.unaryOp(node, 'UNARY_INVERT')
+
def visitUnarySub(self, node):
return self.unaryOp(node, 'UNARY_NEGATIVE')
diff --git a/Tools/compiler/compiler/pycodegen.py b/Tools/compiler/compiler/pycodegen.py
index ac933487c3..1c804994d4 100644
--- a/Tools/compiler/compiler/pycodegen.py
+++ b/Tools/compiler/compiler/pycodegen.py
@@ -153,11 +153,6 @@ class CodeGenerator:
"""TODO
EmptyNode
- Exec
- Invert
- LeftShift
- Power
- RightShift
Sliceobj
Tryexcept
Tryfinally
@@ -276,6 +271,8 @@ class CodeGenerator:
self.emit('SET_LINENO', node.lineno)
self.emit('IMPORT_NAME', node.modname)
for name in node.names:
+ if name == '*':
+ self.namespace = 0
self.emit('IMPORT_FROM', name)
self.emit('POP_TOP')
@@ -524,7 +521,6 @@ class CodeGenerator:
return 1
def visitAssign(self, node):
- print "ASSIGN", node.expr
self.emit('SET_LINENO', node.lineno)
self.visit(node.expr)
dups = len(node.nodes) - 1
@@ -583,6 +579,18 @@ class CodeGenerator:
def visitMod(self, node):
return self.binaryOp(node, 'BINARY_MODULO')
+ def visitPower(self, node):
+ return self.binaryOp(node, 'BINARY_POWER')
+
+ def visitLeftShift(self, node):
+ return self.binaryOp(node, 'BINARY_LSHIFT')
+
+ def visitRightShift(self, node):
+ return self.binaryOp(node, 'BINARY_RSHIFT')
+
+ def visitInvert(self, node):
+ return self.unaryOp(node, 'UNARY_INVERT')
+
def visitUnarySub(self, node):
return self.unaryOp(node, 'UNARY_NEGATIVE')
--
2.40.0