Merge pull request #394 from xlang-foundation/Jit

Jit

Core/import.cpp

@@ -157,7 +157,11 @@ bool X::AST::Import::FindAndLoadXModule(XlangRuntime* rt,
 		else
 		{
 			prefixPath = m_path;
-			ReplaceAll(prefixPath, ".", Path_Sep_S);
+			if (!m_pathHasQuotation)
+			{
+				//if not use from "path", then python style, replce . with /
+				ReplaceAll(prefixPath, ".", Path_Sep_S);
+			}
 		}
 	}
 	if (!bHaveX)
@@ -228,6 +232,7 @@ bool X::AST::Import::Exec(XlangRuntime* rt, ExecAction& action, XObj* pContext,
 		Value v0;
 		if (ExpExec(m_from,rt, action, pContext, v0, nullptr))
 		{
+			m_pathHasQuotation = m_from->PathHasQuotation();
 			m_path = v0.ToString();
 		}
 	}

Core/import.h

@@ -220,6 +220,7 @@ class ThruOp :
 class From :
 	public UnaryOp
 {
+	bool m_pathHasQuotation = false;
 	std::string m_path;
 public:
 	From() :
@@ -236,6 +237,10 @@ class From :
 	{
 		return m_path;
 	}
+	bool PathHasQuotation()
+	{
+		return m_pathHasQuotation;
+	}
 	bool Exec(XlangRuntime* rt,ExecAction& action, XObj* pContext,
 		Value& v, LValue* lValue) override
 	{
@@ -247,6 +252,7 @@ class From :
 			{
 				Str* pStr = dynamic_cast<Str*>(R);
 				m_path = std::string(pStr->GetChars(), pStr->Size());
+				m_pathHasQuotation = true;
 			}
 			else if (R->m_type == ObType::Var)
 			{
@@ -358,6 +364,7 @@ class Import :
 	//from path import moudule_lists
 	//only put one path after term: from
 	std::string m_path;
+	bool m_pathHasQuotation = false;
 	std::string m_thruUrl;
 	std::vector<ImportInfo> m_importInfos;
 	bool FindAndLoadExtensions(XlangRuntime* rt,

test/import/sub/func_from_sub.x

@@ -0,0 +1,3 @@
+
+def SubFunc():
+    return "SubFunc"

test/import/test102.x

@@ -0,0 +1,9 @@
+from "sub" import func_from_sub as sub
+
+x = sub.SubFunc()
+print("call from sub folder's module, x=${x}")
+
+from "../misc" import simple
+y = simple.test_return(100)
+print("y=${y}")
+print("Done")