oasm 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

oasm/__init__.py

@@ -1158,7 +1158,7 @@ class plus_minus:
             if type(x) is expr:
                 if len(x) > 0 and x[:][0] is plus:
                     t = x[:][1]
-                    (term if type(t[0]) is expr else atom).append(t[0])
+                    (term if type(t[0]) is expr else atom).append(-t[0] if sub else t[0])
                     (term if type(t[1]) is expr else atom).append(-t[1] if sub else t[1])
                 else:
                     term.append(-x if sub else x)
@@ -1395,31 +1395,19 @@ class WithPass(ast.NodeTransformer):
         Else = self.env['Else']
         if type(Else) is not str:
             Else = 'Else'
-        Elif = self.env['Elif']
-        if type(Elif) is not str:
-            Elif = 'Elif'
         if isinstance(node.test, ast.Call) and node.test.func.id == '_':
             node.test.func.id = If
         elif RegQ(node.test, self.regq):
             node.test = ast.Call(func=ast.Name(id=If, ctx=ast.Load(), lineno=node.lineno, col_offset = node.col_offset), args=[node.test], keywords=[], lineno=node.lineno, col_offset = node.col_offset)
         if isinstance(node.test, ast.Call) and node.test.func.id == If:
             withs = [ast.With(items=[ast.withitem(context_expr = node.test)], body=node.body, lineno=node.lineno, col_offset = node.col_offset)]
-            for i in range(len(node.orelse)):
-                orelse = node.orelse[i]
-                if isinstance(orelse, ast.With) \
-                    and isinstance(orelse.items[0].context_expr, ast.Call):
-                    if orelse.items[0].context_expr.func.id == If:
-                        orelse.items[0].context_expr.func.id = Elif
-                    withs.append(orelse)
-                else:
-                    orelse = ast.With(items=[\
-                    ast.withitem(context_expr = \
-                    ast.Call(func=ast.Name(id=Else, ctx=ast.Load(), lineno=node.lineno, col_offset = node.col_offset),\
-                    args=[], keywords=[], lineno=node.lineno, col_offset = node.col_offset),\
-                    lineno=node.lineno, col_offset = node.col_offset)], \
-                    body=node.orelse[i:], lineno=node.lineno, col_offset = node.col_offset)
-                    withs.append(orelse)
-                    break
+            if len(node.orelse):
+                withs.append(ast.With(items=[\
+                ast.withitem(context_expr = \
+                ast.Call(func=ast.Name(id=Else, ctx=ast.Load(), lineno=node.lineno, col_offset = node.col_offset),\
+                args=[], keywords=[], lineno=node.lineno, col_offset = node.col_offset),\
+                lineno=node.lineno, col_offset = node.col_offset)], \
+                body=node.orelse, lineno=node.lineno, col_offset = node.col_offset))
             return withs
         return node
     def visit_While(self, node):

{oasm-0.1.3.dist-info → oasm-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oasm
-Version: 0.1.3
+Version: 0.1.5
 Summary: Open ASseMbly tools
 Author-email: nzturn <nzturn@gmail.com>
 Keywords: asm,dsl

oasm-0.1.5.dist-info/RECORD

@@ -0,0 +1,5 @@
+oasm/__init__.py,sha256=7hI7IyEOnV3VoPq6ocWUXSiZ9PdoISLXp4NjGyHHYbk,66151
+oasm-0.1.5.dist-info/METADATA,sha256=FJSdJI3ECMter4fbaNsYhL46NRnfT3uvtNGNL-9R5pQ,370
+oasm-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oasm-0.1.5.dist-info/top_level.txt,sha256=EacQcwgujQK1Vg--A4w6awZ2LPUTDx7kHNRd9BsavOc,5
+oasm-0.1.5.dist-info/RECORD,,

oasm-0.1.3.dist-info/RECORD

@@ -1,5 +0,0 @@
-oasm/__init__.py,sha256=S3K4YGKR7RUijQDSCEhSdpD49TNxomWHfuZrnaeZGZk,66704
-oasm-0.1.3.dist-info/METADATA,sha256=SM5AUPPVDPd73O1qgHVW0mgVsLZnGhY5d3Hd6IRArs0,370
-oasm-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oasm-0.1.3.dist-info/top_level.txt,sha256=EacQcwgujQK1Vg--A4w6awZ2LPUTDx7kHNRd9BsavOc,5
-oasm-0.1.3.dist-info/RECORD,,