l0n0lc 0.10.2__tar.gz → 0.10.3__tar.gz

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: l0n0lc
-Version: 0.10.2
+Version: 0.10.3
 Summary: 一个将python函数翻译为c++函数并运行的jit编译器
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
@@ -63,6 +63,7 @@ import l0n0lc as lc
 import math
 import 测试可执行
 
+
 @lc.映射函数(math.ceil, ['<cmath>'])
 def cpp_ceil(v):
     return f'std::ceil({lc.toCString(v)});'
@@ -112,6 +113,12 @@ class CppVectorInt:
         return 0
 
 
+@lc.映射类型('short')
+class ShortInt:
+    def __init__(self, v) -> None:
+        pass
+
+
 @lc.jit(每次运行都重新编译=True)
 def jit_all_ops(a: int, b: int) -> int:
     # 常量与基础赋值
@@ -120,8 +127,10 @@ def jit_all_ops(a: int, b: int) -> int:
     z = 3.14
     flag = True
     nums = [1, 2, 3]
+    numsshorts = [ShortInt(1), ShortInt(2), ShortInt(3)]
     tup = (4, 5)
     mp = {1: 10, 2: 20}
+    mp2 = {ShortInt(1): 10, ShortInt(2): 20}
 
     # 一元运算
     pos = +(a + 1)
@@ -202,6 +211,7 @@ def jit_all_ops(a: int, b: int) -> int:
         print('vector->', i, '=', vector[i])
     return y
 
+
 @lc.jit(每次运行都重新编译=True)
 def test_add(a: int, b: int) -> int:
     if a > 1:
@@ -243,7 +253,6 @@ def test_add(a: int, b: int) -> int:
 
 print('结果:', test_add(1, 3))
 
-
 ```
 
 ## 4. 运行hello_world.py
@@ -282,24 +291,24 @@ vv: 1
 ## 5. 查看输出文件
 ```bash
 ls -al ./l0n0lcoutput
-total 164
-drwxr-xr-x  2 root root  4096 Oct 16 01:39 .
-drwxrwxrwx 11 1000 1000  4096 Oct 16 01:39 ..
--rw-r--r--  1 root root   298 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
--rw-r--r--  1 root root   128 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
--rw-r--r--  1 root root  1811 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
--rw-r--r--  1 root root   167 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
--rwxr-xr-x  1 root root 23584 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.so
--rw-r--r--  1 root root  1531 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
--rw-r--r--  1 root root   398 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
--rwxr-xr-x  1 root root 40408 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
--rw-r--r--  1 root root   155 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
--rw-r--r--  1 root root   106 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
--rwxr-xr-x  1 root root 15648 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
--rw-r--r--  1 root root   219 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
--rw-r--r--  1 root root   164 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
--rwxr-xr-x  1 root root 15688 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
--rwxr-xr-x  1 root root 17248 Oct 16 01:39 测试可执行文件
+total 176
+drwxr-xr-x  2 root root  4096 Oct 22 02:25 .
+drwxrwxrwx 11 1000 1000  4096 Oct 22 02:25 ..
+-rw-r--r--  1 root root   298 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
+-rw-r--r--  1 root root   128 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
+-rw-r--r--  1 root root  1944 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
+-rw-r--r--  1 root root   167 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
+-rwxr-xr-x  1 root root 29000 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.so
+-rw-r--r--  1 root root  1531 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
+-rw-r--r--  1 root root   398 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
+-rwxr-xr-x  1 root root 41728 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
+-rw-r--r--  1 root root   155 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
+-rw-r--r--  1 root root   106 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
+-rwxr-xr-x  1 root root 15648 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
+-rw-r--r--  1 root root   219 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
+-rw-r--r--  1 root root   164 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
+-rwxr-xr-x  1 root root 15688 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
+-rwxr-xr-x  1 root root 17248 Oct 22 02:25 测试可执行文件
 
 ```
 ## 6. 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
@@ -325,9 +334,9 @@ extern "C" int /*可执行*/ main (int argc, char** argv)
 #include <string>
 extern "C" int /*可执行*/ main (int argc, char** argv);
 ```
-## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
+## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
 ```c++
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 {
   auto x = 42;
@@ -335,8 +344,10 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
   auto z = 3.14;
   auto flag = true;
   int64_t nums[] = {1,2,3};
+  short numsshorts[] = {short(1),short(2),short(3)};
   int64_t tup[] = {4,5};
   std::unordered_map<int64_t, int64_t> mp = {{ 1, 10 },{ 2, 20 }};
+  std::unordered_map<short, int64_t> mp2 = {{ short(1), 10 },{ short(2), 20 }};
   auto pos = (+(a + 1));
   auto neg = (-b);
   auto inv = (~a);
@@ -422,7 +433,7 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 }
 
 ```
-## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
+## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
 ```c++
 #pragma once
 #include <cstdint>
@@ -500,7 +511,7 @@ extern "C" int64_t test_add (int64_t a, int64_t b)
 ## 11. c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
 ```c++
 #pragma once
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h"
 #include <cmath>

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/README.md

@@ -53,6 +53,7 @@ import l0n0lc as lc
 import math
 import 测试可执行
 
+
 @lc.映射函数(math.ceil, ['<cmath>'])
 def cpp_ceil(v):
     return f'std::ceil({lc.toCString(v)});'
@@ -102,6 +103,12 @@ class CppVectorInt:
         return 0
 
 
+@lc.映射类型('short')
+class ShortInt:
+    def __init__(self, v) -> None:
+        pass
+
+
 @lc.jit(每次运行都重新编译=True)
 def jit_all_ops(a: int, b: int) -> int:
     # 常量与基础赋值
@@ -110,8 +117,10 @@ def jit_all_ops(a: int, b: int) -> int:
     z = 3.14
     flag = True
     nums = [1, 2, 3]
+    numsshorts = [ShortInt(1), ShortInt(2), ShortInt(3)]
     tup = (4, 5)
     mp = {1: 10, 2: 20}
+    mp2 = {ShortInt(1): 10, ShortInt(2): 20}
 
     # 一元运算
     pos = +(a + 1)
@@ -192,6 +201,7 @@ def jit_all_ops(a: int, b: int) -> int:
         print('vector->', i, '=', vector[i])
     return y
 
+
 @lc.jit(每次运行都重新编译=True)
 def test_add(a: int, b: int) -> int:
     if a > 1:
@@ -233,7 +243,6 @@ def test_add(a: int, b: int) -> int:
 
 print('结果:', test_add(1, 3))
 
-
 ```
 
 ## 4. 运行hello_world.py
@@ -272,24 +281,24 @@ vv: 1
 ## 5. 查看输出文件
 ```bash
 ls -al ./l0n0lcoutput
-total 164
-drwxr-xr-x  2 root root  4096 Oct 16 01:39 .
-drwxrwxrwx 11 1000 1000  4096 Oct 16 01:39 ..
--rw-r--r--  1 root root   298 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
--rw-r--r--  1 root root   128 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
--rw-r--r--  1 root root  1811 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
--rw-r--r--  1 root root   167 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
--rwxr-xr-x  1 root root 23584 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.so
--rw-r--r--  1 root root  1531 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
--rw-r--r--  1 root root   398 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
--rwxr-xr-x  1 root root 40408 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
--rw-r--r--  1 root root   155 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
--rw-r--r--  1 root root   106 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
--rwxr-xr-x  1 root root 15648 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
--rw-r--r--  1 root root   219 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
--rw-r--r--  1 root root   164 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
--rwxr-xr-x  1 root root 15688 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
--rwxr-xr-x  1 root root 17248 Oct 16 01:39 测试可执行文件
+total 176
+drwxr-xr-x  2 root root  4096 Oct 22 02:25 .
+drwxrwxrwx 11 1000 1000  4096 Oct 22 02:25 ..
+-rw-r--r--  1 root root   298 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
+-rw-r--r--  1 root root   128 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
+-rw-r--r--  1 root root  1944 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
+-rw-r--r--  1 root root   167 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
+-rwxr-xr-x  1 root root 29000 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.so
+-rw-r--r--  1 root root  1531 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
+-rw-r--r--  1 root root   398 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
+-rwxr-xr-x  1 root root 41728 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
+-rw-r--r--  1 root root   155 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
+-rw-r--r--  1 root root   106 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
+-rwxr-xr-x  1 root root 15648 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
+-rw-r--r--  1 root root   219 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
+-rw-r--r--  1 root root   164 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
+-rwxr-xr-x  1 root root 15688 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
+-rwxr-xr-x  1 root root 17248 Oct 22 02:25 测试可执行文件
 
 ```
 ## 6. 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
@@ -315,9 +324,9 @@ extern "C" int /*可执行*/ main (int argc, char** argv)
 #include <string>
 extern "C" int /*可执行*/ main (int argc, char** argv);
 ```
-## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
+## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
 ```c++
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 {
   auto x = 42;
@@ -325,8 +334,10 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
   auto z = 3.14;
   auto flag = true;
   int64_t nums[] = {1,2,3};
+  short numsshorts[] = {short(1),short(2),short(3)};
   int64_t tup[] = {4,5};
   std::unordered_map<int64_t, int64_t> mp = {{ 1, 10 },{ 2, 20 }};
+  std::unordered_map<short, int64_t> mp2 = {{ short(1), 10 },{ short(2), 20 }};
   auto pos = (+(a + 1));
   auto neg = (-b);
   auto inv = (~a);
@@ -412,7 +423,7 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 }
 
 ```
-## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
+## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
 ```c++
 #pragma once
 #include <cstdint>
@@ -490,7 +501,7 @@ extern "C" int64_t test_add (int64_t a, int64_t b)
 ## 11. c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
 ```c++
 #pragma once
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h"
 #include <cmath>

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/l0n0lc/c/345/237/272/347/241/200/345/244/204/347/220/206.py

@@ -29,6 +29,69 @@ class 指针:
         return f'{self.基础类型}*'
 
 
+class 花括号:
+    def __init__(self, 编译器) -> None:
+        self.编译器 = 编译器
+
+    def __enter__(self, *args, **kwargs):
+        self.编译器.添加c代码('{')
+        self.编译器.进入新作用域()
+
+    def __exit__(self, *args, **kwargs):
+        self.编译器.退出作用域()
+        self.编译器.添加c代码('}\n')
+
+
+class c代码:
+    def __init__(self, 代码: str, 层级: int) -> None:
+        self.代码 = 代码
+        self.层级 = 层级
+
+    def __str__(self) -> str:
+        return '  ' * self.层级 + self.代码
+
+
+class c获取索引项目:
+    def __init__(self, 变量, 索引) -> None:
+        self.变量 = 变量
+        self.索引 = 索引
+
+    def __str__(self) -> str:
+        return f'{self.变量}[{toCString(self.索引)}]'
+
+
+class c获取属性:
+    def __init__(self, 变量, 属性) -> None:
+        self.变量 = 变量
+        self.属性 = 属性
+
+    def __str__(self) -> str:
+        if isinstance(self.变量, c变量):
+            if self.变量.类型.endswith('*'):
+                return f'{self.变量}->{self.属性}'
+        return f'{self.变量}.{self.属性}'
+
+
+class c函数调用:
+    def __init__(self, 函数名, 参数字符串, 返回的c类型=None) -> None:
+        self.函数名 = 函数名
+        self.参数字符串 = 参数字符串
+        self.返回的c类型 = 返回的c类型
+
+    def __str__(self) -> str:
+        return f'{self.函数名}({self.参数字符串})'
+
+
+class c布尔:
+    def __init__(self, v) -> None:
+        self.v = v
+
+    def __str__(self) -> str:
+        if self.v:
+            return 'true'
+        return 'false'
+
+
 def 执行额外函数(函数列表: List, *args):
     for fn in 函数列表:
         ret = fn(*args)
@@ -68,7 +131,7 @@ py2c类型映射表 = {
 }
 
 
