IncludeCPP 4.0.1__py3-none-any.whl → 4.0.3__py3-none-any.whl

includecpp/vscode/cssl/package.json

@@ -2,7 +2,7 @@
     "name": "cssl",
     "displayName": "CSSL Language",
     "description": "Professional syntax highlighting, snippets, and language support for CSSL scripts (.cssl, .cssl-pl, .cssl-mod)",
-    "version": "1.6.0",
+    "version": "1.7.1",
     "publisher": "IncludeCPP",
     "icon": "images/cssl.png",
     "engines": {
@@ -151,6 +151,48 @@
                     "description": "Show output panel when running CSSL files"
                 }
             }
+        },
+        "configurationDefaults": {
+            "editor.tokenColorCustomizations": {
+                "textMateRules": [
+                    {
+                        "scope": "storage.modifier.cssl",
+                        "settings": {
+                            "fontStyle": "italic"
+                        }
+                    },
+                    {
+                        "scope": "storage.modifier.extends.cssl",
+                        "settings": {
+                            "fontStyle": "italic"
+                        }
+                    },
+                    {
+                        "scope": "storage.modifier.overwrites.cssl",
+                        "settings": {
+                            "fontStyle": "italic"
+                        }
+                    },
+                    {
+                        "scope": "support.type.cssl",
+                        "settings": {
+                            "foreground": "#C586C0"
+                        }
+                    },
+                    {
+                        "scope": "variable.other.declaration.cssl",
+                        "settings": {
+                            "foreground": "#9CDCFE"
+                        }
+                    },
+                    {
+                        "scope": "variable.parameter.cssl",
+                        "settings": {
+                            "foreground": "#9CDCFE"
+                        }
+                    }
+                ]
+            }
         }
     }
 }

includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json

@@ -15,6 +15,7 @@
         { "include": "#super-call" },
         { "include": "#sql-types" },
         { "include": "#keywords" },
+        { "include": "#typed-declarations" },
         { "include": "#types" },
         { "include": "#function-modifiers" },
         { "include": "#injection-operators" },
@@ -211,17 +212,21 @@
                         { "include": "#constructor-definition" },
                         { "include": "#class-method-definition" },
                         { "include": "#class-member-declaration" },
+                        { "include": "#typed-declarations" },
                         { "include": "#types" },
+                        { "include": "#function-modifiers" },
                         { "include": "#this-access" },
                         { "include": "#captured-references" },
                         { "include": "#global-references" },
                         { "include": "#shared-references" },
+                        { "include": "#instance-references" },
                         { "include": "#strings" },
                         { "include": "#numbers" },
                         { "include": "#keywords" },
                         { "include": "#function-calls" },
                         { "include": "#builtins" },
-                        { "include": "#operators" }
+                        { "include": "#operators" },
+                        { "include": "#constants" }
                     ]
                 },
                 {
@@ -241,17 +246,21 @@
                         { "include": "#constructor-definition" },
                         { "include": "#class-method-definition" },
                         { "include": "#class-member-declaration" },
+                        { "include": "#typed-declarations" },
                         { "include": "#types" },
+                        { "include": "#function-modifiers" },
                         { "include": "#this-access" },
                         { "include": "#captured-references" },
                         { "include": "#global-references" },
                         { "include": "#shared-references" },
+                        { "include": "#instance-references" },
                         { "include": "#strings" },
                         { "include": "#numbers" },
                         { "include": "#keywords" },
                         { "include": "#function-calls" },
                         { "include": "#builtins" },
-                        { "include": "#operators" }
+                        { "include": "#operators" },
+                        { "include": "#constants" }
                     ]
                 },
                 {
@@ -267,17 +276,21 @@
                         { "include": "#constructor-definition" },
                         { "include": "#class-method-definition" },
                         { "include": "#class-member-declaration" },
+                        { "include": "#typed-declarations" },
                         { "include": "#types" },
+                        { "include": "#function-modifiers" },
                         { "include": "#this-access" },
                         { "include": "#captured-references" },
                         { "include": "#global-references" },
                         { "include": "#shared-references" },
+                        { "include": "#instance-references" },
                         { "include": "#strings" },
                         { "include": "#numbers" },
                         { "include": "#keywords" },
                         { "include": "#function-calls" },
                         { "include": "#builtins" },
-                        { "include": "#operators" }
+                        { "include": "#operators" },
+                        { "include": "#constants" }
                     ]
                 }
             ]
