l0n0lc 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

l0n0lc/StdMap.py

@@ -1,5 +1,4 @@
-from .c基础处理 import py类型转c类型, dict初始化列表, c变量, cpp类型
-from typing import Tuple, Union, List
+from .c基础处理 import dict初始化列表, c变量
 from .通用 import toCString
 
 

l0n0lc/jit.py

@@ -198,25 +198,25 @@ class py2cpp编译器(ast.NodeVisitor):
         if isinstance(value, ast.UnaryOp):
             operand = self.获取值(value.operand)
             if isinstance(value.op, ast.UAdd):
-                return f'+{operand}'
+                return f'(+{operand})'
             if isinstance(value.op, ast.USub):
-                return f'-{operand}'
+                return f'(-{operand})'
             if isinstance(value.op, ast.Not):
-                return f'!{operand}'
+                return f'(!{operand})'
             if isinstance(value.op, ast.Invert):
-                return f'~{operand}'
+                return f'(~{operand})'
 
         if isinstance(value, ast.BoolOp):
             if isinstance(value.op, ast.And):
-                return '&&'.join([str(self.获取值(v)) for v in value.values])
+                return '&&'.join([f'({self.获取值(v)})' for v in value.values])
             if isinstance(value.op, ast.Or):
-                return '||'.join([str(self.获取值(v)) for v in value.values])
+                return '||'.join([f'({self.获取值(v)})' for v in value.values])
 
         if isinstance(value, ast.IfExp):
             test = self.获取值(value.test)
             body = self.获取值(value.body)
             orelse = self.获取值(value.orelse)
-            return f'({test} ? ({body}) : ({orelse}))'
+            return f'(({test}) ? ({body}) : ({orelse}))'
 
         if isinstance(value, ast.Compare):
             return self.计算Compare(value)
@@ -251,19 +251,22 @@ class py2cpp编译器(ast.NodeVisitor):
             left = left if 输出left else ''
             right = self.获取值(comp)
             if isinstance(op, ast.Eq):
-                ret += f'{left} == {right}'
+                ret += f'({left} == {right})'
             if isinstance(op, ast.NotEq):
-                ret += f'{left} != {right}'
+                ret += f'({left} != {right})'
             if isinstance(op, ast.Lt):
-                ret += f'{left} < {right}'
+                ret += f'({left} < {right})'
             if isinstance(op, ast.LtE):
-                ret += f'{left} <= {right}'
+                ret += f'({left} <= {right})'
             if isinstance(op, ast.Gt):
-                ret += f'{left} > {right}'
+                ret += f'({left} > {right})'
             if isinstance(op, ast.GtE):
-                ret += f'{left} >= {right}'
+                ret += f'({left} >= {right})'
             left = right
             输出left = False
+        # 如果只有一项, 不需要多层括号
+        if len(node.ops) == 1:
+            return ret[1:]
         return ret + ')'
 
     def 计算二元运算(self, node: ast.BinOp | ast.AugAssign):
@@ -275,25 +278,25 @@ class py2cpp编译器(ast.NodeVisitor):
             right = self.获取值(node.value)
         op = node.op
         if isinstance(op, ast.Add):
-            return f'{left} + {right}'
+            return f'({left} + {right})'
         if isinstance(op, ast.Sub):
-            return f'{left} - {right}'
+            return f'({left} - {right})'
         if isinstance(op, ast.Mult):
-            return f'{left} * {right}'
+            return f'({left} * {right})'
         if isinstance(op, (ast.Div, ast.FloorDiv)):
-            return f'{left} / {right}'
+            return f'({left} / {right})'
         if isinstance(op, ast.Mod):
-            return f'{left} % {right}'
+            return f'({left} % {right})'
         if isinstance(op, ast.BitAnd):
-            return f'{left} & {right}'
+            return f'({left} & {right})'
         if isinstance(op, ast.BitOr):
-            return f'{left} | {right}'
+            return f'({left} | {right})'
         if isinstance(op, ast.BitXor):
-            return f'{left} ^ {right}'
+            return f'({left} ^ {right})'
         if isinstance(op, ast.LShift):