-def py类型转c类型(类型):
+def py类型转c类型(类型, 类型实例=None):
     ret = 执行额外函数(额外py转c函数, 类型)
     if ret is not None:
         return ret
@@ -105,19 +168,24 @@ def py类型转c类型(类型):
     if isinstance(类型, str):
         return 类型
 
-    return cpp类型.ANY
+    if 类型 is c布尔:
+        return cpp类型.BOOL
+
+    if isinstance(类型实例, c函数调用) and 类型实例.返回的c类型 is not None:
+        return 类型实例.返回的c类型
+
+    raise Exception("不支持的类型", 类型, 类型实例)
 
 
 class list初始化列表:
     def __init__(
             self,
             代码: str,
-            类型列表: Union[List[Union[int, float, bool, str]],
-                        int, float, bool, str],
+            类型列表,
             长度: int) -> None:
         self.代码 = 代码
-        self.类型列表 = 类型列表
-        self.类型 = py类型转c类型(类型列表)
+        self.类型列表 = 类型列表[0]
+        self.类型 = py类型转c类型(*类型列表)
         self.长度 = 长度
 
     def __str__(self) -> str:
@@ -129,14 +197,16 @@ def 从list构建初始化列表(value: List):
     初始化列表 = []
     for v in value:
         dtype = type(v)
-        数据类型列表.append(dtype)
+        数据类型列表.append((dtype, v))
         初始化列表.append(toCString(v))
     # 构建初始化列表
     初始化列表 = '{' + ','.join(初始化列表) + '}'
 
     # 构建类型列表
-    if all(类型 == 数据类型列表[0] for 类型 in 数据类型列表):
+    if all(类型[0] == 数据类型列表[0][0] for 类型 in 数据类型列表):
         数据类型列表 = 数据类型列表[0]
+    else:
+        raise Exception(f"列表内数据类型必须相同{value}")
 
     return list初始化列表(初始化列表, 数据类型列表, len(value))
 
@@ -145,15 +215,13 @@ class dict初始化列表:
     def __init__(
             self,
             代码: str,
-            key类型列表: Union[List[Union[int, float, bool, str]],
-                           int, float, bool, str],
-            value类型列表: Union[List[Union[int, float, bool, str]],
-                             int, float, bool, str]) -> None:
+            key类型列表,
+            value类型列表) -> None:
         self.代码 = 代码
-        self.key类型列表 = key类型列表
-        self.value类型列表 = value类型列表
-        self.key类型 = py类型转c类型(key类型列表)
-        self.value类型 = py类型转c类型(value类型列表)
+        self.keyPy类型 = key类型列表[0]
+        self.valuePy类型 = value类型列表[0]
+        self.key类型 = py类型转c类型(*key类型列表)
+        self.value类型 = py类型转c类型(*value类型列表)
 
     def __str__(self) -> str:
         return self.代码
@@ -172,10 +240,14 @@ def 从dict构建初始化列表(value: dict):
 
     # 构建类型列表
     if all(类型 == key类型列表[0] for 类型 in key类型列表):
-        key类型列表 = key类型列表[0]
+        key类型列表 = (key类型列表[0], k)
+    else:
+        raise Exception(f"key数据类型必须相同{value.keys()}")
 
     if all(类型 == value类型列表[0] for 类型 in value类型列表):
-        value类型列表 = value类型列表[0]
+        value类型列表 = (value类型列表[0], v)
+    else:
+        raise Exception(f"value数据类型必须相同{value.values()}")
 
     # 构建初始化列表
     初始化列表 = '{' + ','.join(code) + '}'

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/l0n0lc/jit.py

@@ -19,68 +19,6 @@ class 代码异常抛出器:
             f'{错误信息} {self.代码行[node.lineno][node.col_offset:node.end_col_offset]}')
 
 