@@ -354,11 +367,42 @@
         "class-member-declaration": {
             "patterns": [
                 {
+                    "comment": "Generic type member: datastruct<dynamic> Container;",
+                    "name": "meta.member.generic.cssl",
+                    "match": "(\\b(?:array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue))(<)([^>]+)(>)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*;",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "support.type.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" },
+                        "5": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Primitive type member: string ApiID;",
                     "name": "meta.member.cssl",
-                    "match": "\\b(int|string|float|bool|dynamic|auto)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*;",
+                    "match": "\\b(int|string|float|bool|dynamic|auto|void|json|long|double)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*;",
                     "captures": {
-                        "1": { "name": "storage.type.cssl" },
-                        "2": { "name": "variable.other.member.cssl" }
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Container type member without generic: list items;",
+                    "name": "meta.member.container.cssl",
+                    "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*;",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Primitive type member with assignment: string ApiID = value;",
+                    "name": "meta.member.assigned.cssl",
+                    "match": "\\b(int|string|float|bool|dynamic|auto|void|json|long|double)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*=",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.other.declaration.cssl" }
                     }
                 }
             ]
@@ -440,10 +484,65 @@
                 }
             ]
         },
+        "typed-declarations": {
+            "patterns": [
+                {
+                    "comment": "Generic type declaration: datastruct<dynamic> Container; or vector<int> items;",
+                    "name": "meta.declaration.typed.generic.cssl",
+                    "match": "(\\b(?:array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue))(<)([^>]+)(>)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "support.type.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" },
+                        "5": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Primitive type declaration: string ID; or int count;",
+                    "name": "meta.declaration.typed.primitive.cssl",
+                    "match": "\\b(int|string|float|bool|void|json|dynamic|auto|long|double)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[;=])",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Container type declaration without generic: list items;",
+                    "name": "meta.declaration.typed.container.cssl",
+                    "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[;=])",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "Generic type in function parameter: func(datastruct<dynamic> param)",
+                    "name": "meta.parameter.typed.generic.cssl",
+                    "match": "(\\b(?:array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue))(<)([^>]+)(>)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[,)])",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "support.type.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" },
+                        "5": { "name": "variable.parameter.cssl" }
+                    }
+                },
+                {
+                    "comment": "Primitive type in function parameter: func(string name)",
+                    "name": "meta.parameter.typed.primitive.cssl",
+                    "match": "\\b(int|string|float|bool|void|json|dynamic|auto|long|double)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[,)])",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "variable.parameter.cssl" }
+                    }
+                }
+            ]
+        },
         "types": {
             "patterns": [
                 {
-                    "name": "storage.type.primitive.cssl",
+                    "name": "support.type.cssl",
                     "match": "\\b(int|string|float|bool|void|json|dynamic|auto|long|double)\\b"
                 },
                 {
@@ -451,18 +550,18 @@
                     "name": "meta.generic.cssl",
                     "match": "(\\b(?:array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue))(<)([^>]+)(>)",
                     "captures": {
-                        "1": { "name": "storage.type.container.cssl" },
+                        "1": { "name": "support.type.cssl" },
                         "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
-                        "3": { "name": "storage.type.parameter.cssl" },
+                        "3": { "name": "support.type.cssl" },
                         "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
                     }
                 },
                 {
-                    "name": "storage.type.container.cssl",
+                    "name": "support.type.cssl",
                     "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|instance|tuple|set|queue)\\b"
                 },
                 {
-                    "name": "storage.type.combo-open.cssl",
+                    "name": "support.type.cssl",
                     "match": "\\bcombo\\s*<\\s*open\\s*&"
                 }
             ]
@@ -471,7 +570,7 @@
             "patterns": [
                 {
                     "name": "storage.modifier.cssl",
-                    "match": "\\b(undefined|open|closed|private|virtual|meta|super|sqlbased|protected|limited)\\b"
+                    "match": "\\b(undefined|open|closed|private|virtual|meta|super|sqlbased|protected|limited|const|static|final|abstract|readonly)\\b"
                 }
             ]
         },