-            return f'{left} << {right}'
+            return f'({left} << {right})'
         if isinstance(op, ast.RShift):
-            return f'{left} >> {right}'
+            return f'({left} >> {right})'
 
         self.抛出代码异常(f"暂不支持的运算符: {type(op).__name__}", node)
 
@@ -556,10 +559,10 @@ class py2cpp编译器(ast.NodeVisitor):
         值 = self.获取值(node.value)
         目标类型 = self.获取值(node.annotation)
         if 目标类型 is None:
-            self.抛出代码异常(f'不支持的类型嗯{node.annotation}', node)
+            self.抛出代码异常(f'不支持的类型:{node.annotation}', node)
         c类型 = py类型转c类型(目标类型)
         if c类型 is None:
-            self.抛出代码异常(f'不支持的类型嗯{目标类型}', node)
+            self.抛出代码异常(f'不支持的类型:{目标类型}', node)
         self._赋值(node.target, 值, node, str(c类型))
 
     def 获取定义(self):

{l0n0lc-0.9.1.dist-info → l0n0lc-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: l0n0lc
-Version: 0.9.1
+Version: 0.9.3
 Summary: 一个将python函数翻译为c++函数并运行的jit编译器
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
@@ -69,7 +69,7 @@ class CppVectorInt:
         return 0
 
 
-@lc.jit()
+@lc.jit(每次运行都重新编译=True)
 def jit_all_ops(a: int, b: int) -> int:
     # 常量与基础赋值
     x = 42
@@ -81,7 +81,7 @@ def jit_all_ops(a: int, b: int) -> int:
     mp = {1: 10, 2: 20}
 
     # 一元运算
-    pos = +a
+    pos = +(a + 1)
     neg = -b
     inv = ~a
     not_flag = not flag
@@ -162,7 +162,7 @@ def jit_all_ops(a: int, b: int) -> int:
 @lc.jit(每次运行都重新编译=True)
 def test_add(a: int, b: int) -> int:
     if a > 1:
-        return a + b
+        return (a + b) * 123123
     for i in range(1, 10, 2):
         a += i
     for i in [1, 2, 3]:
@@ -189,7 +189,7 @@ def test_add(a: int, b: int) -> int:
     vv = True and (False or 1)
     print('vv:', vv)
     print('测试while:')
-    while (vv):
+    while vv:
         py_cin(v)
         if v > 100:
             break
@@ -235,75 +235,75 @@ vv: 1
 ```bash
 ls -al ./l0n0lcoutput
 total 136
-drwxr-xr-x  2 root root  4096 Sep 18 01:26 .
-drwxrwxrwx 11 1000 1000  4096 Sep 18 01:26 ..
--rw-r--r--  1 root root  1693 Sep 18 01:26 jit_all_ops_@0ec883892076cd03.cpp
--rw-r--r--  1 root root   167 Sep 18 01:26 jit_all_ops_@0ec883892076cd03.h
--rwxr-xr-x  1 root root 23520 Sep 18 01:26 jit_all_ops_@0ec883892076cd03.so
--rw-r--r--  1 root root  1466 Sep 18 01:26 test_add_@122c4be59097d472.cpp
--rw-r--r--  1 root root   302 Sep 18 01:26 test_add_@122c4be59097d472.h
--rwxr-xr-x  1 root root 40216 Sep 18 01:26 test_add_@122c4be59097d472.so
--rw-r--r--  1 root root   121 Sep 18 01:26 test_other_fn_@75fdd928ab58a8e3.cpp
--rw-r--r--  1 root root   106 Sep 18 01:26 test_other_fn_@75fdd928ab58a8e3.h
--rwxr-xr-x  1 root root 15616 Sep 18 01:26 test_other_fn_@75fdd928ab58a8e3.so
--rw-r--r--  1 root root   185 Sep 18 01:26 test编译的函数_@3bf4501e0408a243.cpp
--rw-r--r--  1 root root   164 Sep 18 01:26 test编译的函数_@3bf4501e0408a243.h
--rwxr-xr-x  1 root root 15656 Sep 18 01:26 test编译的函数_@3bf4501e0408a243.so
+drwxr-xr-x  2 root root  4096 Sep 18 02:00 .
+drwxrwxrwx 11 1000 1000  4096 Sep 18 02:00 ..
+-rw-r--r--  1 root root  1779 Sep 18 02:00 jit_all_ops_@7801528c3d61baf7.cpp
+-rw-r--r--  1 root root   167 Sep 18 02:00 jit_all_ops_@7801528c3d61baf7.h
+-rwxr-xr-x  1 root root 23520 Sep 18 02:00 jit_all_ops_@7801528c3d61baf7.so
+-rw-r--r--  1 root root  1499 Sep 18 02:00 test_add_@469de6acaaabc570.cpp
+-rw-r--r--  1 root root   302 Sep 18 02:00 test_add_@469de6acaaabc570.h
+-rwxr-xr-x  1 root root 40216 Sep 18 02:00 test_add_@469de6acaaabc570.so
+-rw-r--r--  1 root root   123 Sep 18 02:00 test_other_fn_@75fdd928ab58a8e3.cpp
+-rw-r--r--  1 root root   106 Sep 18 02:00 test_other_fn_@75fdd928ab58a8e3.h
+-rwxr-xr-x  1 root root 15616 Sep 18 02:00 test_other_fn_@75fdd928ab58a8e3.so
+-rw-r--r--  1 root root   187 Sep 18 02:00 test编译的函数_@3bf4501e0408a243.cpp
+-rw-r--r--  1 root root   164 Sep 18 02:00 test编译的函数_@3bf4501e0408a243.h
+-rwxr-xr-x  1 root root 15656 Sep 18 02:00 test编译的函数_@3bf4501e0408a243.so
 
 ```
-## 5. jit_all_ops_@0ec883892076cd03.cpp
+## 5. jit_all_ops_@7801528c3d61baf7.cpp
 ```c++
-#include "jit_all_ops_@0ec883892076cd03.h"
+#include "jit_all_ops_@7801528c3d61baf7.h"
 extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 {
   auto x = 42;
-  auto y = ((int64_t)(a + b));
+  auto y = ((int64_t)((a + b)));
   auto z = 3.14;
   auto flag = true;
   int64_t nums[] = {1,2,3};
   int64_t tup[] = {4,5};
   std::unordered_map<int64_t, int64_t> mp = {{ 1, 10 },{ 2, 20 }};
-  auto pos = +a;
-  auto neg = -b;
-  auto inv = ~a;
-  auto not_flag = !flag;
-  auto add = a + b;
-  auto sub = a - b;
-  auto mul = a * b;
-  auto div = a / ((b != 0) ? (b) : (1));
-  auto mod = a % ((b != 0) ? (b) : (1));
-  auto band = a & b;
-  auto bor = a | b;
-  auto bxor = a ^ b;
-  auto lshift = a << 1;
-  auto rshift = a >> 1;
+  auto pos = (+(a + 1));
+  auto neg = (-b);
+  auto inv = (~a);
+  auto not_flag = (!flag);
+  auto add = (a + b);
+  auto sub = (a - b);
+  auto mul = (a * b);
+  auto div = (a / (((b != 0)) ? (b) : (1)));
+  auto mod = (a % (((b != 0)) ? (b) : (1)));
+  auto band = (a & b);
+  auto bor = (a | b);
+  auto bxor = (a ^ b);
+  auto lshift = (a << 1);
+  auto rshift = (a >> 1);
   auto cmp1 = (a == b);
   auto cmp2 = (a != b);
   auto cmp3 = (a < b);
   auto cmp4 = (a <= b);
   auto cmp5 = (a > b);
   auto cmp6 = (a >= b);
-  auto logic_and = cmp1&&cmp2;
-  auto logic_or = cmp3||cmp4;
-  auto ternary = ((a > b) ? (a) : (b));
+  auto logic_and = (cmp1)&&(cmp2);
+  auto logic_or = (cmp3)||(cmp4);
+  auto ternary = (((a > b)) ? (a) : (b));
   if ((a > b))
   {
-    y = y + 1;
+    y = (y + 1);
   }
 
   else
   {
-    y = y - 1;
+    y = (y - 1);
   }
 
   for (int64_t i = 0; i < 3; ++i)
   {
-    y = y + i;
+    y = (y + i);
   }
 
   for (auto v : nums)
   {
-    y = y + v;
+    y = (y + v);
     if ((v == 2))
     {
       continue;
@@ -319,23 +319,23 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
   auto count = 0;
   while ((count < 2))
   {
-    y = y + count;
-    count = count + 1;
+    y = (y + count);
+    count = (count + 1);
   }
 
-  y = y + 5;
-  y = y - 1;
-  y = y * 2;
-  y = y / 2;
-  y = y % 10;
-  y = y & 7;
-  y = y | 3;
-  y = y ^ 1;
-  y = y << 1;
-  y = y >> 1;
+  y = (y + 5);
+  y = (y - 1);
+  y = (y * 2);
+  y = (y / 2);
+  y = (y % 10);
+  y = (y & 7);
+  y = (y | 3);
+  y = (y ^ 1);
+  y = (y << 1);
+  y = (y >> 1);
   auto first_num = nums[0];
   auto mp_val = mp[1];
-  y = y + first_num + mp_val;
+  y = (y + (first_num + mp_val));
   auto vector = std::vector<int>();
   vector.push_back(count);
   vector.push_back(y);
@@ -348,7 +348,7 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 }
 
 ```
-## 6. jit_all_ops_@0ec883892076cd03.h
+## 6. jit_all_ops_@7801528c3d61baf7.h
 ```c++
 #pragma once
 #include <cstdint>
@@ -358,24 +358,24 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 #include <vector>
 extern "C" int64_t jit_all_ops (int64_t a, int64_t b);
 ```
-## 7. test_add_@122c4be59097d472.cpp
+## 7. test_add_@469de6acaaabc570.cpp
 ```c++
-#include "test_add_@122c4be59097d472.h"
+#include "test_add_@469de6acaaabc570.h"
 extern "C" int64_t test_add (int64_t a, int64_t b)
 {
   if ((a > 1))
   {
-    return a + b;
+    return ((a + b) * 123123);
   }
 
   for (int64_t i = 1; i < 10; i += 2)
   {
-    a = a + i;
+    a = (a + i);
   }
 
   for (auto i : {1,2,3})
   {
-    a = a + i;
+    a = (a + i);
   }
 
   a = std::ceil(12.5);;
@@ -401,7 +401,7 @@ extern "C" int64_t test_add (int64_t a, int64_t b)
   std::cout<< u8"测试所有操作:" << " "<< std::endl;;
   jit_all_ops(a,b);
   auto v = 0;
-  auto vv = true&&false||1;
+  auto vv = (true)&&((false)||(1));
   std::cout<< u8"vv:" << " "<< vv << " "<< std::endl;;
   std::cout<< u8"测试while:" << " "<< std::endl;;
   while (vv)
@@ -419,14 +419,14 @@ extern "C" int64_t test_add (int64_t a, int64_t b)
 
   }
 
-  return a + b + 1 + 123 + v;
+  return ((((a + b) + 1) + 123) + v);
 }
 
 ```
-## 8. test_add_@122c4be59097d472.h
+## 8. test_add_@469de6acaaabc570.h
 ```c++
 #pragma once
-#include "jit_all_ops_@0ec883892076cd03.h"
+#include "jit_all_ops_@7801528c3d61baf7.h"
 #include "test_other_fn_@75fdd928ab58a8e3.h"
 #include "test编译的函数_@3bf4501e0408a243.h"
 #include <cmath>
@@ -441,7 +441,7 @@ extern "C" int64_t test_add (int64_t a, int64_t b);
 #include "test_other_fn_@75fdd928ab58a8e3.h"
 extern "C" int64_t test_other_fn (int64_t a, int64_t b)
 {
-  return a - b;
+  return (a - b);
 }
 
 ```
@@ -457,7 +457,7 @@ extern "C" int64_t test_other_fn (int64_t a, int64_t b);
 #include "test编译的函数_@3bf4501e0408a243.h"
 extern "C" int64_t /*test编译的函数*/ function_74657374e7bc96e8af91e79a84e587bde695b0 (int64_t a, int64_t b)
 {
-  return a * b;
+  return (a * b);
 }
 
 ```

l0n0lc-0.9.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+l0n0lc/StdList.py,sha256=0NTIpaRrNHaCiLrRbEVob21pZHa8S8rfaBRALPT-tD0,889
+l0n0lc/StdMap.py,sha256=997LCvP0ewNciabbmGHVL2eUgMakHBsR3c5HQmOwC_E,666
+l0n0lc/__init__.py,sha256=fUC6TMeN_fEL7HDazrBEdoWOQkXi5uSGZb7LZj6juog,137
+l0n0lc/c基础处理.py,sha256=GrCPZpLsyfQD8XZQhOCb5y8v9NCZ6bU4C_xfJGx-pvQ,5723
+l0n0lc/jit.py,sha256=78OtYwz5GHdeVAU_m6MRyKG53ElE9TTeuQ9ZyuRb_QU,25771
+l0n0lc/编译.py,sha256=Ty4gPDHAB1jn8LgnE4w3R06bOAEeYr8iwqahYf6QeHI,2154
+l0n0lc/通用.py,sha256=RkqP9cMhKhl2h4YxOpAWFFftIPXLZTYMyOOD1PuB59M,4630
+l0n0lc-0.9.3.dist-info/licenses/LICENSE,sha256=1L-MAjulZ3kpbYwsJtlXpDVITRxykna2Ecg_521YfkA,1093
+l0n0lc-0.9.3.dist-info/METADATA,sha256=BAPktGzCmMJ2imiv9HPMe71udjcNYyzP9nFugzygXUc,10130
+l0n0lc-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+l0n0lc-0.9.3.dist-info/top_level.txt,sha256=Q21D_eEY_-xgRUPwATGp9YDKSBO4w_7MI2MYxQI1aT4,7
+l0n0lc-0.9.3.dist-info/RECORD,,

l0n0lc-0.9.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-l0n0lc/StdList.py,sha256=0NTIpaRrNHaCiLrRbEVob21pZHa8S8rfaBRALPT-tD0,889
-l0n0lc/StdMap.py,sha256=TIVKqhT078cjLIM0Zlq-TwGFSy-KwOyJe00BLFPVxr8,735
-l0n0lc/__init__.py,sha256=fUC6TMeN_fEL7HDazrBEdoWOQkXi5uSGZb7LZj6juog,137
-l0n0lc/c基础处理.py,sha256=GrCPZpLsyfQD8XZQhOCb5y8v9NCZ6bU4C_xfJGx-pvQ,5723
-l0n0lc/jit.py,sha256=UG5CwhmtD9BJWWiWreFxDCTCFgKgjSOqREhaZuW3sBU,25619
-l0n0lc/编译.py,sha256=Ty4gPDHAB1jn8LgnE4w3R06bOAEeYr8iwqahYf6QeHI,2154
-l0n0lc/通用.py,sha256=RkqP9cMhKhl2h4YxOpAWFFftIPXLZTYMyOOD1PuB59M,4630
-l0n0lc-0.9.1.dist-info/licenses/LICENSE,sha256=1L-MAjulZ3kpbYwsJtlXpDVITRxykna2Ecg_521YfkA,1093
-l0n0lc-0.9.1.dist-info/METADATA,sha256=Dp2vjz7C65AR-9SE__1Trhtw1qVvusPbQVXVutZ4OW4,9960
-l0n0lc-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-l0n0lc-0.9.1.dist-info/top_level.txt,sha256=Q21D_eEY_-xgRUPwATGp9YDKSBO4w_7MI2MYxQI1aT4,7
-l0n0lc-0.9.1.dist-info/RECORD,,