Add remove and add procs to saved env

Fix docs and README

Author: Anatoliy057

README.md

@@ -7,40 +7,46 @@ Extension designed to work [MSUnit](https://github.com/Anatoliy057/MSUnit)
 ***
 
 ## Closures
-A set of functions for manipulation of closures
+A set of functions for manipulation of closures.
 
 ### void set\_current\_env():
-Replaces the internal closing environment with the current one
+Replaces the internal closing environment with the current one.
 
 ***
 
 ## Echo
-A set of functions for logs
+A set of functions for logs.
 
 ### void print(message):
-Prints a message
+Prints a message.
 
 ### void println(message):
 Prints a message and then terminate the line.
 
 ***
 
 ## Environments
-A set of functions for environment
+A set of functions for environment.
 
 ### void remove\_env(id):
-Remove reference of environment by id
+Remove reference of environment by id.
 
 ### void save\_env(id):
-Save reference of environment by id
+Save reference of environment by id.
 
 ### void x\_replace\_procedure(id, proc, replacement):
-Swaps one procedure for another (or given closure) in a saved environment
+Swaps one procedure for another (or given closure) in a saved environment.
+
+### void x_add_procedure(id, proc, [closure])
+Add procedure (or given closure as procedure named by procName) in a saved environment.
+
+### boolean x_remove_procedure(id, proc)
+Remove procedure from a saved environment.
 
 ***
 
 ## Global
-A set of functions for globals
+A set of functions for globals.
 
 ### void x_set_extend_daemon_manager():
 Sets extend daemon manager, that clearing globals when threads deactivated.
@@ -52,10 +58,10 @@ ets automatically initialize globals for new threads.
 Returns whether globals for threads are automatically initialized.
 
 ### void keys\_globals():
-Return array of keys globals
+Return array of keys globals.
 
 ### void original\_export(key, value):
-Stores a value in the original global storage register (like "export".
+Stores a value in the original global storage register (like "export").
 
 ### mixed original\_import(key, [default]):
 This function likes "import" but imports a value from the original global value register.

src/main/java/me/anatoliy57/chunit/core/ProcClosure.java

@@ -0,0 +1,51 @@
+package me.anatoliy57.chunit.core;
+
+import com.laytonsmith.core.Procedure;
+import com.laytonsmith.core.constructs.CClosure;
+import com.laytonsmith.core.constructs.Target;
+import com.laytonsmith.core.environments.Environment;
+import com.laytonsmith.core.natives.interfaces.Mixed;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProcClosure extends Procedure implements Cloneable {
+
+    private final String name;
+    private CClosure closure;
+
+    public ProcClosure(String name, CClosure closure, Target t) {
+        super(name, null, Collections.EMPTY_LIST, null, t);
+
+        this.name = name;
+        this.closure = closure;
+    }
+
+    @Override
+    public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
+        Mixed[] values = new Mixed[args.size()];
+        args.toArray(values);
+        return closure.executeCallable(values);
+    }
+
+    @Override
+    public Procedure clone() throws CloneNotSupportedException {
+        ProcClosure clone = (ProcClosure)super.clone();
+
+        if(closure != null) {
+            clone.closure = this.closure.clone();
+        }
+
+        return clone;
+    }
+
+    @Override
+    public void definitelyNotConstant() {
+        super.definitelyNotConstant();
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/me/anatoliy57/chunit/functions/Closures.java

@@ -16,7 +16,7 @@
 public class Closures {
 
     public static String docs() {
-        return "A set of functions for manipulation of closures";
+        return "A set of functions for manipulation of closures.";
     }
 
     @api
@@ -34,7 +34,7 @@ public Integer[] numArgs() {
 
         @Override
         public String docs() {
-            return "void {} Replaces the internal closing environment with the current one";
+            return "void {} Replaces the internal closing environment with the current one.";
         }
 
         @Override

src/main/java/me/anatoliy57/chunit/functions/Echo.java

@@ -17,7 +17,7 @@
 
 public class Echo {
     public static String docs() {
-        return "A set of functions for logs";
+        return "A set of functions for logs.";
     }
 
     public static BufferedWriter out;
@@ -42,7 +42,7 @@ public Integer[] numArgs() {
         }
 
         public String docs() {
-            return "void {message} Prints a message";
+            return "void {message} Prints a message.";
         }
 
         public Class<? extends CREThrowable>[] thrown() {

src/main/java/me/anatoliy57/chunit/functions/Environments.java

@@ -1,6 +1,7 @@
 package me.anatoliy57.chunit.functions;
 
 import com.laytonsmith.annotations.api;
+import com.laytonsmith.core.ArgumentValidation;
 import com.laytonsmith.core.Globals;
 import com.laytonsmith.core.MSVersion;
 import com.laytonsmith.core.Procedure;
@@ -13,13 +14,15 @@
 import com.laytonsmith.core.exceptions.CRE.CREThrowable;
 import com.laytonsmith.core.exceptions.ConfigRuntimeException;
 import com.laytonsmith.core.functions.AbstractFunction;
+import com.laytonsmith.core.functions.ArrayHandling;
 import com.laytonsmith.core.natives.interfaces.Mixed;
+import me.anatoliy57.chunit.core.ProcClosure;
 
 import java.util.*;
 
 public class Environments {
     public static String docs() {
-        return "A set of functions for environment";
+        return "A set of functions for environment.";
     }
 
     public static final Map<String, Environment> environmentMap = new HashMap<>();
@@ -39,7 +42,7 @@ public Integer[] numArgs() {
         }
 
         public String docs() {
-            return "void {id} Save reference of environment by id";
+            return "void {id} Save reference of environment by id.";
         }
 
         public Class<? extends CREThrowable>[] thrown() {
@@ -83,7 +86,7 @@ public Integer[] numArgs() {
         }
 
         public String docs() {
-            return "void {id} Remove reference of environment by id";
+            return "void {id} Remove reference of environment by id.";
         }
 
         public Class<? extends CREThrowable>[] thrown() {
@@ -127,7 +130,7 @@ public Integer[] numArgs() {
         }
 
         public String docs() {
-            return "void {id, proc, replacement} Swaps one procedure for another (or given closure) in a saved environment";
+            return "void {id, proc, replacement} Swaps one procedure for another (or given closure) in a saved environment.";
         }
 
         public Class<? extends CREThrowable>[] thrown() {
@@ -156,7 +159,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
             Map<String, Procedure> procedures = global.GetProcs();
 
             if(!procedures.containsKey(proc)) {
-                throw new CREInvalidProcedureException("Unknown procedure \"" + proc + '"', t);
+                throw new CREInvalidProcedureException("Unknown procedure \"" + proc + "\" in saved environment", t);
             }
 
             Procedure val;
@@ -166,7 +169,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
                 val = new ProcClosure(proc, (CClosure) replacement, t);
             } else {
                 val = Optional.ofNullable(currentProcedures.get(replacement.val())).orElseThrow(() -> {
-                    throw new CREInvalidProcedureException("Unknown procedure \"" + replacement.val() + '"', t);
+                    throw new CREInvalidProcedureException("Unknown procedure \"" + replacement.val() + "\" in current environment", t);
                 });
             }
 
@@ -178,46 +181,128 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
         public Boolean runAsync() {
             return null;
         }
+    }
 
-        private static class ProcClosure extends Procedure implements Cloneable {
+    @api
+    public static class x_add_procedure extends AbstractFunction {
 
-            private final String name;
-            private CClosure closure;
+        public x_add_procedure() {
+        }
 
-            public ProcClosure(String name, CClosure closure, Target t) {
-                super(name, null, Collections.EMPTY_LIST, null, t);
+        public String getName() {
+            return "x_add_procedure";
+        }
 
-                this.name = name;
-                this.closure = closure;
-            }
+        public Integer[] numArgs() {
+            return new Integer[]{2, 3};
+        }
+
+        public String docs() {
+            return "void {id, procName, [closure]} Add procedure (or given closure as procedure named by procName) in a saved environment.";
+        }
+
+        public Class<? extends CREThrowable>[] thrown() {
+            return new Class[]{CRECastException.class, CREInvalidProcedureException.class, CREIndexOverflowException.class};
+        }
+
+        public boolean isRestricted() {
+            return true;
+        }
+
+        public MSVersion since() {
+            return MSVersion.V3_0_2;
+        }
 
-            @Override
-            public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
-                Mixed[] values = new Mixed[args.size()];
-                args.toArray(values);
-                return closure.executeCallable(values);
+        public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntimeException {
+            String id = args[0].val();
+            String proc = args[1].val();
+
+            Environment savedEnv;
+            synchronized (environmentMap) {
+                savedEnv = Optional.ofNullable(environmentMap.get(id)).orElseThrow(() -> {
+                    throw new CREIndexOverflowException("No environment with this id \""+id+"\" found", t);
+                });
             }
+            GlobalEnv global = savedEnv.getEnv(GlobalEnv.class);
+            Map<String, Procedure> procedures = global.GetProcs();
 
-            @Override
-            public Procedure clone() throws CloneNotSupportedException {
-                ProcClosure clone = (ProcClosure)super.clone();
+            if(procedures.containsKey(proc)) {
+                throw new CREInvalidProcedureException("Procedure already exists \"" + proc + "\" in saved environment", t);
+            }
 
-                if(closure != null) {
-                    clone.closure = this.closure.clone();
+            Procedure val;
+            if(args.length == 3) {
+                if(!args[2].isInstanceOf(CClosure.TYPE)) {
+                    throw new CRECastException("Expecting a closure for argument 2", t);
                 }
+                CClosure closure = (CClosure) args[2];
+                val = new ProcClosure(proc, closure, t);
+            } else {
+                Map<String, Procedure> currentProcedures = env.getEnv(GlobalEnv.class).GetProcs();
 
-                return clone;
+                val = Optional.ofNullable(currentProcedures.get(proc)).orElseThrow(() -> {
+                    throw new CREInvalidProcedureException("Unknown procedure \"" + proc + "\" in current environment", t);
+                });
             }
 
-            @Override
-            public void definitelyNotConstant() {
-                super.definitelyNotConstant();
-            }
+            procedures.put(proc, val);
 
-            @Override
-            public String getName() {
-                return name;
+            return CVoid.VOID;
+        }
+
+        public Boolean runAsync() {
+            return null;
+        }
+    }
+
+    @api
+    public static class x_remove_procedure extends AbstractFunction {
+
+        public x_remove_procedure() {
+        }
+
+        public String getName() {
+            return "x_remove_procedure";
+        }
+
+        public Integer[] numArgs() {
+            return new Integer[]{2};
+        }
+
+        public String docs() {
+            return "boolean {id, procName} Remove procedure from a saved environment.";
+        }
+
+        public Class<? extends CREThrowable>[] thrown() {
+            return new Class[]{CREIndexOverflowException.class};
+        }
+
+        public boolean isRestricted() {
+            return true;
+        }
+
+        public MSVersion since() {
+            return MSVersion.V3_0_2;
+        }
+
+        public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntimeException {
+            String id = args[0].val();
+            String proc = args[1].val();
+
+            Environment savedEnv;
+            synchronized (environmentMap) {
+                savedEnv = Optional.ofNullable(environmentMap.get(id)).orElseThrow(() -> {
+                    throw new CREIndexOverflowException("No environment with this id \""+id+"\" found", t);
+                });
             }
+            GlobalEnv global = savedEnv.getEnv(GlobalEnv.class);
+            Map<String, Procedure> procedures = global.GetProcs();
+
+            return CBoolean.get(procedures.remove(proc) != null);
+        }
+
+        public Boolean runAsync() {
+            return null;
         }
     }
 }