GH-615 Simplify panda module and move language from `panda-framew…

…ork` to `framework` package
panda-lang · Feb 7, 2021 · 7ed1433 · 7ed1433
1 parent 59d7e7a
commit 7ed1433
Show file tree

Hide file tree

Showing 640 changed files with 4,947 additions and 3,856 deletions.
diff --git a/build.sh b/build.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
 
+#
+# Copyright (c) 2021 dzikoysk
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 MAVEN_OPTS="-Xverify:none -XX:+TieredCompilation -XX:TieredStopAtLevel=1"
 mvn -T 1C install -am -offline
diff --git a/examples/lang/let.panda b/examples/lang/let.panda
@@ -15,5 +15,5 @@ main {
 
     /* Nillable */
 
-    nil let nillableValue = '#'
+    nil let nillableValue = Java.null()
 }
diff --git a/panda-framework/pom.xml b/panda-framework/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2020 Dzikoysk
+  ~ Copyright (c) 2021 dzikoysk
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/...java/org/panda_lang/language/Failure.java → ...ava/org/panda_lang/framework/Failure.java b/...java/org/panda_lang/language/Failure.java → ...ava/org/panda_lang/framework/Failure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
 import org.jetbrains.annotations.Nullable;
-import org.panda_lang.language.interpreter.source.IndicatedSource;
+import org.panda_lang.framework.interpreter.source.IndicatedSource;
 import org.panda_lang.utilities.commons.function.Option;
 
 /**

diff --git a/...da_lang/language/FrameworkController.java → ...a_lang/framework/FrameworkController.java b/...da_lang/language/FrameworkController.java → ...a_lang/framework/FrameworkController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
-import org.panda_lang.language.interpreter.logging.Logger;
-import org.panda_lang.language.interpreter.logging.LoggerHolder;
-import org.panda_lang.language.resource.Language;
-import org.panda_lang.language.resource.Resources;
+import org.panda_lang.framework.interpreter.logging.Logger;
+import org.panda_lang.framework.interpreter.logging.LoggerHolder;
+import org.panda_lang.framework.resource.Language;
+import org.panda_lang.framework.resource.Resources;
 
 /**
  * Panda Framework controller

diff --git a/...panda_lang/language/PandaClassLoader.java → ...anda_lang/framework/PandaClassLoader.java b/...panda_lang/language/PandaClassLoader.java → ...anda_lang/framework/PandaClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
 import java.net.URL;
 import java.net.URLClassLoader;

diff --git a/...g/panda_lang/language/PandaFramework.java → .../panda_lang/framework/PandaFramework.java b/...g/panda_lang/language/PandaFramework.java → .../panda_lang/framework/PandaFramework.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
-import org.panda_lang.language.interpreter.logging.Logger;
-import org.panda_lang.language.resource.Language;
-import org.panda_lang.language.resource.Resources;
+import org.panda_lang.framework.interpreter.logging.Logger;
+import org.panda_lang.framework.resource.Language;
+import org.panda_lang.framework.resource.Resources;
 
 public abstract class PandaFramework implements FrameworkController {
 

diff --git a/...ang/language/PandaFrameworkConstants.java → ...ng/framework/PandaFrameworkConstants.java b/...ang/language/PandaFrameworkConstants.java → ...ng/framework/PandaFrameworkConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
 public final class PandaFrameworkConstants {
 

diff --git a/...ang/language/PandaFrameworkException.java → ...ng/framework/PandaFrameworkException.java b/...ang/language/PandaFrameworkException.java → ...ng/framework/PandaFrameworkException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language;
+package org.panda_lang.framework;
 
 /**
  * Exception thrown by the framework

diff --git a/...ng/language/architecture/Application.java → ...g/framework/architecture/Application.java b/...ng/language/architecture/Application.java → ...g/framework/architecture/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language.architecture;
+package org.panda_lang.framework.architecture;
 
-import org.panda_lang.language.interpreter.logging.Logger;
-import org.panda_lang.language.interpreter.logging.LoggerHolder;
+import org.panda_lang.framework.interpreter.logging.Logger;
+import org.panda_lang.framework.interpreter.logging.LoggerHolder;
 import org.panda_lang.utilities.commons.function.Option;
 import org.panda_lang.utilities.commons.function.Result;
 

diff --git a/...ng/language/architecture/Environment.java → ...g/framework/architecture/Environment.java b/...ng/language/architecture/Environment.java → ...g/framework/architecture/Environment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language.architecture;
+package org.panda_lang.framework.architecture;
 
-import org.panda_lang.language.FrameworkController;
-import org.panda_lang.language.architecture.module.ModulePath;
-import org.panda_lang.language.architecture.module.TypeLoader;
-import org.panda_lang.language.architecture.type.generator.TypeGenerator;
-import org.panda_lang.language.interpreter.Interpreter;
-import org.panda_lang.language.interpreter.logging.LoggerHolder;
-import org.panda_lang.language.interpreter.source.SourceService;
+import org.panda_lang.framework.FrameworkController;
+import org.panda_lang.framework.architecture.module.ModulePath;
+import org.panda_lang.framework.architecture.module.TypeLoader;
+import org.panda_lang.framework.architecture.type.generator.TypeGenerator;
+import org.panda_lang.framework.interpreter.Interpreter;
+import org.panda_lang.framework.interpreter.logging.LoggerHolder;
+import org.panda_lang.framework.interpreter.source.SourceService;
 
 import java.io.File;
 

diff --git a/panda-framework/src/main/java/org/panda_lang/framework/architecture/ModuleSource.java b/panda-framework/src/main/java/org/panda_lang/framework/architecture/ModuleSource.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 dzikoysk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.panda_lang.framework.architecture;
+
+import org.panda_lang.framework.interpreter.source.Source;
+
+import java.util.Collection;
+
+public interface ModuleSource {
+
+    Collection<? extends Source> getSources();
+
+    Package getPackage();
+
+    String getSimpleName();
+
+    String getName();
+
+}
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/architecture/Package.java b/panda-framework/src/main/java/org/panda_lang/framework/architecture/Package.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 dzikoysk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.panda_lang.framework.architecture;
+
+public interface Package {
+
+    String getVersion();
+
+    String getName();
+
+}
diff --git a/...nguage/architecture/PandaApplication.java → ...mework/architecture/PandaApplication.java b/...nguage/architecture/PandaApplication.java → ...mework/architecture/PandaApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-package org.panda_lang.panda.language.architecture;
+package org.panda_lang.framework.architecture;
 
-import org.panda_lang.language.PandaFrameworkException;
-import org.panda_lang.language.architecture.Application;
-import org.panda_lang.language.architecture.Environment;
-import org.panda_lang.language.architecture.Script;
-import org.panda_lang.language.runtime.PandaProcess;
-import org.panda_lang.language.runtime.Process;
-import org.panda_lang.panda.language.resource.syntax.head.MainScope;
+import org.panda_lang.framework.PandaFrameworkException;
+import org.panda_lang.framework.architecture.statement.Main;
+import org.panda_lang.framework.runtime.PandaProcess;
+import org.panda_lang.framework.runtime.Process;
 import org.panda_lang.utilities.commons.function.Option;
 import org.panda_lang.utilities.commons.function.Result;
 
@@ -51,9 +48,9 @@ public <T> Result<Option<T>, Throwable> launch(String... args) {
         }
     }
 
-    private MainScope selectMain() {
-        List<MainScope> mains = scripts.stream()
-                .map(applicationScript -> applicationScript.select(MainScope.class))
+    private Main selectMain() {
+        List<Main> mains = scripts.stream()
+                .map(applicationScript -> applicationScript.select(Main.class))
                 .flatMap(List::stream)
                 .collect(Collectors.toList());
 

diff --git a/...language/architecture/AbstractScript.java → ...g/framework/architecture/PandaScript.java b/...language/architecture/AbstractScript.java → ...g/framework/architecture/PandaScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language.architecture;
+package org.panda_lang.framework.architecture;
 
-import org.panda_lang.language.architecture.module.Module;
-import org.panda_lang.language.architecture.statement.Statement;
+import org.panda_lang.framework.architecture.module.Module;
+import org.panda_lang.framework.architecture.statement.Statement;
 import org.panda_lang.utilities.commons.function.Completable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class AbstractScript implements Script {
+public class PandaScript implements Script {
 
     private final String scriptName;
     private final List<Statement> statements = new ArrayList<>();
     private final Completable<Module> associatedModule = new Completable<>();
 
-    public AbstractScript(String scriptName) {
+    public PandaScript(String scriptName) {
         this.scriptName = scriptName;
     }
 
@@ -65,4 +65,9 @@ public String getName() {
         return scriptName;
     }
 
+    @Override
+    public String toString() {
+        return getName();
+    }
+
 }
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/architecture/Routable.java b/panda-framework/src/main/java/org/panda_lang/framework/architecture/Routable.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 dzikoysk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.panda_lang.framework.architecture;
+
+import org.panda_lang.utilities.commons.function.Option;
+
+public interface Routable<T> {
+
+    Option<T> getParent();
+
+}
diff --git a/...da_lang/language/architecture/Script.java → ...a_lang/framework/architecture/Script.java b/...da_lang/language/architecture/Script.java → ...a_lang/framework/architecture/Script.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Dzikoysk
+ * Copyright (c) 2021 dzikoysk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.panda_lang.language.architecture;
+package org.panda_lang.framework.architecture;
 
-import org.panda_lang.language.architecture.module.Module;
-import org.panda_lang.language.architecture.statement.Statement;
+import org.panda_lang.framework.architecture.module.Module;
+import org.panda_lang.framework.architecture.statement.Statement;
 import org.panda_lang.utilities.commons.function.Completable;
 
 import java.util.List;