-class 花括号:
-    def __init__(self, 编译器) -> None:
-        self.编译器: py2cpp编译器 = 编译器
-
-    def __enter__(self, *args, **kwargs):
-        self.编译器.添加c代码('{')
-        self.编译器.进入新作用域()
-
-    def __exit__(self, *args, **kwargs):
-        self.编译器.退出作用域()
-        self.编译器.添加c代码('}\n')
-
-
-class c代码:
-    def __init__(self, 代码: str, 层级: int) -> None:
-        self.代码 = 代码
-        self.层级 = 层级
-
-    def __str__(self) -> str:
-        return '  ' * self.层级 + self.代码
-
-
-class c获取索引项目:
-    def __init__(self, 变量, 索引) -> None:
-        self.变量 = 变量
-        self.索引 = 索引
-
-    def __str__(self) -> str:
-        return f'{self.变量}[{toCString(self.索引)}]'
-
-
-class c获取属性:
-    def __init__(self, 变量, 属性) -> None:
-        self.变量 = 变量
-        self.属性 = 属性
-
-    def __str__(self) -> str:
-        if isinstance(self.变量, c变量):
-            if self.变量.类型.endswith('*'):
-                return f'{self.变量}->{self.属性}'
-        return f'{self.变量}.{self.属性}'
-
-
-class c函数调用:
-    def __init__(self, 函数名, 参数字符串) -> None:
-        self.函数名 = 函数名
-        self.参数字符串 = 参数字符串
-
-    def __str__(self) -> str:
-        return f'{self.函数名}({self.参数字符串})'
-
-
-class c布尔:
-    def __init__(self, v) -> None:
-        self.v = v
-
-    def __str__(self) -> str:
-        if self.v:
-            return 'true'
-        return 'false'
-
-
 class py2cpp编译器(ast.NodeVisitor):
     def __init__(self, 被编译的函数: Callable, c编译器, 编译为可执行文件文件名: str | None = None) -> None:
         self.被编译的函数 = 被编译的函数
@@ -329,7 +267,7 @@ class py2cpp编译器(ast.NodeVisitor):
                 for 库目录 in c类型.库目录:
                     self.库目录.add(库目录)
                 参数文本 = self.构建参数列表文本(node.args)
-                return c函数调用(c类型, 参数文本)
+                return c函数调用(c类型, 参数文本, c类型.目标类型)
 
         # 直接调用函数
         if fn in 通用信息.直接调用函数:

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/l0n0lc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: l0n0lc
-Version: 0.10.2
+Version: 0.10.3
 Summary: 一个将python函数翻译为c++函数并运行的jit编译器
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
@@ -63,6 +63,7 @@ import l0n0lc as lc
 import math
 import 测试可执行
 
+
 @lc.映射函数(math.ceil, ['<cmath>'])
 def cpp_ceil(v):
     return f'std::ceil({lc.toCString(v)});'
@@ -112,6 +113,12 @@ class CppVectorInt:
         return 0
 
 
+@lc.映射类型('short')
+class ShortInt:
+    def __init__(self, v) -> None:
+        pass
+
+
 @lc.jit(每次运行都重新编译=True)
 def jit_all_ops(a: int, b: int) -> int:
     # 常量与基础赋值
@@ -120,8 +127,10 @@ def jit_all_ops(a: int, b: int) -> int:
     z = 3.14
     flag = True
     nums = [1, 2, 3]
+    numsshorts = [ShortInt(1), ShortInt(2), ShortInt(3)]
     tup = (4, 5)
     mp = {1: 10, 2: 20}
+    mp2 = {ShortInt(1): 10, ShortInt(2): 20}
 
     # 一元运算
     pos = +(a + 1)
@@ -202,6 +211,7 @@ def jit_all_ops(a: int, b: int) -> int:
         print('vector->', i, '=', vector[i])
     return y
 
+
 @lc.jit(每次运行都重新编译=True)
 def test_add(a: int, b: int) -> int:
     if a > 1:
@@ -243,7 +253,6 @@ def test_add(a: int, b: int) -> int:
 
 print('结果:', test_add(1, 3))
 
-
 ```
 
 ## 4. 运行hello_world.py
@@ -282,24 +291,24 @@ vv: 1
 ## 5. 查看输出文件
 ```bash
 ls -al ./l0n0lcoutput
