From b2cb0180cb6ee40c32e196907240812df808c95e Mon Sep 17 00:00:00 2001 From: mgtm98 Date: Wed, 18 Sep 2024 02:30:46 +0300 Subject: [PATCH] Initial fix --- jac/jaclang/cli/cli.py | 4 ++++ jac/{ => jaclang}/stubs/jaclang/__init__.pyi | 0 .../stubs/jaclang/cli/__init__.pyi | 0 jac/{ => jaclang}/stubs/jaclang/cli/cli.pyi | 0 .../stubs/jaclang/cli/cmdreg.pyi | 0 .../stubs/jaclang/compiler/__init__.pyi | 0 .../stubs/jaclang/compiler/absyntree.pyi | 0 .../stubs/jaclang/compiler/codeloc.pyi | 0 .../stubs/jaclang/compiler/compile.pyi | 0 .../stubs/jaclang/compiler/constant.pyi | 0 .../jaclang/compiler/generated/__init__.pyi | 0 .../jaclang/compiler/generated/jac_parser.pyi | 0 .../stubs/jaclang/compiler/parser.pyi | 0 .../jaclang/compiler/passes/__init__.pyi | 0 .../stubs/jaclang/compiler/passes/ir_pass.pyi | 0 .../jaclang/compiler/passes/main/__init__.pyi | 0 .../passes/main/access_modifier_pass.pyi | 0 .../passes/main/def_impl_match_pass.pyi | 0 .../compiler/passes/main/def_use_pass.pyi | 0 .../passes/main/fuse_typeinfo_pass.pyi | 0 .../compiler/passes/main/import_pass.pyi | 0 .../compiler/passes/main/pyast_gen_pass.pyi | 0 .../compiler/passes/main/pyast_load_pass.pyi | 0 .../compiler/passes/main/pybc_gen_pass.pyi | 0 .../passes/main/pyjac_ast_link_pass.pyi | 0 .../compiler/passes/main/pyout_pass.pyi | 0 .../compiler/passes/main/registry_pass.pyi | 0 .../compiler/passes/main/schedules.pyi | 0 .../passes/main/sub_node_tab_pass.pyi | 0 .../passes/main/sym_tab_build_pass.pyi | 0 .../compiler/passes/main/type_check_pass.pyi | 0 .../jaclang/compiler/passes/tool/__init__.pyi | 0 .../passes/tool/fuse_comments_pass.pyi | 0 .../passes/tool/jac_formatter_pass.pyi | 0 .../compiler/passes/tool/schedules.pyi | 0 .../jaclang/compiler/passes/transform.pyi | 0 .../compiler/passes/utils/__init__.pyi | 0 .../compiler/passes/utils/mypy_ast_build.pyi | 0 .../stubs/jaclang/compiler/semtable.pyi | 0 .../stubs/jaclang/compiler/symtable.pyi | 0 .../stubs/jaclang/langserve/__init__.pyi | 0 .../stubs/jaclang/langserve/engine.pyi | 0 .../stubs/jaclang/langserve/sem_manager.pyi | 0 .../stubs/jaclang/langserve/server.pyi | 0 .../stubs/jaclang/langserve/utils.pyi | 0 .../stubs/jaclang/plugin/__init__.pyi | 0 .../stubs/jaclang/plugin/builtin.pyi | 0 .../stubs/jaclang/plugin/default.pyi | 0 .../stubs/jaclang/plugin/feature.pyi | 0 .../stubs/jaclang/plugin/spec.pyi | 0 .../stubs/jaclang/runtimelib/__init__.pyi | 0 .../stubs/jaclang/runtimelib/architype.pyi | 0 .../stubs/jaclang/runtimelib/constructs.pyi | 0 .../stubs/jaclang/runtimelib/context.pyi | 0 .../stubs/jaclang/runtimelib/importer.pyi | 0 .../stubs/jaclang/runtimelib/machine.pyi | 0 .../stubs/jaclang/runtimelib/memory.pyi | 0 .../stubs/jaclang/runtimelib/utils.pyi | 0 jac/{ => jaclang}/stubs/jaclang/settings.pyi | 0 .../stubs/jaclang/utils/__init__.pyi | 0 .../stubs/jaclang/utils/helpers.pyi | 0 .../stubs/jaclang/utils/lang_tools.pyi | 0 jac/{ => jaclang}/stubs/jaclang/utils/log.pyi | 0 .../stubs/jaclang/utils/treeprinter.pyi | 0 jac/jaclang/vendor/mypy/modulefinder.py | 24 +++++++++---------- 65 files changed, 16 insertions(+), 12 deletions(-) rename jac/{ => jaclang}/stubs/jaclang/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/cli/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/cli/cli.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/cli/cmdreg.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/absyntree.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/codeloc.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/compile.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/constant.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/generated/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/generated/jac_parser.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/parser.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/ir_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/access_modifier_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/def_impl_match_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/def_use_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/fuse_typeinfo_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/import_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/pyast_gen_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/pyast_load_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/pybc_gen_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/pyjac_ast_link_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/pyout_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/registry_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/schedules.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/sub_node_tab_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/sym_tab_build_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/main/type_check_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/tool/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/tool/fuse_comments_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/tool/jac_formatter_pass.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/tool/schedules.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/transform.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/utils/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/passes/utils/mypy_ast_build.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/semtable.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/compiler/symtable.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/langserve/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/langserve/engine.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/langserve/sem_manager.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/langserve/server.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/langserve/utils.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/plugin/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/plugin/builtin.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/plugin/default.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/plugin/feature.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/plugin/spec.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/architype.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/constructs.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/context.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/importer.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/machine.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/memory.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/runtimelib/utils.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/settings.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/utils/__init__.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/utils/helpers.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/utils/lang_tools.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/utils/log.pyi (100%) rename jac/{ => jaclang}/stubs/jaclang/utils/treeprinter.pyi (100%) diff --git a/jac/jaclang/cli/cli.py b/jac/jaclang/cli/cli.py index e6e3949cb8..83dd48556b 100644 --- a/jac/jaclang/cli/cli.py +++ b/jac/jaclang/cli/cli.py @@ -4,6 +4,7 @@ import importlib import marshal import os +import pathlib import pickle import shutil import types @@ -497,6 +498,9 @@ def start_cli() -> None: Returns: - None """ + os.environ["MYPYPATH"] = str( + pathlib.Path(os.path.dirname(__file__)).parent / "stubs" + ) parser = cmd_registry.parser args = parser.parse_args() cmd_registry.args = args diff --git a/jac/stubs/jaclang/__init__.pyi b/jac/jaclang/stubs/jaclang/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/__init__.pyi rename to jac/jaclang/stubs/jaclang/__init__.pyi diff --git a/jac/stubs/jaclang/cli/__init__.pyi b/jac/jaclang/stubs/jaclang/cli/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/cli/__init__.pyi rename to jac/jaclang/stubs/jaclang/cli/__init__.pyi diff --git a/jac/stubs/jaclang/cli/cli.pyi b/jac/jaclang/stubs/jaclang/cli/cli.pyi similarity index 100% rename from jac/stubs/jaclang/cli/cli.pyi rename to jac/jaclang/stubs/jaclang/cli/cli.pyi diff --git a/jac/stubs/jaclang/cli/cmdreg.pyi b/jac/jaclang/stubs/jaclang/cli/cmdreg.pyi similarity index 100% rename from jac/stubs/jaclang/cli/cmdreg.pyi rename to jac/jaclang/stubs/jaclang/cli/cmdreg.pyi diff --git a/jac/stubs/jaclang/compiler/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/absyntree.pyi b/jac/jaclang/stubs/jaclang/compiler/absyntree.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/absyntree.pyi rename to jac/jaclang/stubs/jaclang/compiler/absyntree.pyi diff --git a/jac/stubs/jaclang/compiler/codeloc.pyi b/jac/jaclang/stubs/jaclang/compiler/codeloc.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/codeloc.pyi rename to jac/jaclang/stubs/jaclang/compiler/codeloc.pyi diff --git a/jac/stubs/jaclang/compiler/compile.pyi b/jac/jaclang/stubs/jaclang/compiler/compile.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/compile.pyi rename to jac/jaclang/stubs/jaclang/compiler/compile.pyi diff --git a/jac/stubs/jaclang/compiler/constant.pyi b/jac/jaclang/stubs/jaclang/compiler/constant.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/constant.pyi rename to jac/jaclang/stubs/jaclang/compiler/constant.pyi diff --git a/jac/stubs/jaclang/compiler/generated/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/generated/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/generated/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/generated/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/generated/jac_parser.pyi b/jac/jaclang/stubs/jaclang/compiler/generated/jac_parser.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/generated/jac_parser.pyi rename to jac/jaclang/stubs/jaclang/compiler/generated/jac_parser.pyi diff --git a/jac/stubs/jaclang/compiler/parser.pyi b/jac/jaclang/stubs/jaclang/compiler/parser.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/parser.pyi rename to jac/jaclang/stubs/jaclang/compiler/parser.pyi diff --git a/jac/stubs/jaclang/compiler/passes/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/passes/ir_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/ir_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/ir_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/ir_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/access_modifier_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/access_modifier_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/access_modifier_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/access_modifier_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/def_impl_match_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/def_impl_match_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/def_impl_match_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/def_impl_match_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/def_use_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/def_use_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/def_use_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/def_use_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/fuse_typeinfo_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/fuse_typeinfo_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/fuse_typeinfo_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/fuse_typeinfo_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/import_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/import_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/import_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/import_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/pyast_gen_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/pyast_gen_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/pyast_gen_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/pyast_gen_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/pyast_load_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/pyast_load_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/pyast_load_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/pyast_load_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/pybc_gen_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/pybc_gen_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/pybc_gen_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/pybc_gen_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/pyjac_ast_link_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/pyjac_ast_link_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/pyjac_ast_link_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/pyjac_ast_link_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/pyout_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/pyout_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/pyout_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/pyout_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/registry_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/registry_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/registry_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/registry_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/schedules.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/schedules.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/schedules.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/schedules.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/sub_node_tab_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/sub_node_tab_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/sub_node_tab_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/sub_node_tab_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/sym_tab_build_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/sym_tab_build_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/sym_tab_build_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/sym_tab_build_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/main/type_check_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/main/type_check_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/main/type_check_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/main/type_check_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/tool/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/tool/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/tool/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/tool/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/passes/tool/fuse_comments_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/tool/fuse_comments_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/tool/fuse_comments_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/tool/fuse_comments_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/tool/jac_formatter_pass.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/tool/jac_formatter_pass.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/tool/jac_formatter_pass.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/tool/jac_formatter_pass.pyi diff --git a/jac/stubs/jaclang/compiler/passes/tool/schedules.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/tool/schedules.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/tool/schedules.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/tool/schedules.pyi diff --git a/jac/stubs/jaclang/compiler/passes/transform.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/transform.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/transform.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/transform.pyi diff --git a/jac/stubs/jaclang/compiler/passes/utils/__init__.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/utils/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/utils/__init__.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/utils/__init__.pyi diff --git a/jac/stubs/jaclang/compiler/passes/utils/mypy_ast_build.pyi b/jac/jaclang/stubs/jaclang/compiler/passes/utils/mypy_ast_build.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/passes/utils/mypy_ast_build.pyi rename to jac/jaclang/stubs/jaclang/compiler/passes/utils/mypy_ast_build.pyi diff --git a/jac/stubs/jaclang/compiler/semtable.pyi b/jac/jaclang/stubs/jaclang/compiler/semtable.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/semtable.pyi rename to jac/jaclang/stubs/jaclang/compiler/semtable.pyi diff --git a/jac/stubs/jaclang/compiler/symtable.pyi b/jac/jaclang/stubs/jaclang/compiler/symtable.pyi similarity index 100% rename from jac/stubs/jaclang/compiler/symtable.pyi rename to jac/jaclang/stubs/jaclang/compiler/symtable.pyi diff --git a/jac/stubs/jaclang/langserve/__init__.pyi b/jac/jaclang/stubs/jaclang/langserve/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/langserve/__init__.pyi rename to jac/jaclang/stubs/jaclang/langserve/__init__.pyi diff --git a/jac/stubs/jaclang/langserve/engine.pyi b/jac/jaclang/stubs/jaclang/langserve/engine.pyi similarity index 100% rename from jac/stubs/jaclang/langserve/engine.pyi rename to jac/jaclang/stubs/jaclang/langserve/engine.pyi diff --git a/jac/stubs/jaclang/langserve/sem_manager.pyi b/jac/jaclang/stubs/jaclang/langserve/sem_manager.pyi similarity index 100% rename from jac/stubs/jaclang/langserve/sem_manager.pyi rename to jac/jaclang/stubs/jaclang/langserve/sem_manager.pyi diff --git a/jac/stubs/jaclang/langserve/server.pyi b/jac/jaclang/stubs/jaclang/langserve/server.pyi similarity index 100% rename from jac/stubs/jaclang/langserve/server.pyi rename to jac/jaclang/stubs/jaclang/langserve/server.pyi diff --git a/jac/stubs/jaclang/langserve/utils.pyi b/jac/jaclang/stubs/jaclang/langserve/utils.pyi similarity index 100% rename from jac/stubs/jaclang/langserve/utils.pyi rename to jac/jaclang/stubs/jaclang/langserve/utils.pyi diff --git a/jac/stubs/jaclang/plugin/__init__.pyi b/jac/jaclang/stubs/jaclang/plugin/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/plugin/__init__.pyi rename to jac/jaclang/stubs/jaclang/plugin/__init__.pyi diff --git a/jac/stubs/jaclang/plugin/builtin.pyi b/jac/jaclang/stubs/jaclang/plugin/builtin.pyi similarity index 100% rename from jac/stubs/jaclang/plugin/builtin.pyi rename to jac/jaclang/stubs/jaclang/plugin/builtin.pyi diff --git a/jac/stubs/jaclang/plugin/default.pyi b/jac/jaclang/stubs/jaclang/plugin/default.pyi similarity index 100% rename from jac/stubs/jaclang/plugin/default.pyi rename to jac/jaclang/stubs/jaclang/plugin/default.pyi diff --git a/jac/stubs/jaclang/plugin/feature.pyi b/jac/jaclang/stubs/jaclang/plugin/feature.pyi similarity index 100% rename from jac/stubs/jaclang/plugin/feature.pyi rename to jac/jaclang/stubs/jaclang/plugin/feature.pyi diff --git a/jac/stubs/jaclang/plugin/spec.pyi b/jac/jaclang/stubs/jaclang/plugin/spec.pyi similarity index 100% rename from jac/stubs/jaclang/plugin/spec.pyi rename to jac/jaclang/stubs/jaclang/plugin/spec.pyi diff --git a/jac/stubs/jaclang/runtimelib/__init__.pyi b/jac/jaclang/stubs/jaclang/runtimelib/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/__init__.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/__init__.pyi diff --git a/jac/stubs/jaclang/runtimelib/architype.pyi b/jac/jaclang/stubs/jaclang/runtimelib/architype.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/architype.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/architype.pyi diff --git a/jac/stubs/jaclang/runtimelib/constructs.pyi b/jac/jaclang/stubs/jaclang/runtimelib/constructs.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/constructs.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/constructs.pyi diff --git a/jac/stubs/jaclang/runtimelib/context.pyi b/jac/jaclang/stubs/jaclang/runtimelib/context.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/context.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/context.pyi diff --git a/jac/stubs/jaclang/runtimelib/importer.pyi b/jac/jaclang/stubs/jaclang/runtimelib/importer.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/importer.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/importer.pyi diff --git a/jac/stubs/jaclang/runtimelib/machine.pyi b/jac/jaclang/stubs/jaclang/runtimelib/machine.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/machine.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/machine.pyi diff --git a/jac/stubs/jaclang/runtimelib/memory.pyi b/jac/jaclang/stubs/jaclang/runtimelib/memory.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/memory.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/memory.pyi diff --git a/jac/stubs/jaclang/runtimelib/utils.pyi b/jac/jaclang/stubs/jaclang/runtimelib/utils.pyi similarity index 100% rename from jac/stubs/jaclang/runtimelib/utils.pyi rename to jac/jaclang/stubs/jaclang/runtimelib/utils.pyi diff --git a/jac/stubs/jaclang/settings.pyi b/jac/jaclang/stubs/jaclang/settings.pyi similarity index 100% rename from jac/stubs/jaclang/settings.pyi rename to jac/jaclang/stubs/jaclang/settings.pyi diff --git a/jac/stubs/jaclang/utils/__init__.pyi b/jac/jaclang/stubs/jaclang/utils/__init__.pyi similarity index 100% rename from jac/stubs/jaclang/utils/__init__.pyi rename to jac/jaclang/stubs/jaclang/utils/__init__.pyi diff --git a/jac/stubs/jaclang/utils/helpers.pyi b/jac/jaclang/stubs/jaclang/utils/helpers.pyi similarity index 100% rename from jac/stubs/jaclang/utils/helpers.pyi rename to jac/jaclang/stubs/jaclang/utils/helpers.pyi diff --git a/jac/stubs/jaclang/utils/lang_tools.pyi b/jac/jaclang/stubs/jaclang/utils/lang_tools.pyi similarity index 100% rename from jac/stubs/jaclang/utils/lang_tools.pyi rename to jac/jaclang/stubs/jaclang/utils/lang_tools.pyi diff --git a/jac/stubs/jaclang/utils/log.pyi b/jac/jaclang/stubs/jaclang/utils/log.pyi similarity index 100% rename from jac/stubs/jaclang/utils/log.pyi rename to jac/jaclang/stubs/jaclang/utils/log.pyi diff --git a/jac/stubs/jaclang/utils/treeprinter.pyi b/jac/jaclang/stubs/jaclang/utils/treeprinter.pyi similarity index 100% rename from jac/stubs/jaclang/utils/treeprinter.pyi rename to jac/jaclang/stubs/jaclang/utils/treeprinter.pyi diff --git a/jac/jaclang/vendor/mypy/modulefinder.py b/jac/jaclang/vendor/mypy/modulefinder.py index 452cfef20f..4b9ff399f2 100644 --- a/jac/jaclang/vendor/mypy/modulefinder.py +++ b/jac/jaclang/vendor/mypy/modulefinder.py @@ -813,18 +813,18 @@ def compute_search_paths( # We only use site packages for this check for site in site_packages: assert site not in lib_path - if ( - site in mypypath - or any(p.startswith(site + os.path.sep) for p in mypypath) - or (os.path.altsep and any(p.startswith(site + os.path.altsep) for p in mypypath)) - ): - print(f"{site} is in the MYPYPATH. Please remove it.", file=sys.stderr) - print( - "See https://mypy.readthedocs.io/en/stable/running_mypy.html" - "#how-mypy-handles-imports for more info", - file=sys.stderr, - ) - sys.exit(1) + # if ( + # site in mypypath + # or any(p.startswith(site + os.path.sep) for p in mypypath) + # or (os.path.altsep and any(p.startswith(site + os.path.altsep) for p in mypypath)) + # ): + # print(f"{site} is in the MYPYPATH. Please remove it.", file=sys.stderr) + # print( + # "See https://mypy.readthedocs.io/en/stable/running_mypy.html" + # "#how-mypy-handles-imports for more info", + # file=sys.stderr, + # ) + # sys.exit(1) return SearchPaths( python_path=tuple(reversed(python_path)),