Merge pull request #14 from smuuf/strict

smuuf · web-flow · commit 009cf91f4a58 · 2018-10-14T17:51:10.000+02:00
Handling of strings and numbers is now strict
diff --git a/docs/language_reference.md b/docs/language_reference.md
@@ -33,7 +33,7 @@ Example usage:
 a = true;
 b = 1 == 2; // false
 c = b == false; // true
-d = c == "hello"; // ERR: Cannot compare: 'bool' and 'string' @ code: c == "hello"
+d = c == "hello"; // ERR: Cannot compare 'bool' and 'string'
 e = "hello" == r"[0-9]"; // false
 f = "hello" == r"l{2}"; // true
 ```
diff --git a/example/04.primi b/example/04.primi
@@ -1,7 +1,7 @@
 a = 4 / (2 - 1) * 100;
 damn = 153 * 2;
 
-c = "zaplaťte pouze " + a + " Kč za skvělou " + damn;
+c = "zaplaťte pouze " + to_string(a) + " Kč za skvělou " + damn.to_string();
 g = 1;
 
 while (damn > 10) {
diff --git a/example/08.primi b/example/08.primi
@@ -9,7 +9,7 @@ function sub(x, y) {
 }
 
 a = 1 + add(sub(4, 3), 3);
-a + "\n";
+a.to_string() + "\n";
 
 function nested(a) {
 	return add(a, sub(2,3));
diff --git a/example/09.primi b/example/09.primi
@@ -62,12 +62,12 @@ function sub(x, y) {
 
 }
 
-a = 1 + add(sub(4, 3), 3);
+a = (1 + add(sub(4, 3), 3)).to_string();
 a = a + "\n";
 
 a = 4 / (2 - 1) * 100;
 damn = 153 * 2;
-c = "zaplaťte pouze " + a + " Kč za skvělou " + damn;
+c = "zaplaťte pouze " + a.to_string() + " Kč za skvělou " + to_string(damn);
 
 g = 1;
 d = 2;
@@ -86,7 +86,7 @@ while (damn < 10000) {
 	");
 
 	damn = damn * d - 1 * d;
-	c = g + "0";
+	c = g + to_number("0");
 
 	if (c - 4 * 2)  {
 		if (4 + (123 * 7) / 8) {
diff --git a/example/bench_all.primi b/example/bench_all.primi
@@ -1,9 +1,9 @@
 
 a = 1 + 2;
-b = "1" + 2;
-c = 1 + "2";
-d = "x" + 1;
-e = 1 + "x";
+b = to_number("1") + 2;
+c = to_string(1) + "2";
+d = "x".to_number() + 1;
+e = to_string(1) + "x";
 f = "x" + "1";
 g = "1" + "x";
 h = "abc" + "   def";
@@ -91,8 +91,8 @@ d = 1 * "2";
 e = 1 * "2.4";
 f = 8 / 4;
 g = 4 / 16;
-h = 123 / a;
-i = 123 / b;
+h = 123 / to_number(a);
+i = 123 / to_number(b);
 j = (1 + (3 / (4 - 5)) + 2 / (37 * 2 / 8 - 42));
 k = 1 + 2 * 3 / 4 - 5 / 6 * 7 + 8;
 a = "abcdefg";
@@ -141,7 +141,7 @@ _definitions = [
 ];
 f = "rádoby čau".string_replace(_definitions);
 g = "vole".string_replace("v", "l").string_replace("o", "i") + "k";
-h = ("číslo je " + 000.cos()).string_replace(["č": "c", "í": "i"]);
+h = ("číslo je " + 000.cos().to_string()).string_replace(["č": "c", "í": "i"]);
 i = "kokot je " + "oo".string_replace("o", "e");
 a_1 = 9.sqrt();
 b_1 = 3.pow();
diff --git a/src/Repl.php b/src/Repl.php
@@ -8,6 +8,7 @@
 use \Smuuf\Primi\Helpers\Common;
 use \Smuuf\Primi\Colors;
 use \Smuuf\Primi\Interpreter;
+use \Smuuf\Primi\IContext;
 use \Smuuf\Primi\IReadlineDriver;
 
 class Repl extends \Smuuf\Primi\StrictObject {
@@ -56,12 +57,19 @@ public function start() {
 	private function loop() {
 
 		$i = $this->interpreter;
+		$c = $i->getContext();
+
 		readline_completion_function(function() { return []; });
+
 		while (true) {
 
 			$input = $this->gatherLines();
 
 			switch (trim($input)) {
+				case '?':
+					$this->printContext($c);
+					continue 2;
+				break;
 				case '':
 					// Ignore (skip) empty input.
 					continue 2;
@@ -91,7 +99,7 @@ private function loop() {
 
 	}
 
-	public function printResult(Value $result = null): void {
+	private function printResult(Value $result = null): void {
 
 		if ($result === null) {
 			return;
@@ -100,12 +108,12 @@ public function printResult(Value $result = null): void {
 		printf(
 			"%s %s\n",
 			$result->getStringValue(),
-			!$this->rawOutput ? $this->formatType($result) : null
+			!$this->rawOutput ? self::formatType($result) : null
 		);
 
 	}
 
-	private function formatType(Value $value) {
+	private static function formatType(Value $value) {
 
 		return Colors::get(sprintf(
 			"{darkgrey}(%s %s){_}",
@@ -115,6 +123,15 @@ private function formatType(Value $value) {
 
 	}
 
+	private function printContext(IContext $c): void {
+
+		foreach ($c->getVariables() as $name => $value)  {
+			echo "$name: ";
+			$this->printResult($value);
+		}
+
+	}
+
 	private function gatherLines(): string {
 
 		$gathering = false;
diff --git a/src/extensions/psl/CastingExtension.php b/src/extensions/psl/CastingExtension.php
@@ -29,7 +29,7 @@ public static function to_string(Value $value): StringValue {
 	public static function to_regex(Value $value): RegexValue {
 
 		// Allow regexes to be casted to regex.
-		if ($value instanceof Regex) {
+		if ($value instanceof RegexValue) {
 			return $value;
 		}
 
diff --git a/src/handlers/Addition.php b/src/handlers/Addition.php
@@ -26,8 +26,8 @@ public static function handle(array $node, Context $context) {
 		} catch (InternalBinaryOperationxception $e) {
 
 			throw new ErrorException(sprintf(
-				"Cannot %s types '%s' and '%s'",
-				$e->getOperator() === "+" ? "add" : "subtract",
+				"Cannot use operator '%s' with '%s' and '%s'",
+				$e->getOperator(),
 				($e->getLeft())::TYPE,
 				($e->getRight())::TYPE
 			), $node);
diff --git a/src/handlers/Comparison.php b/src/handlers/Comparison.php
@@ -37,7 +37,7 @@ public static function handle(array $node, Context $context) {
 		} catch (\TypeError $e) {
 
 			throw new ErrorException(sprintf(
-				"Cannot compare types '%s' and '%s'",
+				"Cannot compare '%s' and '%s'",
 				$leftReturn::TYPE,
 				$rightReturn::TYPE
 			), $node);
diff --git a/src/handlers/ForeachStatement.php b/src/handlers/ForeachStatement.php
@@ -22,7 +22,7 @@ public static function handle(array $node, Context $context) {
 
 		if (!$subject instanceof ISupportsIteration) {
 			throw new \Smuuf\Primi\ErrorException(
-				"Cannot iterate over '{$node['left']['text']}' variable",
+				sprintf("Cannot iterate over '%s'", $subject::TYPE),
 				$node
 			);
 		}
diff --git a/src/handlers/Invocation.php b/src/handlers/Invocation.php
@@ -75,7 +75,7 @@ private static function buildArgumentCountErrorMessage(
 		} else {
 
 			throw new InternalException(
-				"Cannot parse argument count from unexpected exception."
+				"Cannot parse argument count from unexpected exception"
 			);
 
 		}
diff --git a/src/handlers/Multiplication.php b/src/handlers/Multiplication.php
@@ -26,8 +26,8 @@ public static function handle(array $node, Context $context) {
 		} catch (InternalBinaryOperationxception $e) {
 
 			throw new ErrorException(sprintf(
-				"Cannot %s types '%s' and '%s'",
-				$e->getOperator() === "*" ? "multiply" : "divide",
+				"Cannot use operator '%s' with '%s' and '%s'",
+				$e->getOperator(),
 				($e->getLeft())::TYPE,
 				($e->getRight())::TYPE
 			), $node);
diff --git a/src/handlers/StringLiteral.php b/src/handlers/StringLiteral.php
@@ -17,10 +17,6 @@ public static function handle(array $node, Context $context) {
 		// so do this a little more directly.
 		$value = \mb_substr($content, 1, \mb_strlen($content) - 2);
 
-		if (NumberValue::isNumeric($value)) {
-			return new NumberValue($value);
-		}
-
 		return new StringValue($value);
 
 	}
diff --git a/src/handlers/Vector.php b/src/handlers/Vector.php
@@ -23,7 +23,7 @@ public static function chain(
 
 		if (!$subject instanceof ISupportsArrayAccess) {
 			throw new ErrorException(sprintf(
-				"Cannot perform array-like write on '%s'",
+				"Cannot insert into '%s'",
 				$subject::TYPE
 			), $node);
 		}
diff --git a/src/helpers/Common.php b/src/helpers/Common.php
@@ -33,7 +33,13 @@ public static function allowTypes(?Value $value, string ...$types) {
 		}
 
 		// The value did not match any of the types provided.
-		throw new \TypeError;
+		$msg = sprintf(
+			"'%s' is not any of these: %s",
+			$value::TYPE,
+			implode(", ", $types)
+		);
+
+		throw new \TypeError($msg);
 
 	}
 
diff --git a/src/structures/ArrayInsertionProxy.php b/src/structures/ArrayInsertionProxy.php
@@ -12,7 +12,7 @@ public function commit(Value $value) {
 			$this->target->arraySet($this->key, $value);
 		} catch (\TypeError $e) {
 			throw new ErrorException(sprintf(
-				"Cannot insert type '%s' into type '%s'",
+				"Cannot insert '%s' into '%s'",
 				$value::TYPE,
 				$this->target::TYPE
 			));
diff --git a/src/structures/NumberValue.php b/src/structures/NumberValue.php
@@ -53,12 +53,7 @@ public static function isNumeric(string $input): bool {
 
 	public function doAddition(Value $rightOperand): Value {
 
-		Common::allowTypes($rightOperand, self::class, StringValue::class);
-
-		if ($rightOperand instanceof StringValue && !self::isNumeric($rightOperand->value)) {
-			return new StringValue($this->value . $rightOperand->value);
-		}
-
+		Common::allowTypes($rightOperand, self::class);
 		return new self($this->value + $rightOperand->value);
 
 	}
@@ -75,7 +70,8 @@ public function doMultiplication(Value $rightOperand) {
 		if ($rightOperand instanceof StringValue) {
 			$multiplier = $this->value;
 			if (\is_int($multiplier) && $multiplier >= 0) {
-				return new StringValue(\str_repeat($rightOperand->value, $multiplier));
+				$new = \str_repeat($rightOperand->value, $multiplier);
+				return new StringValue($new);
 			}
 			throw new \TypeError;
 		}
@@ -90,7 +86,7 @@ public function doDivision(Value $rightOperand): self {
 
 		// Avoid division by zero.
 		if ($rightOperand->value === 0) {
-			throw new \Smuuf\Primi\ErrorException("Division by zero.");
+			throw new \Smuuf\Primi\ErrorException("Division by zero");
 		}
 
 		return new self($this->value / $rightOperand->value);
@@ -114,10 +110,20 @@ public function doComparison(string $op, Value $rightOperand): BoolValue {
 
 		Common::allowTypes($rightOperand, self::class, StringValue::class);
 
+		// Numbers and strings can be only compared for equality.
+		// And are never equal.
+		if ($rightOperand instanceof StringValue) {
+			if ($op !== "==" && $op !== "!=") {
+				throw new \TypeError;
+			}
+		}
+
 		switch ($op) {
 			case "==":
+				// Don't do strict - wrong comparison of float and int.
 				return new BoolValue($this->value == $rightOperand->value);
 			case "!=":
+				// Don't do strict - wrong comparison of float and int.
 				return new BoolValue($this->value != $rightOperand->value);
 			case ">":
 				return new BoolValue($this->value > $rightOperand->value);
diff --git a/src/structures/StringValue.php b/src/structures/StringValue.php
@@ -37,21 +37,24 @@ public function getStringValue(): string {
 
 	public function doAddition(Value $rightOperand) {
 
-		Common::allowTypes($rightOperand, self::class, NumberValue::class);
+		Common::allowTypes($rightOperand, self::class);
 		return new self($this->value . $rightOperand->value);
 
 	}
 
 	public function doSubtraction(Value $rightOperand) {
 
+		// Allow only string at this point (if the operand was a regex, we've
+		// already returned value).
+		Common::allowTypes($rightOperand, self::class, RegexValue::class);
+
 		if ($rightOperand instanceof RegexValue) {
-			return new self(\preg_replace($rightOperand->value, \null, $this->value));
+			$match = \preg_replace($rightOperand->value, \null, $this->value);
+			return new self($match);
 		}
 
-		// Allow only string at this point (if the operand was a regex, we've already returned value).
-		Common::allowTypes($rightOperand, self::class);
-
-		return new self(\str_replace($rightOperand->value, \null, $this->value));
+		$new = \str_replace($rightOperand->value, \null, $this->value);
+		return new self($new);
 
 	}
 
@@ -78,13 +81,21 @@ public function doComparison(string $op, Value $rightOperand): BoolValue {
 			NumberValue::class
 		);
 
+		// Numbers and strings can be only compared for equality.
+		// And are never equal.
+		if ($rightOperand instanceof NumberValue) {
+			if ($op !== "==" && $op !== "!=") {
+				throw new \TypeError;
+			}
+		}
+
 		switch ($op) {
 			case "==":
 
 				if ($rightOperand instanceof RegexValue) {
 					$result = \preg_match($rightOperand->value, $this->value);
 				} else {
-					$result = $this->value === (string) $rightOperand->value;
+					$result = $this->value === $rightOperand->value;
 				}
 
 			break;
@@ -93,7 +104,7 @@ public function doComparison(string $op, Value $rightOperand): BoolValue {
 				if ($rightOperand instanceof RegexValue) {
 					$result = !\preg_match($rightOperand->value, $this->value);
 				} else {
-					$result = $this->value !== (string) $rightOperand->value;
+					$result = $this->value !== $rightOperand->value;
 				}
 
 			break;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -8,8 +8,11 @@
 
 \Smuuf\Primi\ExtensionHub::add([
 	\Smuuf\Primi\Psl\StringExtension::class,
+	\Smuuf\Primi\Psl\BoolExtension::class,
+	\Smuuf\Primi\Psl\RegexExtension::class,
 	\Smuuf\Primi\Psl\NumberExtension::class,
 	\Smuuf\Primi\Psl\ArrayExtension::class,
+	\Smuuf\Primi\Psl\CastingExtension::class,
 ]);
 
 \Tester\Environment::setup();
diff --git a/tests/language/suites/operations/addition.expect b/tests/language/suites/operations/addition.expect
@@ -1,8 +1,6 @@
 a:NumberValue:3
-b:NumberValue:3
-c:NumberValue:3
-d:StringValue:"x1"
-e:StringValue:"1x"
+b:StringValue:"12"
+c:NumberValue:444
 f:StringValue:"x1"
 g:StringValue:"1x"
 h:StringValue:"abc   def"
diff --git a/tests/language/suites/operations/addition.primi b/tests/language/suites/operations/addition.primi
diff --git a/tests/language/suites/operations/multiplication.expect b/tests/language/suites/operations/multiplication.expect
diff --git a/tests/language/suites/operations/multiplication.primi b/tests/language/suites/operations/multiplication.primi
diff --git a/tests/language/suites/operations/negation.expect b/tests/language/suites/operations/negation.expect
diff --git a/tests/language/suites/operations/negation.primi b/tests/language/suites/operations/negation.primi
diff --git a/tests/language/suites/structures/valuemethods.primi b/tests/language/suites/structures/valuemethods.primi
diff --git a/tests/language/suites/structures/variables.expect b/tests/language/suites/structures/variables.expect
diff --git a/tests/unit/value.number.phpt b/tests/unit/value.number.phpt
diff --git a/tests/unit/value.string.phpt b/tests/unit/value.string.phpt

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ function sub(x, y) {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`a = 1 + add(sub(4, 3), 3);`
`12`		`-a + "\n";`
	`12`	`+a.to_string() + "\n";`
`13`	`13`
`14`	`14`	`function nested(a) {`
`15`	`15`	`return add(a, sub(2,3));`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static function to_string(Value $value): StringValue {`
`29`	`29`	`public static function to_regex(Value $value): RegexValue {`
`30`	`30`
`31`	`31`	`// Allow regexes to be casted to regex.`
`32`		`- if ($value instanceof Regex) {`
	`32`	`+ if ($value instanceof RegexValue) {`
`33`	`33`	`return $value;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static function handle(array $node, Context $context) {`
`22`	`22`
`23`	`23`	`if (!$subject instanceof ISupportsIteration) {`
`24`	`24`	`throw new \Smuuf\Primi\ErrorException(`
`25`		`- "Cannot iterate over '{$node['left']['text']}' variable",`
	`25`	`+ sprintf("Cannot iterate over '%s'", $subject::TYPE),`
`26`	`26`	`$node`
`27`	`27`	`);`
`28`	`28`	`}`