v1.1.0 final, some UI changes and final fixes

Author: swanandapps

src/components/LearningMode.vue

@@ -0,0 +1,18 @@
+const tW = (strings) => {
+  return strings
+    .map((s) => s.replace(/\s+/g, "\n"))
+    .join("")
+    .trim();
+};
+
+export const multical = tW`
+  a=10
+  b=10
+  
+  c=(a+b)/2 + (a+b)*2
+  
+  दिखाए(c)
+  
+      
+      
+      `;

src/exampleCodes/multical.js

@@ -128,6 +128,7 @@ export default function Compile(sourcecode, ActiveLangugae) {
 
     kalaam.output = "";
     kalaam.LastConditionValue = [];
+    kalaam.ExecutionStack = [];
 
     kalaam.linebylineOutput = kalaam.output.split("\n");
     kalaam.error = [];
@@ -233,7 +234,7 @@ export default function Compile(sourcecode, ActiveLangugae) {
               assigned_variables.push(el.name);
             }
 
-            //We will simplify self conditions as we move forward
+            //We will simplify this conditions as we move forward
             else if (!isPureEval(el.value) && !isNumber(el.value)) {
               if (!(el.name.includes("]") && el.name.includes("["))) {
                 if (el.type === "Array") {
@@ -616,12 +617,48 @@ export default function Compile(sourcecode, ActiveLangugae) {
 
           try {
             let el = element;
+            let cal = "";
+            let count = 0;
+            //   function findCalculation(cleaned_sourcedata, i) {
+            let x = i;
+            let d = 0;
+
+            while (isCalculation(cleaned_sourcedata[x]) || cleaned_sourcedata[x] == "+") {
+              cal = cal + cleaned_sourcedata[x];
+              count += 1;
+              x++;
+            }
 
-            let c_el = RemoveBrackets(el);
+            function isMultiCalculation(c, op = "*+/-") {
+              if (c.includes("(") && c.includes(")")) {
+                let s = c.split("");
+                s.forEach((el) => {
+                  if (op.includes(el)) {
+                    d = d + 1;
+                  }
+                });
+
+                if (d > 1) {
+                  return true;
+                } else {
+                  return false;
+                }
+              }
+            }
+
+            let multiCal = isMultiCalculation(cal);
+
+            //  console.log("x", x, i);
+            skipParsing = count - 1;
+            // cal = RemoveBrackets(cal);
+
+            //let c_el = RemoveBrackets(cal);
+
+            //  let cal = findCalculation();
 
             // to stop prevention of expressions like is"+ getting added as a calculation
-            !c_el.includes('"') && !["/", "*", "'", '"'].includes(el.charAt(0))
-              ? PushCalculation(el, tokens, cleaned_sourcedata, i)
+            !cal.includes('"') && !["/", "*", "'", '"'].includes(el.charAt(0))
+              ? PushCalculation(cal, tokens, cleaned_sourcedata, i, multiCal)
               : console.log(`impure calculation terms ${el}`);
           } catch (e) {
             console.log(e, `Error in completing calculation ${element}`);
@@ -1269,7 +1306,6 @@ export default function Compile(sourcecode, ActiveLangugae) {
         _analyzeToken(cleaned_sourcedata, i, tokens);
 
         //Code to skip improve a particular part of cleaned_sourcedata if it's being operated by two different functions.
-
         if (skipParsing != 0) {
           i = i + skipParsing;
         }
@@ -1340,7 +1376,8 @@ export default function Compile(sourcecode, ActiveLangugae) {
       return item !== "";
     });
 
-    return { ExecutionStack, kalaam };
+    kalaam.ExecutionStack = ExecutionStack;
+    return kalaam;
   } catch (e) {
     console.log(e);
   }

src/lib/Compiler/main.js

@@ -1,7 +1,6 @@
-import { RemoveQuotes, RemoveBrackets, operatorType } from "../Scripts/Helpers";
+import { RemoveBrackets, operatorType } from "../Scripts/Helpers";
 import { ActiveLangugaeKeywords } from "../Compiler/constants";
 //ANCHOR - Functions to push token with type and value into tokens array for further parsing
-
 function isNumber(element) {
   return /^[0-9]*$/gm.test(element);
 }
@@ -229,15 +228,17 @@ function PushArray(value, tokens) {
   }
 }
 
-function PushCalculation(value, tokens, cleaned_sourcedata, i) {
+function PushCalculation(value, tokens, cleaned_sourcedata, i, multiCal) {
   //not allowing values like Numbers[a]
   //revisit this
+
   if (!(!/\d+/.test(cleaned_sourcedata[i - 2]) && cleaned_sourcedata[i - 2].includes("["))) {
     //
 
     tokens.push({
       type: "Calculation",
       value: value,
+      multiCal,
     });
   }
 }

src/lib/PushTokens/main.js

@@ -15,8 +15,8 @@ function earlyCleaning(c) {
   return c;
 }
 function RemoveBrackets(e) {
-  let a = e.replace("(", "");
-  let b = a.replace(")", "");
+  let a = e.replace(/\(/g, "");
+  let b = a.replace(/\)/g, "");
   let c = b.replace("}", "");
   let d = c.replace("{", "");
 

src/lib/Scripts/Helpers.js

@@ -168,8 +168,8 @@ function GetcleanedExpression(expression) {
 
 //To convert 'a+b-c*d' into ['a','+','-','c','*','d']
 
-function SplitElementsArray(element) {
-  element = RemoveBrackets(element);
+function SplitElementsArray(element, multiCal) {
+  element = multiCal ? element : RemoveBrackets(element);
 
   if (IsConditionalOperator(element)) {
     element = element.replace(/' '/g, "");
@@ -400,19 +400,25 @@ function AcceptInputandSetValue(tokens, index, updated_tokens, ExecutionStack, L
 
 //If you are not getting the values right, this is where you should start debugging
 
-function CalculateValues(calculation, j, updated_tokens) {
+function CalculateValues(calculation, j, updated_tokens, multiCal) {
   var result;
   try {
-    var calculationArray = SplitElementsArray(calculation);
+    var calculationArray = SplitElementsArray(calculation, multiCal);
 
     var StringVar = SetValues(calculationArray, updated_tokens);
 
     let joinStringVar = StringVar.join("");
 
     let NewStringVar = "";
-    if (isNumber(joinStringVar.charAt(0)) == true) {
+    //evaluate the exepression as it is when multical is true
+    //for expressions like c=(ageone+agetwo)/2 + (ageone+agetwo)*2
+
+    if (isNumber(joinStringVar.charAt(0)) || multiCal) {
       NewStringVar = eval(joinStringVar);
-    } else if (isNumber(joinStringVar.charAt(0)) == undefined) {
+    }
+
+    //Not realted to numbers at all but strings
+    else if (!isNumber(joinStringVar.charAt(0))) {
       StringVar.forEach((el) => {
         if (el != "+") {
           el = el.toString();
@@ -1072,8 +1078,8 @@ function AssignorUpdateValues(
         //type 2- X= ageone+agetwo
         else {
           //performing the calculation
-
-          let value = CalculateValues(varvalue, i, updated_tokens);
+          let multiCal = sourcedata[i + 1].multiCal;
+          let value = CalculateValues(varvalue, i, updated_tokens, multiCal);
 
           updated_tokens.push({
             name: variable,