-total 164
-drwxr-xr-x  2 root root  4096 Oct 16 01:39 .
-drwxrwxrwx 11 1000 1000  4096 Oct 16 01:39 ..
--rw-r--r--  1 root root   298 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
--rw-r--r--  1 root root   128 Oct 16 01:39 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
--rw-r--r--  1 root root  1811 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
--rw-r--r--  1 root root   167 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
--rwxr-xr-x  1 root root 23584 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.so
--rw-r--r--  1 root root  1531 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
--rw-r--r--  1 root root   398 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
--rwxr-xr-x  1 root root 40408 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
--rw-r--r--  1 root root   155 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
--rw-r--r--  1 root root   106 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
--rwxr-xr-x  1 root root 15648 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
--rw-r--r--  1 root root   219 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
--rw-r--r--  1 root root   164 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
--rwxr-xr-x  1 root root 15688 Oct 16 01:39 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
--rwxr-xr-x  1 root root 17248 Oct 16 01:39 测试可执行文件
+total 176
+drwxr-xr-x  2 root root  4096 Oct 22 02:25 .
+drwxrwxrwx 11 1000 1000  4096 Oct 22 02:25 ..
+-rw-r--r--  1 root root   298 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
+-rw-r--r--  1 root root   128 Oct 22 02:25 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.h
+-rw-r--r--  1 root root  1944 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
+-rw-r--r--  1 root root   167 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
+-rwxr-xr-x  1 root root 29000 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.so
+-rw-r--r--  1 root root  1531 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.cpp
+-rw-r--r--  1 root root   398 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
+-rwxr-xr-x  1 root root 41728 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.so
+-rw-r--r--  1 root root   155 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.cpp
+-rw-r--r--  1 root root   106 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h
+-rwxr-xr-x  1 root root 15648 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.so
+-rw-r--r--  1 root root   219 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.cpp
+-rw-r--r--  1 root root   164 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h
+-rwxr-xr-x  1 root root 15688 Oct 22 02:25 c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.so
+-rwxr-xr-x  1 root root 17248 Oct 22 02:25 测试可执行文件
 
 ```
 ## 6. 6cbfb68e317eace4_测试可执行.py_可执行_@d82ed7910ac3268c.cpp
@@ -325,9 +334,9 @@ extern "C" int /*可执行*/ main (int argc, char** argv)
 #include <string>
 extern "C" int /*可执行*/ main (int argc, char** argv);
 ```
-## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.cpp
+## 8. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.cpp
 ```c++
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 {
   auto x = 42;
@@ -335,8 +344,10 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
   auto z = 3.14;
   auto flag = true;
   int64_t nums[] = {1,2,3};
+  short numsshorts[] = {short(1),short(2),short(3)};
   int64_t tup[] = {4,5};
   std::unordered_map<int64_t, int64_t> mp = {{ 1, 10 },{ 2, 20 }};
+  std::unordered_map<short, int64_t> mp2 = {{ short(1), 10 },{ short(2), 20 }};
   auto pos = (+(a + 1));
   auto neg = (-b);
   auto inv = (~a);
@@ -422,7 +433,7 @@ extern "C" int64_t jit_all_ops (int64_t a, int64_t b)
 }
 
 ```
-## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h
+## 9. c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h
 ```c++
 #pragma once
 #include <cstdint>
@@ -500,7 +511,7 @@ extern "C" int64_t test_add (int64_t a, int64_t b)
 ## 11. c31f68e99ed4ce3c_hello_world.py_test_add_@469de6acaaabc570.h
 ```c++
 #pragma once
-#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@7801528c3d61baf7.h"
+#include "c31f68e99ed4ce3c_hello_world.py_jit_all_ops_@c636865fefd2fd71.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test_other_fn_@75fdd928ab58a8e3.h"
 #include "c31f68e99ed4ce3c_hello_world.py_test编译的函数_@3bf4501e0408a243.h"
 #include <cmath>

{l0n0lc-0.10.2 → l0n0lc-0.10.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "l0n0lc"
-version = "0.10.2"
+version = "0.10.3"
 description = "一个将python函数翻译为c++函数并运行的jit编译器"
 readme = "README.md"
 requires-python = ">=3.10"