Bugfixes.

dim-s · dim-s · commit cc1b394c19ec · 2020-03-07T22:50:45.000+03:00
diff --git a/jphp-core/api-docs/README.md b/jphp-core/api-docs/README.md
@@ -9,7 +9,7 @@ Compiler and Launcher for JPHP.
 
 ### Install
 ```
-jppm add jphp-core@1.2.5
+jppm add jphp-core@1.2.6
 ```
 
 ### API
diff --git a/jphp-core/api-docs/README.ru.md b/jphp-core/api-docs/README.ru.md
@@ -9,7 +9,7 @@ Compiler and Launcher for JPHP.
 
 ### Установка
 ```
-jppm add jphp-core@1.2.5
+jppm add jphp-core@1.2.6
 ```
 
 ### АПИ
diff --git a/jphp-core/package.php.yml b/jphp-core/package.php.yml
@@ -1,10 +1,10 @@
 
 name: jphp-core
-version: 1.2.5
+version: 1.2.6
 description: Compiler and Launcher for JPHP.
 
 deps:
-  jphp-runtime: '~1.2.5'
+  jphp-runtime: '~1.2.6'
 
 
 plugins: [Doc, Hub]
diff --git a/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ClassStmtCompiler.java b/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ClassStmtCompiler.java
@@ -583,7 +583,7 @@ protected void writeInitEnvironment() {
                 expressionCompiler.writePushConstString(entity.getName());
                 expressionCompiler.writePushConstString(entity.getLowerName());
             }
-            expressionCompiler.writePushConstBoolean(true);
+            expressionCompiler.writePushConstBoolean(false);
             expressionCompiler.writeSysDynamicCall(
                     Environment.class, "fetchClass", ClassEntity.class, String.class, String.class, Boolean.TYPE
             );
diff --git a/jphp-runtime/api-docs/README.md b/jphp-runtime/api-docs/README.md
@@ -9,7 +9,7 @@ Runtime for JPHP + Standard library.
 
 ### Install
 ```
-jppm add jphp-runtime@1.2.5
+jppm add jphp-runtime@1.2.6
 ```
 
 ### API
diff --git a/jphp-runtime/api-docs/README.ru.md b/jphp-runtime/api-docs/README.ru.md
@@ -9,7 +9,7 @@ Runtime for JPHP + Standard library.
 
 ### Установка
 ```
-jppm add jphp-runtime@1.2.5
+jppm add jphp-runtime@1.2.6
 ```
 
 ### АПИ
diff --git a/jphp-runtime/package.php.yml b/jphp-runtime/package.php.yml
@@ -1,6 +1,6 @@
 
 name: jphp-runtime
-version: 1.2.5
+version: 1.2.6
 description: Runtime for JPHP + Standard library.
 
 plugins: [Doc, Hub]
