fix: 调整导入结构，尝试继续兼容Linux

ARCJ137442 · Aug 29, 2023 · 3977e97 · 3977e97
1 parent c794fd2
commit 3977e97
Show file tree

Hide file tree

Showing 5 changed files with 746 additions and 747 deletions.
diff --git a/src/JuNarsese.jl b/src/JuNarsese.jl
@@ -26,9 +26,9 @@ using Reexport
 include("Util/Util.jl")
 
 include("Narsese/Narsese.jl")
-@reexport using .Narsese
-
 include("Conversion/Conversion.jl")
+
+@reexport using .Narsese
 @reexport using .Conversion
 
 

diff --git a/src/Narsese/Narsese.jl b/src/Narsese/Narsese.jl
@@ -34,15 +34,14 @@ export parse_default_float, parse_default_int, parse_default_uint
 
 # 导入&导出 #
 
+include("Terms/Terms.jl")
+include("Sentences/Sentences.jl")
+include("Tasks/Tasks.jl")
+
 using Reexport
 
-include("Terms/Terms.jl")
 @reexport using .Terms
-
-include("Sentences/Sentences.jl")
 @reexport using .Sentences
-
-include("Tasks/Tasks.jl")
 @reexport using .Tasks
 
 # 严格模式 #

diff --git a/src/Narsese/Sentences/stamp.jl b/src/Narsese/Sentences/stamp.jl
@@ -214,7 +214,7 @@ end
 begin "方法集"
 
     # 【20230815 16:33:51】函数「get_tense」已在「methods.jl」中定义
-    import ..Narsese: get_tense
+    import ..Terms: get_tense
 
     export is_fixed_occurrence_time