Merge pull request #15 from smuuf/logicexpr

Logic expressions and other stuff
smuuf · Oct 21, 2018 · 959e548 · 959e548
2 parents 009cf91 + f1e2e66
commit 959e548
Show file tree

Hide file tree

Showing 51 changed files with 1,524 additions and 880 deletions.
diff --git a/src/StrictObject.php b/src/StrictObject.php
@@ -2,7 +2,7 @@
 
 namespace Smuuf\Primi;
 
-class StrictObject {
+abstract class StrictObject {
 
 	/**
 	 * Used when trying to access undeclared or inaccessible property.

diff --git a/src/exceptions/InternalArgumentCountException.php b/src/exceptions/InternalArgumentCountException.php
@@ -16,12 +16,12 @@ public function __construct(int $passed = null, int $expected = null) {
 
 	}
 
-	public function getPassedCount() {
-		$this->passedCount;
+	public function getPassedCount(): int {
+		return $this->passedCount;
 	}
 
-	public function getExpectedCount() {
-		$this->expectedCount;
+	public function getExpectedCount(): int {
+		return $this->expectedCount;
 	}
 
 }
diff --git a/src/exceptions/InternalBinaryOperationxception.php b/src/exceptions/InternalBinaryOperationxception.php
@@ -4,7 +4,7 @@
 
 use \Smuuf\Primi\Structures\Value;
 
-class InternalBinaryOperationxception extends InternalException {
+class InternalBinaryOperationException extends InternalException {
 
 	protected $op;
 	protected $left;

diff --git a/src/exceptions/InternalUndefinedTruthnessException.php b/src/exceptions/InternalUndefinedTruthnessException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Smuuf\Primi;
+
+class InternalUndefinedTruthnessException extends InternalException {
+
+}
diff --git a/src/extensions/psl/ArrayExtension.php b/src/extensions/psl/ArrayExtension.php
@@ -34,9 +34,9 @@ public static function array_shuffle(ArrayValue $arr): ArrayValue {
 
 		// Do NOT modify the original array argument (as PHP would do).
 		$copy = clone $arr;
-		shuffle($arr->value);
+		shuffle($copy->value);
 
-		return $arr;
+		return $copy;
 
 	}
 

diff --git a/src/extensions/psl/CastingExtension.php b/src/extensions/psl/CastingExtension.php
@@ -50,12 +50,7 @@ public static function to_bool(Value $value): BoolValue {
 			BoolValue::class
 		);
 
-		// Only empty string is considered falsey ("" -> false, "0" -> true).
-		if ($value instanceof StringValue) {
-			return new BoolValue($value->value !== "");
-		}
-
-		return new BoolValue((bool) $value->value);
+		return new BoolValue(Common::isTruthy($value));
 
 	}
 

diff --git a/src/handlers/Addition.php b/src/handlers/Addition.php
@@ -2,13 +2,13 @@
 
 namespace Smuuf\Primi\Handlers;
 
-use \Smuuf\Primi\InternalBinaryOperationxception;
+use \Smuuf\Primi\InternalBinaryOperationException;
 use \Smuuf\Primi\ErrorException;
 use \Smuuf\Primi\HandlerFactory;
 use \Smuuf\Primi\Context;
 
 use \Smuuf\Primi\Helpers\Common;
-use \Smuuf\Primi\Helpers\BinaryOpHandler;
+use \Smuuf\Primi\Helpers\BinaryLTR;
 
 /**
  * Node fields:
@@ -21,9 +21,9 @@ public static function handle(array $node, Context $context) {
 
 		try {
 
-			return BinaryOpHandler::handle($node, $context);
+			return BinaryLTR::handle($node, $context);
 
-		} catch (InternalBinaryOperationxception $e) {
+		} catch (InternalBinaryOperationException $e) {
 
 			throw new ErrorException(sprintf(
 				"Cannot use operator '%s' with '%s' and '%s'",
@@ -40,7 +40,7 @@ public static function reduce(array $node) {
 
 		// No need to represent this kind of node as Addition when there's only one operand.
 		// Take the only operand here and subtitute the Addition node with it.
-		if (isset($node['operands']['name'])) {
+		if (!isset($node['ops'])) {
 			return $node['operands'];
 		}
 

diff --git a/src/handlers/ChainedFunction.php b/src/handlers/ChainedFunction.php
@@ -17,7 +17,7 @@ public static function chain(
 	) {
 
 		// 1) We'll extract the function name directly from the "fn" child node.
-		$name = $node['fn']['text'];
+		$name = $node['fn']['core']['text'];
 
 		// 2) We'll try to find type-matching function first.
 		// That is: A function which name is prepended by the subject's type

diff --git a/src/handlers/Comparison.php b/src/handlers/Comparison.php
@@ -3,6 +3,8 @@
 namespace Smuuf\Primi\Handlers;
 
 use \Smuuf\Primi\Structures\Value;
+use \Smuuf\Primi\Helpers\ComparisonLTR;
+use \Smuuf\Primi\InternalBinaryOperationException;
 use \Smuuf\Primi\ISupportsComparison;
 use \Smuuf\Primi\ErrorException;
 use \Smuuf\Primi\HandlerFactory;
@@ -13,37 +15,34 @@
  * left: A "+" or "-" sign signalling the 'side' of the first operand.
  * right: List of operand nodes.
  */
-class Comparison extends \Smuuf\Primi\StrictObject implements IHandler {
+class Comparison extends \Smuuf\Primi\StrictObject implements IHandler, IReducer {
 
 	public static function handle(array $node, Context $context) {
 
-		// Execute the left-hand node and get its return value.
-		$leftHandler = HandlerFactory::get($node['left']['name']);
-		$leftReturn = $leftHandler::handle($node['left'], $context);
-
-		$rightHandler = HandlerFactory::get($node['right']['name']);
-		$rightReturn = $rightHandler::handle($node['right'], $context);
-
-		$op = $node['op']['text'];
-
 		try {
 
-			if ($leftReturn instanceof ISupportsComparison && $rightReturn instanceof Value) {
-				return $leftReturn->doComparison($op, $rightReturn);
-			} else {
-				throw new \TypeError;
-			}
+			return ComparisonLTR::handle($node, $context);
 
-		} catch (\TypeError $e) {
+		} catch (InternalBinaryOperationException $e) {
 
 			throw new ErrorException(sprintf(
-				"Cannot compare '%s' and '%s'",
-				$leftReturn::TYPE,
-				$rightReturn::TYPE
+				"Cannot compare '%s' with '%s'",
+				($e->getLeft())::TYPE,
+				($e->getRight())::TYPE
 			), $node);
 
 		}
 
 	}
 
+	public static function reduce(array $node) {
+
+		// If there is no operator, that means there's only one operand.
+		// In that case, return only the operand node inside.
+		if (!isset($node['ops'])) {
+			return $node['operands'];
+		}
+
+	}
+
 }
diff --git a/src/handlers/IfStatement.php b/src/handlers/IfStatement.php
@@ -2,6 +2,7 @@
 
 namespace Smuuf\Primi\Handlers;
 
+use \Smuuf\Primi\Helpers\Common;
 use \Smuuf\Primi\HandlerFactory;
 use \Smuuf\Primi\Context;
 
@@ -20,7 +21,7 @@ public static function handle(array $node, Context $context) {
 
 		// If the result of the left hand equals to truthy value,
 		// execute the code branch stored in the right-hand node.
-		if ($return->getInternalValue()) {
+		if (Common::isTruthy($return)) {
 			$rightHandler = HandlerFactory::get($node['right']['name']);
 			$rightHandler::handle($node['right'], $context);
 		}

diff --git a/src/handlers/LogicalAnd.php b/src/handlers/LogicalAnd.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Smuuf\Primi\Handlers;
+
+use \Smuuf\Primi\InternalUndefinedTruthnessException;
+use \Smuuf\Primi\ErrorException;
+use \Smuuf\Primi\Context;
+use \Smuuf\Primi\Helpers\LogicalLTR;
+
+class LogicalAnd extends \Smuuf\Primi\StrictObject implements IHandler, IReducer {
+
+	public static function handle(array $node, Context $context) {
+
+		try {
+			return LogicalLTR::handle($node, $context);
+		} catch (InternalUndefinedTruthnessException $e) {
+			throw new ErrorException($e->getMessage(), $node);
+		}
+
+	}
+
+	public static function reduce(array $node) {
+
+		if (!isset($node['ops'])) {
+			return $node['operands'];
+		}
+
+	}
+
+}
diff --git a/src/handlers/LogicalOr.php b/src/handlers/LogicalOr.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Smuuf\Primi\Handlers;
+
+use \Smuuf\Primi\InternalUndefinedTruthnessException;
+use \Smuuf\Primi\ErrorException;
+use \Smuuf\Primi\Context;
+use \Smuuf\Primi\Helpers\LogicalLTR;
+
+class LogicalOr extends \Smuuf\Primi\StrictObject implements IHandler, IReducer {
+
+	public static function handle(array $node, Context $context) {
+
+		try {
+			return LogicalLTR::handle($node, $context);
+		} catch (InternalUndefinedTruthnessException $e) {
+			throw new ErrorException($e->getMessage(), $node);
+		}
+
+	}
+
+	public static function reduce(array $node) {
+
+		if (!isset($node['ops'])) {
+			return $node['operands'];
+		}
+
+	}
+
+}
diff --git a/src/handlers/Multiplication.php b/src/handlers/Multiplication.php
@@ -2,13 +2,13 @@
 
 namespace Smuuf\Primi\Handlers;
 
-use \Smuuf\Primi\InternalBinaryOperationxception;
+use \Smuuf\Primi\InternalBinaryOperationException;
 use \Smuuf\Primi\ErrorException;
 use \Smuuf\Primi\HandlerFactory;
 use \Smuuf\Primi\Context;
 
 use \Smuuf\Primi\Helpers\Common;
-use \Smuuf\Primi\Helpers\BinaryOpHandler;
+use \Smuuf\Primi\Helpers\BinaryLTR;
 
 /**
  * Node fields:
@@ -21,9 +21,9 @@ public static function handle(array $node, Context $context) {
 
 		try {
 
-			return BinaryOpHandler::handle($node, $context);
+			return BinaryLTR::handle($node, $context);
 
-		} catch (InternalBinaryOperationxception $e) {
+		} catch (InternalBinaryOperationException $e) {
 
 			throw new ErrorException(sprintf(
 				"Cannot use operator '%s' with '%s' and '%s'",
@@ -40,7 +40,7 @@ public static function reduce(array $node) {
 
 		// No need to represent this kind of node as Multiplication when there's only one operand.
 		// Take the only operand here and subtitute the Multiplication node with it.
-		if (isset($node['operands']['name'])) {
+		if (!isset($node['ops'])) {
 			return $node['operands'];
 		}
 

diff --git a/src/handlers/Negation.php b/src/handlers/Negation.php
@@ -2,6 +2,7 @@
 
 namespace Smuuf\Primi\Handlers;
 
+use \Smuuf\Primi\Helpers\Common;
 use \Smuuf\Primi\Structures\BoolValue;
 use \Smuuf\Primi\HandlerFactory;
 use \Smuuf\Primi\Context;
@@ -10,35 +11,30 @@ class Negation extends \Smuuf\Primi\StrictObject implements IHandler, IReducer {
 
 	public static function handle(array $node, Context $context) {
 
-		$negation = isset($node['not']);
-
 		$handler = HandlerFactory::get($node['core']['name']);
 		$value = $handler::handle($node['core'], $context);
 
-		// Should we even handle negation?
-		if ($negation) {
-
-			// If so, let's determine truthness using PHP's own rules (at least
-			// for now).
-			$truthness = (bool) $value->getInternalValue();
-			$value = new BoolValue(!$truthness);
+		// The final truthness is (at least for now) based on PHP's own rules.
+		$truthness = Common::isTruthy($value);
 
-		}
+		// Should we even handle negation? If there's an even number of negation
+		// operators, the result would always have the same truthness as its
+		// input.
+		Common::ensureIndexed($node['nots']);
+		$isNegation = count($node['nots'] ?? []) % 2;
 
-		return $value;
+		return new BoolValue($isNegation ? !$truthness : $truthness);
 
 	}
 
 	public static function reduce(array $node) {
 
 		// If this truly has a negation, do not reduce this node.
-		if (isset($node['not'])) {
-			return;
+		// If not, return only core.
+		if (!isset($node['nots'])) {
+			return $node['core'];
 		}
 
-		// Otherwise reduce it to just the core node.
-		return $node['core'];
-
 	}
 
 }
diff --git a/src/handlers/UnaryOperator.php b/src/handlers/UnaryOperator.php
@@ -23,7 +23,7 @@ public static function handle(array $node, Context $context) {
 			throw new InternalException("Handling unary operator without unary node");
 		}
 
-		$variableName = $node['core']['text'];
+		$variableName = $node['core']['core']['text'];
 		$value = HandlerFactory
 			::get($node['core']['name'])
 			::handle($node['core'], $context);

diff --git a/src/handlers/WhileStatement.php b/src/handlers/WhileStatement.php
@@ -2,6 +2,7 @@
 
 namespace Smuuf\Primi\Handlers;
 
+use \Smuuf\Primi\Helpers\Common;
 use \Smuuf\Primi\HandlerFactory;
 use \Smuuf\Primi\Context;
 
@@ -15,10 +16,10 @@ class WhileStatement extends \Smuuf\Primi\StrictObject implements IHandler {
 	public static function handle(array $node, Context $context) {
 
 		// Execute the left-hand node and get its return value.
-		$conditionHandler = HandlerFactory::get($node['left']['name']);
+		$condHandler = HandlerFactory::get($node['left']['name']);
 		$blockHandler = HandlerFactory::get($node['right']['name']);
 
-		while ($conditionHandler::handle($node['left'], $context)->getInternalValue()) {
+		while (Common::isTruthy($condHandler::handle($node['left'], $context))) {
 			$blockHandler::handle($node['right'], $context);
 		}