diff --git a/jphp-runtime/src/php/runtime/env/CompileScope.java b/jphp-runtime/src/php/runtime/env/CompileScope.java
@@ -460,13 +460,17 @@ public ClassEntity fetchUserClass(Class<? extends IObject> clazz) {
     }
 
     public ClassEntity fetchUserClass(String name) {
-        return fetchUserClass(name, name.toLowerCase());
+        return fetchUserClass(name, name.toLowerCase(), true);
     }
 
     public ClassEntity fetchUserClass(String name, String nameLower) {
+        return fetchUserClass(name, nameLower, true);
+    }
+
+    public ClassEntity fetchUserClass(String name, String nameLower, boolean autoLoad) {
         ClassEntity entity;
 
-        if (classEntityFetchHandler != null) {
+        if (autoLoad && classEntityFetchHandler != null) {
             for (EntityFetchHandler handler : classEntityFetchHandler) {
                 handler.fetch(this, name, nameLower);
             }
diff --git a/jphp-runtime/src/php/runtime/env/Environment.java b/jphp-runtime/src/php/runtime/env/Environment.java
@@ -651,13 +651,18 @@ public ClassEntity fetchClass(String name, String nameL, boolean autoLoad) {
             entity = classMap.get(nameL); // try retry!
 
             if (entity == null) {
-                entity = scope.fetchUserClass(name, nameL);
+                entity = scope.fetchUserClass(name, nameL, autoLoad);
 
                 if (entity != null) {
                     try {
                         entity.initEnvironment(this);
                     } catch (Throwable throwable) {
-                        throw new CriticalException(throwable);
+                        // nop.
+                        if (throwable instanceof BaseBaseException) {
+                            error(ErrorType.E_CORE_ERROR, "Failed to init environment for class " + name);
+                        } else {
+                            error(ErrorType.E_CORE_ERROR, "Failed to init environment for class " + name + ": " + throwable.getMessage());
+                        }
                     }
                     classMap.put(entity.getLowerName(), entity);
                     return entity;
diff --git a/jphp-runtime/src/php/runtime/ext/core/classes/WrapModule.java b/jphp-runtime/src/php/runtime/ext/core/classes/WrapModule.java
@@ -206,29 +206,37 @@ public Memory dumpJVMClasses(Environment env, Memory... args) throws IOException
 
         ArrayMemory classes = new ArrayMemory();
         for (ClassEntity classEntity : module.getClasses()) {
-            File file = saveJavaClass(entityClassFile.apply(classEntity), classEntity.getData());
-            classes.put(classEntity.getName(), file.toString());
+            if (classEntity.getData() != null) {
+                File file = saveJavaClass(entityClassFile.apply(classEntity), classEntity.getData());
+                classes.put(classEntity.getName(), file.toString());
+            }
         }
         result.put("classes", classes);
 
         ArrayMemory functions = new ArrayMemory();
         for (FunctionEntity functionEntity : module.getFunctions()) {
-            File file = saveJavaClass(entityClassFile.apply(functionEntity), functionEntity.getData());
-            functions.put(functionEntity.getName(), file.toString());
+            if (functionEntity.getData() != null) {
+                File file = saveJavaClass(entityClassFile.apply(functionEntity), functionEntity.getData());
+                functions.put(functionEntity.getName(), file.toString());
+            }
         }
         result.put("functions", functions);
 
         ArrayMemory closures = new ArrayMemory();
         for (ClosureEntity one : module.getClosures()) {
-            File file = saveJavaClass(entityClassFile.apply(one), one.getData());
-            closures.add(file.toString());
+            if (one.getData() != null) {
+                File file = saveJavaClass(entityClassFile.apply(one), one.getData());
+                closures.add(file.toString());
+            }
         }
         result.put("closures", closures);
 
         ArrayMemory generators = new ArrayMemory();
         for (GeneratorEntity one : module.getGenerators()) {
-            File file = saveJavaClass(entityClassFile.apply(one), one.getData());
-            generators.add(file.toString());
+            if (one.getData() != null) {
+                File file = saveJavaClass(entityClassFile.apply(one), one.getData());
+                generators.add(file.toString());
+            }
         }
         result.put("generators", generators);
 
diff --git a/jphp-runtime/src/php/runtime/loader/StandaloneLoader.java b/jphp-runtime/src/php/runtime/loader/StandaloneLoader.java
@@ -4,14 +4,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
 import php.runtime.Memory;
@@ -52,6 +46,8 @@ public class StandaloneLoader {
 
     private StandaloneLibrary library;
 
+    private final Set<String> classesLoaded = ConcurrentHashMap.newKeySet(1000);
+
     public StandaloneLoader() {
         config = new Properties();
         scope = new CompileScope();
@@ -265,6 +261,10 @@ public ModuleEntity fetchModule(String name) {
 
         ModuleEntity entity = _fetch(name, library.getModules());
 
+        if (entity == null && name.startsWith("res://")) {
+            entity = _fetch(name.substring(6), library.getModules());
+        }
+
         if (entity != null) {
             loadModule(entity);
             scope.loadModule(entity, false);
@@ -279,7 +279,19 @@ public ModuleEntity fetchClass(String name) {
             throw new CriticalException("Standalone library is not loaded");
         }
 
-        return _fetch(name.toLowerCase(), library.getClassModules());
+        String lowerCase = name.toLowerCase();
+
+        if (classesLoaded.add(lowerCase)) {
+            ModuleEntity entity = _fetch(lowerCase, library.getClassModules());
+
+            if (entity == null) {
+                classesLoaded.remove(lowerCase);
+            }
+
+            return entity;
+        } else {
+            return null;
+        }
     }
 
     public ModuleEntity fetchFunction(String name) {
diff --git a/jphp-runtime/src/php/runtime/loader/dump/StandaloneLibrary.java b/jphp-runtime/src/php/runtime/loader/dump/StandaloneLibrary.java
@@ -35,8 +35,6 @@ public Map<String, Module> getConstantModules() {
 
     public void addModule(Module module) {
         modules.put(module.getName(), module);
-        modules.put("res://" + module.getName(), module);
-        modules.put("res:///" + module.getName(), module);
 
         for (String name : module.getClasses()) {
             classModules.put(name.toLowerCase(), module);
diff --git a/jphp-runtime/src/php/runtime/reflection/ClassEntity.java b/jphp-runtime/src/php/runtime/reflection/ClassEntity.java
@@ -890,7 +890,12 @@ public void setModule(ModuleEntity module) {
     public void initEnvironment(Environment env) {
         if (isClass() && nativeInitEnvironment != null) {
             try {
+                Method nativeInitEnvironment = this.nativeInitEnvironment;
+                this.nativeInitEnvironment = null;
+
                 nativeInitEnvironment.invoke(null, env);
+
+                this.nativeInitEnvironment = nativeInitEnvironment;
             } catch (InvocationTargetException e) {
                 env.__throwException(e);
             } catch (IllegalAccessException e) {
diff --git a/packager/buildSrc/AppPlugin.php b/packager/buildSrc/AppPlugin.php
@@ -76,6 +76,9 @@ function build(Event $event)
 
         if ($event->isFlagExists('b', 'bytecode')) {
             $isBytecode = $event->isFlag('b', 'bytecode');
+            if ($isBytecode) {
+                $bytecodeType = 'phb';
+            }
         } else {
             $isBytecode = (bool) $build['bytecode'];
             switch ($build['bytecode']) {
@@ -280,7 +283,7 @@ function build(Event $event)
 
         $zip->close();
 
-        //Tasks::deleteFile("$buildDir/.app");
+        Tasks::deleteFile("$buildDir/.app");
 
         foreach ($event->package()->getAny('app.assets', []) as $asset) {
             Tasks::deleteFile("$buildDir/" . fs::name($asset));

-Original file line number
+Diff line change
 ### Install
 ```
 -jppm add [email protected].5
 +jppm add [email protected].6
 ```
 ### API
Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ protected void writeInitEnvironment() {`
`583`	`583`	`expressionCompiler.writePushConstString(entity.getName());`
`584`	`584`	`expressionCompiler.writePushConstString(entity.getLowerName());`
`585`	`585`	`}`
`586`		`- expressionCompiler.writePushConstBoolean(true);`
	`586`	`+ expressionCompiler.writePushConstBoolean(false);`
`587`	`587`	`expressionCompiler.writeSysDynamicCall(`
`588`	`588`	`Environment.class, "fetchClass", ClassEntity.class, String.class, String.class, Boolean.TYPE`
`589`	`589`	`);`
Original file line number	Diff line number	Diff line change
`@@ -460,13 +460,17 @@ public ClassEntity fetchUserClass(Class<? extends IObject> clazz) {`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`public ClassEntity fetchUserClass(String name) {`
`463`		`- return fetchUserClass(name, name.toLowerCase());`
	`463`	`+ return fetchUserClass(name, name.toLowerCase(), true);`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`public ClassEntity fetchUserClass(String name, String nameLower) {`
	`467`	`+ return fetchUserClass(name, nameLower, true);`
	`468`	`+ }`
	`469`	`+`
	`470`	`+ public ClassEntity fetchUserClass(String name, String nameLower, boolean autoLoad) {`
`467`	`471`	`ClassEntity entity;`
`468`	`472`
`469`		`- if (classEntityFetchHandler != null) {`
	`473`	`+ if (autoLoad && classEntityFetchHandler != null) {`
`470`	`474`	`for (EntityFetchHandler handler : classEntityFetchHandler) {`
`471`	`475`	`handler.fetch(this, name, nameLower);`
`472`	`476`	`}`