Add Some Functions

Author: l1m9n

src/main/java/io/stack_community/github/stack_java/Functions.java

@@ -1,6 +1,5 @@
 package io.stack_community.github.stack_java;
 
-
 import java.util.HashMap;
 import java.util.function.Supplier;
 
@@ -21,7 +20,7 @@ public Functions(Stack.Executor executor) {
         { // Add Builtin Commands
             // Commands of calculation
 
-            // addition
+            // Addition
             addFunction("add", (e) -> {
                 double b = e.popStack().getNumber();
                 double a = e.popStack().getNumber();
@@ -35,9 +34,77 @@ public Functions(Stack.Executor executor) {
                 e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, a - b));
             });
 
-            // Pop in stack
-            addFunction("pop", (e) -> {
-                e.popStack();
+            // Multiplication
+            addFunction("mul", (e) -> {
+                double b = e.popStack().getNumber();
+                double a = e.popStack().getNumber();
+                e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, a * b));
+            });
+
+            // Division
+            addFunction("div", (e) -> {
+                double b = e.popStack().getNumber();
+                double a = e.popStack().getNumber();
+                e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, a / b));
+            });
+
+            // Remainder of division
+            addFunction("mod", (e) -> {
+                double b = e.popStack().getNumber();
+                double a = e.popStack().getNumber();
+                e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, a % b));
+            });
+
+            // Exponentiation
+            addFunction("pow", (e) -> {
+                double b = e.popStack().getNumber();
+                double a = e.popStack().getNumber();
+                e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, Math.pow(a, b)));
+            });
+
+            // Rounding off
+            addFunction("round", (e) -> {
+                double a = e.popStack().getNumber();
+                e.stack.add(new Stack.Type(Stack.Type.TypeEnum.NUMBER, Math.round(a)));
+            });
+
+            // Trigonometric sine
+            addFunction("sin", (e) -> {
+
+            });
+
+            // Commands of control
+
+            // Evaluate string as program
+            addFunction("eval", (e) -> {
+                String code = e.popStack().getString();
+                e.evaluateProgram(code);
+            });
+
+            // Conditional branch
+            addFunction("if", (e) -> {
+                boolean condition = e.popStack().getBool();
+                String code_else = e.popStack().getString();
+                String code_if = e.popStack().getString();
+
+                if (condition) {
+                    e.evaluateProgram(code_if);
+                } else {
+                    e.evaluateProgram(code_else);
+                }
+            });
+
+            // Loop while condition is true
+            addFunction("while", (e) -> {
+                String cond = e.popStack().getString();
+                String code = e.popStack().getString();
+
+                while (true) {
+                    e.evaluateProgram(cond);
+                    if (!e.popStack().getBool()) break;
+
+                    e.evaluateProgram(code);
+                }
             });
 
             // Exit Stack
@@ -50,6 +117,45 @@ public Functions(Stack.Executor executor) {
                 }
             });
 
+            // Commands of memory manage
+
+            // Pop in the stack
+            addFunction("pop", Stack.Executor::popStack);
+
+            // Define variable at memory
+            addFunction("var", (e) -> {
+                String name = e.popStack().getString();
+                Stack.Type data = e.popStack();
+                if (e.memory.containsKey(name)) {
+                    e.memory.replace(name, data);
+                } else {
+                    e.memory.put(name, data);
+                }
+                e.showVariables();
+            });
+
+            // Free up memory space of variable
+            addFunction("free", (e) -> {
+                String name = e.popStack().getString();
+                e.memory.remove(name);
+                e.showVariables();
+            });
+
+            // Copy stack's top value
+            addFunction("copy", (e) -> {
+                Stack.Type data = e.popStack();
+                e.stack.add(data);
+                e.stack.add(data);
+            });
+
+            // Swap stack's top 2 value
+            addFunction("swap", (e) -> {
+                Stack.Type b = e.popStack();
+                Stack.Type a = e.popStack();
+                e.stack.add(b);
+                e.stack.add(a);
+            });
+
             // Print String
             addFunction("print", (e) -> {
                 String str = e.popStack().getString();

src/main/java/io/stack_community/github/stack_java/Stack.java

@@ -8,7 +8,7 @@
 public class Stack {
     public static String name = "Stack Programming Language: Java Edition";
     public static String baseVersion = "1.12";
-    public static String version = "1.0.0-Betaa";
+    public static String version = "1.0.0-Beta";
 
     public Stack() {
 
@@ -205,7 +205,7 @@ public static enum Mode {
 
     public static class Executor {
         protected List<Type> stack; // Data stack
-        private Map<String, Type> memory; // Variable's memory
+        protected Map<String, Type> memory; // Variable's memory
         private Mode mode; // Execution mode
         private Functions functions;
         public boolean exitmode = false;