update export and import syntax

kulics · Apr 30, 2020 · e89545e · e89545e
1 parent f794234
commit e89545e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/Compiler/KParser.g4 b/Compiler/KParser.g4
@@ -8,12 +8,10 @@ statement: (New_Line)* (annotationSupport)?
 exportStatement (New_Line)* namespaceSupportStatement*;
 
 // 导出命名空间
-exportStatement: nameSpaceItem call left_brace (importStatement|typeAliasStatement|New_Line)* right_brace end;
-
-// 导入命名空间
-importStatement: (annotationSupport)? ((id Bang?|Discard) Colon)? nameSpaceItem stringExpr? end;
+exportStatement: Left_Arrow nameSpaceItem end;
 
 namespaceSupportStatement:
+importStatement |
 namespaceFunctionStatement |
 namespaceVariableStatement |
 namespaceConstantStatement |
@@ -25,6 +23,11 @@ typeRedefineStatement |
 typeTagStatement |
 New_Line ;
 
+// 导入命名空间
+importStatement: Right_Arrow left_brace (importSubStatement|typeAliasStatement|New_Line)* right_brace end;
+
+importSubStatement: (annotationSupport)? ((id Bang?|Discard) Colon)? nameSpaceItem stringExpr? end;
+
 // 类型别名
 typeAliasStatement: id Bang? Colon typeType end;
 // 类型重定义

diff --git a/Compiler/NameSpace.cs b/Compiler/NameSpace.cs
@@ -16,9 +16,8 @@ public partial class Namespace{
 public partial class KLangVisitor{
 public  override  object VisitStatement( StatementContext context ){
 var obj = "";
+var imports = "";
 var ns = (Namespace)(Visit(context.exportStatement()));
-obj+=(new System.Text.StringBuilder().Append("using Library;").Append(Wrap).Append("using static Library.Lib;").Append(Wrap)).to_str();
-obj+=ns.imports+Wrap;
 if ( context.annotationSupport()!=null ) {
 obj+=Visit(context.annotationSupport());
 }
@@ -44,6 +43,9 @@ public  override  object VisitStatement( StatementContext context ){
 if ( type==typeof(NamespaceVariableStatementContext)||type==typeof(NamespaceFunctionStatementContext)||type==typeof(NamespaceConstantStatementContext) ) {
 contentStatic+=Visit(item);
 }
+else if ( type==typeof(ImportStatementContext) ) {
+imports+=Visit(item);
+}
 else {
 content+=Visit(item);
 }
@@ -54,18 +56,23 @@ public  override  object VisitStatement( StatementContext context ){
 }
 this.delete_current_set();
 obj+=BlockRight+Wrap;
+obj=(new System.Text.StringBuilder().Append("using Library;").Append(Wrap).Append("using static Library.Lib;").Append(Wrap).Append(imports).Append(Wrap)).to_str()+obj;
 return obj;
 }
 public  override  object VisitExportStatement( ExportStatementContext context ){
 var name = (string)(Visit(context.nameSpaceItem()));
 var obj = (new Namespace(){name = name});
-foreach (var item in context.importStatement()){
-obj.imports+=(string)(Visit(item));
-}
 return obj;
 }
 public  override  object VisitImportStatement( ImportStatementContext context ){
 var obj = "";
+foreach (var item in context.importSubStatement()){
+obj+=(string)(Visit(item));
+}
+return obj;
+}
+public  override  object VisitImportSubStatement( ImportSubStatementContext context ){
+var obj = "";
 if ( context.annotationSupport()!=null ) {
 obj+=Visit(context.annotationSupport());
 }

diff --git a/Compiler/NameSpace.k b/Compiler/NameSpace.k
@@ -16,10 +16,8 @@ Namespace : $ {
 KLangVisitor : $ me {
     .VisitStatement : (context StatementContext -> v any) {
         obj! : ""
+        imports! : ""
         ns : Visit(context.exportStatement()) Namespace!
-        # "import library"
-        obj += "using Library;${Wrap}using static Library.Lib;${Wrap}"
-        obj += ns.imports + Wrap
         ? context.annotationSupport() >< nil {
             obj += Visit(context.annotationSupport())
         }
@@ -47,6 +45,8 @@ KLangVisitor : $ me {
                 type == typeof(NamespaceFunctionStatementContext) |
                 type == typeof(NamespaceConstantStatementContext) {
                 contentStatic += Visit(item)
+            } type == typeof(ImportStatementContext) {
+                imports += Visit(item)
             } _ {
                 content += Visit(item)
             }
@@ -57,6 +57,8 @@ KLangVisitor : $ me {
         }
         me.delete_current_set()
         obj += BlockRight + Wrap
+        # "import library"
+        obj = "using Library;${Wrap}using static Library.Lib;${Wrap; imports; Wrap}" + obj
         <- obj
     }
 
@@ -65,13 +67,18 @@ KLangVisitor : $ me {
         obj : Namespace{
             name = name
         }
-        @ item : context.importStatement() {
-            obj.imports += Visit(item) str!
-        }
         <- obj
     }
 
     .VisitImportStatement : (context ImportStatementContext -> v any) {
+        obj! : ""
+        @ item : context.importSubStatement() {
+            obj += Visit(item) str!
+        }
+        <- obj
+    }
+
+    .VisitImportSubStatement : (context ImportSubStatementContext -> v any) {
         obj! : ""
         ? context.annotationSupport() >< nil {
             obj += Visit(context.annotationSupport())