@@ -619,24 +718,48 @@
         "instance-references": {
             "patterns": [
                 {
-                    "comment": "instance<\"name\"> - shared instance reference with string",
+                    "comment": "instance<\"name\"> varName - shared instance declaration with variable",
+                    "name": "meta.instance.declaration.cssl",
+                    "match": "(\\binstance)(<)(\"[^\"]+\")(>)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "string.quoted.double.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" },
+                        "5": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "instance<Type> varName - shared instance declaration with type and variable",
+                    "name": "meta.instance.declaration.cssl",
+                    "match": "(\\binstance)(<)([a-zA-Z_][a-zA-Z0-9_]*)(>)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "support.type.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" },
+                        "5": { "name": "variable.other.declaration.cssl" }
+                    }
+                },
+                {
+                    "comment": "instance<\"name\"> - shared instance reference without variable",
                     "name": "meta.instance.cssl",
                     "match": "(\\binstance)(<)(\"[^\"]+\")(>)",
                     "captures": {
-                        "1": { "name": "storage.type.instance.cssl" },
+                        "1": { "name": "support.type.cssl" },
                         "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
                         "3": { "name": "string.quoted.double.cssl" },
                         "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
                     }
                 },
                 {
-                    "comment": "instance<Type> - shared instance reference with type",
+                    "comment": "instance<Type> - shared instance reference without variable",
                     "name": "meta.instance.cssl",
                     "match": "(\\binstance)(<)([a-zA-Z_][a-zA-Z0-9_]*)(>)",
                     "captures": {
-                        "1": { "name": "storage.type.instance.cssl" },
+                        "1": { "name": "support.type.cssl" },
                         "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
-                        "3": { "name": "entity.name.type.cssl" },
+                        "3": { "name": "support.type.cssl" },
                         "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
                     }
                 }

{includecpp-4.0.1.dist-info → includecpp-4.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 4.0.1
+Version: 4.0.3
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-4.0.1.dist-info → includecpp-4.0.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-includecpp/__init__.py,sha256=sYebQW4N2qP2sozPh4X7krZm_jf0N1e1MB6UrncbLBY,1672
+includecpp/__init__.py,sha256=kyD1GPUlAX67eTPg5FgXkPAkTbMulKjmsgpiaFykMvQ,1672
 includecpp/__init__.pyi,sha256=uSDYlbqd2TinmrdepmE_zvN25jd3Co2cgyPzXgDpopM,7193
 includecpp/__main__.py,sha256=d6QK0PkvUe1ENofpmHRAg3bwNbZr8PiRscfI3-WRfVg,72
 includecpp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,8 +11,8 @@ includecpp/core/build_manager.py,sha256=uLuYsuiC6OsOGaU5wAJfl4M3IbdnIDgogfMd8VsV
 includecpp/core/cpp_api.py,sha256=8y_B1L18rhSBZln654xPPzqO2PdvAlLpJrfEjzl7Wnc,14039
 includecpp/core/cpp_api.pyi,sha256=IEiaKqaPItnn6rjL7aK32D3o9FYmRYCgCZbqiQNUwdc,3496
 includecpp/core/cppy_converter.py,sha256=b7yqu-aoa0wShNY0GvQT67TnNhYya4GyYmG7oDdqDV4,156686
-includecpp/core/cssl_bridge.py,sha256=AyYD-vFkxRtWy1LZv6OP_XJtPRWIPTf2YVHOiajmSY8,43016
-includecpp/core/cssl_bridge.pyi,sha256=tQxb3lneufgVmXSAqDUwjoluUNo8Wa5QIOnaL8ai6q0,12055
+includecpp/core/cssl_bridge.py,sha256=xYfIRagegO8irdWl97dfanRB1qLU80p9lQ2wxkttGQ4,49963
+includecpp/core/cssl_bridge.pyi,sha256=nreh2gtK94I6VFrzTWcYVUHN97wcYQF0dY_-HySi7yQ,28787
 includecpp/core/error_catalog.py,sha256=VS3N-P0yEbiHimsDPtcaYfrUb7mXQ-7pqw18PtSngaU,33869
 includecpp/core/error_formatter.py,sha256=7-MzRIT8cM4uODxy0IZ9pu7pqR4Pq2I8Si0QQZHjmVc,39239
 includecpp/core/exceptions.py,sha256=szeF4qdzi_q8hBBZi7mJxkliyQ0crplkLYe0ymlBGtk,2459
@@ -27,9 +27,9 @@ includecpp/core/cssl/cssl_builtins.pyi,sha256=-yr9JbxHKFv9Vc1iufChcqCQvNQLL3-Ow_
 includecpp/core/cssl/cssl_events.py,sha256=nupIcXW_Vjdud7zCU6hdwkQRQ0MujlPM7Tk2u7eDAiY,21013
 includecpp/core/cssl/cssl_modules.py,sha256=cUg0-zdymMnWWTsA_BUrW5dx4R04dHpKcUhm-Wfiwwo,103006
 includecpp/core/cssl/cssl_parser.py,sha256=4GHFcGa6jv7sgQxP0wWqCci8eS4E8Ie2t-qfJ2Ux9BU,154072
-includecpp/core/cssl/cssl_runtime.py,sha256=eSmR1eq9by5VXjsYZp3x8ksJj4PaUR46iqsby2Y0bAI,209792
+includecpp/core/cssl/cssl_runtime.py,sha256=7R3lGdw-2G9_0H5jf3D8Cn_2inLHyw2771XFopMz51s,217360
 includecpp/core/cssl/cssl_syntax.py,sha256=bgo3NFehoPTQa5dqwNd_CstkVGVCNYAXbGYUcu5BEN0,16982
-includecpp/core/cssl/cssl_types.py,sha256=7jbrtZf3xmVQJA_mnL9iYrmdjhjuc4--mxxNigi7fsk,53425
+includecpp/core/cssl/cssl_types.py,sha256=e3yJfM7VqaeuU92jtmvpxfwURWXGmIJlEC41baZryvw,58452
 includecpp/generator/__init__.py,sha256=Rsy41bwimaEloD3gDRR_znPfIJzIsCFuWZgCTJBLJlc,62
 includecpp/generator/parser.cpp,sha256=hbhHdtFH65rzp6prnARN9pNFF_ssr0NseVVcxq0fJh4,76833
 includecpp/generator/parser.h,sha256=EDm0b-pEesIIIQQ2PvH5h2qwlqJU9BH8SiMV7MWbsTo,11073
@@ -40,14 +40,14 @@ includecpp/vscode/__init__.py,sha256=yLKw-_7MTX1Rx3jLk5JjharJQfFXbwtZVE7YqHpM7yg
 includecpp/vscode/cssl/__init__.py,sha256=rQJAx5X05v-mAwqX1Qb-rbZO219iR73MziFNRUCNUIo,31
 includecpp/vscode/cssl/extension.js,sha256=FZaKfOpzo2jXtubVCZmnhDZd4eUVHltm5VW_fgNnSkE,4327
 includecpp/vscode/cssl/language-configuration.json,sha256=61Q00cKI9may5L8YpxMmvfo6PAc-abdJqApfR85DWuw,904
-includecpp/vscode/cssl/package.json,sha256=5MCJts7zYIgF8EdWcBnn98deIMyZamlGXvt1acO0Q1U,4853
+includecpp/vscode/cssl/package.json,sha256=u5iHl79-GfeJiQ7vPe8DP5hXlOpGP41d1A54bn4Yy6M,6391
 includecpp/vscode/cssl/images/cssl.png,sha256=BxAGsnfS0ZzzCvqV6Zb1OAJAZpDUoXlR86MsvUGlSZw,510
 includecpp/vscode/cssl/images/cssl_pl.png,sha256=z4WMk7g6YCTbUUbSFk343BO6yi_OmNEVYkRenWGydwM,799
 includecpp/vscode/cssl/snippets/cssl.snippets.json,sha256=uV3nHJyQ5f7Pr3FzfbQT2VZOEY3AlGs4wrmqe884jm4,37372
-includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json,sha256=FZw1_VDz1ll4ZBZeGqo-935CK5RuF2kD75rNp5tVdC0,35068
-includecpp-4.0.1.dist-info/licenses/LICENSE,sha256=fWCsGGsiWZir0UzDd20Hh-3wtRyk1zqUntvtVuAWhvc,1093
-includecpp-4.0.1.dist-info/METADATA,sha256=D-S3OTYYEksZOF-tpxhFNXaBwFdUNxuI3HxIsNDj58Q,22542
-includecpp-4.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-includecpp-4.0.1.dist-info/entry_points.txt,sha256=6A5Mif9gi0139Bf03W5plAb3wnAgbNaEVe1HJoGE-2o,59
-includecpp-4.0.1.dist-info/top_level.txt,sha256=RFUaR1KG-M6mCYwP6w4ydP5Cgc8yNbP78jxGAvyjMa8,11
-includecpp-4.0.1.dist-info/RECORD,,
+includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json,sha256=nYy7aRWREcgCu9Jbx5QmtQHfD4WRlk-HkPhqzKVtoIA,42806
+includecpp-4.0.3.dist-info/licenses/LICENSE,sha256=fWCsGGsiWZir0UzDd20Hh-3wtRyk1zqUntvtVuAWhvc,1093
+includecpp-4.0.3.dist-info/METADATA,sha256=HrQsoVYGdTmArZ8MsnftKkBoY7a25f9Zv3AiyFpuHn8,22542
+includecpp-4.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+includecpp-4.0.3.dist-info/entry_points.txt,sha256=6A5Mif9gi0139Bf03W5plAb3wnAgbNaEVe1HJoGE-2o,59
+includecpp-4.0.3.dist-info/top_level.txt,sha256=RFUaR1KG-M6mCYwP6w4ydP5Cgc8yNbP78jxGAvyjMa8,11
+includecpp-4.0.3.dist-info/RECORD,,