feat: add modulo (%) to extended logic operators

seleb · Aug 30, 2020 · 1fa9d61 · 1fa9d61
1 parent 0709e07
commit 1fa9d61
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/logic-operators-extended.js b/src/logic-operators-extended.js
@@ -12,6 +12,7 @@ Adds conditional logic operators:
   - || (or)
   - &&! (and not)
   - ||! (or not)
+  - % (modulo)
 
 Examples: candlecount > 5 && haslighter == 1
           candlecount > 5 && papercount > 1 && isIndoors
@@ -72,16 +73,25 @@ function orNotExp(environment, left, right, onReturn) {
 	});
 }
 
+function modExp(environment, left, right, onReturn) {
+	right.Eval(environment, function (rVal) {
+		left.Eval(environment, function (lVal) {
+			onReturn(lVal % rVal);
+		});
+	});
+}
+
 inject(/(operatorMap\.set\("-", subExp\);)/, `
 	$1
 	operatorMap.set("&&", ${andExp.toString()});
 	operatorMap.set("||", ${orExp.toString()});
 	operatorMap.set("&&!", ${andNotExp.toString()});
 	operatorMap.set("||!", ${orNotExp.toString()});
 	operatorMap.set("!==", ${notEqExp.toString()});
+	operatorMap.set("%", ${modExp.toString()});
 `);
 inject(
 	/(var operatorSymbols = \[.+\];)/,
-	'$1operatorSymbols.unshift("!==", "&&", "||", "&&!", "||!");',
+	'$1operatorSymbols.unshift("!==", "&&", "||", "&&!", "||!", "%");',
 );
 // End of logic operators mod