fix: replace "__main__" by package name when parse import statments i…

…n entry. (#660) feat: replace "__main__" by package name when parse import statments in entry.
kcl-lang · Aug 15, 2023 · 69b962b · 69b962b
1 parent 1b564db
commit 69b962b
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 1 deletion.
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/expected b/kclvm/cmd/src/test_data/instances/test_inst_10/expected
@@ -0,0 +1,2 @@
+a:
+  id: 102
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/kcl.yaml b/kclvm/cmd/src/test_data/instances/test_inst_10/kcl.yaml
@@ -0,0 +1,7 @@
+kcl_cli_configs:
+  file:
+    - ./test_inst_101/main.k
+    - ${test_inst_102:KCL_MOD}/main.k
+  package_maps:
+    test_inst_102: ./src/test_data/instances/test_inst_10/test_inst_102
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_101/kcl.mod b/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_101/kcl.mod
@@ -0,0 +1,5 @@
+[package]
+name = "test_inst_101"
+edition = "0.0.1"
+version = "0.0.1"
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_101/main.k b/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_101/main.k
@@ -0,0 +1,5 @@
+import test_inst_102 as k102
+
+a = k102.K102 {
+    id: 102
+}
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_102/kcl.mod b/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_102/kcl.mod
@@ -0,0 +1,5 @@
+[package]
+name = "test_inst_102"
+edition = "0.0.1"
+version = "0.0.1"
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_102/main.k b/kclvm/cmd/src/test_data/instances/test_inst_10/test_inst_102/main.k
@@ -0,0 +1,4 @@
+schema K102:
+    id: int
+
+inst102 = K102.instances()
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/expected b/kclvm/cmd/src/test_data/instances/test_inst_9/expected
@@ -0,0 +1,4 @@
+a:
+  id: 92
+inst92:
+- id: 92
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/kcl.yaml b/kclvm/cmd/src/test_data/instances/test_inst_9/kcl.yaml
@@ -0,0 +1,7 @@
+kcl_cli_configs:
+  file:
+    - ./test_inst_91/main.k
+    - ${test_inst_92:KCL_MOD}/main.k
+  package_maps:
+    test_inst_92: ./src/test_data/instances/test_inst_9/test_inst_92
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_91/kcl.mod b/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_91/kcl.mod
@@ -0,0 +1,5 @@
+[package]
+name = "test_inst_101"
+edition = "0.0.1"
+version = "0.0.1"
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_91/main.k b/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_91/main.k
@@ -0,0 +1,5 @@
+import test_inst_92.sub as k92
+
+a = k92.K92 {
+    id: 92
+}
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/kcl.mod b/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/kcl.mod
@@ -0,0 +1,5 @@
+[package]
+name = "test_inst_102"
+edition = "0.0.1"
+version = "0.0.1"
+
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/main.k b/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/main.k
@@ -0,0 +1,3 @@
+import sub as s
+
+inst92 = s.K92.instances()
diff --git a/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/sub/main.k b/kclvm/cmd/src/test_data/instances/test_inst_9/test_inst_92/sub/main.k
@@ -0,0 +1,2 @@
+schema K92:
+    id: int
diff --git a/kclvm/cmd/src/tests.rs b/kclvm/cmd/src/tests.rs
@@ -469,6 +469,8 @@ fn test_instances_with_yaml() {
         "test_inst_6",
         "test_inst_7",
         "test_inst_8",
+        "test_inst_9",
+        "test_inst_10",
     ];
 
     for case in &test_cases {

diff --git a/kclvm/parser/src/lib.rs b/kclvm/parser/src/lib.rs
@@ -307,7 +307,7 @@ impl Loader {
 
             self.load_import_package(
                 &entry.path(),
-                kclvm_ast::MAIN_PKG.to_string(),
+                entry.name().to_string(),
                 &mut pkg_files,
                 &mut pkgs,
             )?;