Merge pull request #2 from jow-/rewrite

treewide: rewrite ucode interpreter

1 files changed, 82 insertions, 0 deletions

diff --git a/tests/00_syntax/13_object_literals b/tests/00_syntax/13_object_literals
index 60c9f32..18fbbed 100644
--- a/tests/00_syntax/13_object_literals
+++ b/tests/00_syntax/13_object_literals
@@ -48,6 +48,7 @@ either JSON or JavaScript notation.
 	print(another_obj, "\n");
 	print(third_obj, "\n");
 	print(nested_obj, "\n");
+%}
 -- End --
 
 
@@ -90,3 +91,84 @@ of object properties into other objects.
 	]), "\n");
 %}
 -- End --
+
+
+ES2015 short hand property notation is supported as well.
+
+-- Expect stdout --
+{ "a": 123, "b": true, "c": "test" }
+-- End --
+
+-- Testcase --
+{%
+	a = 123;
+	b = true;
+	c = "test";
+
+	o = { a, b, c };
+
+	print(o, "\n");
+%}
+-- End --
+
+-- Expect stderr --
+Syntax error: Unexpected token
+Expecting ':'
+In line 2, byte 14:
+
+ `    o = { "foo" };`
+  Near here ------^
+
+
+-- End --
+
+-- Testcase --
+{%
+	o = { "foo" };
+%}
+-- End --
+
+
+ES2015 computed property names are supported.
+
+-- Expect stdout --
+{ "test": true, "hello": false, "ABC": 123 }
+-- End --
+
+-- Testcase --
+{%
+	s = "test";
+	o = {
+		[s]: true,
+		["he" + "llo"]: false,
+		[uc("abc")]: 123
+	};
+
+	print(o, "\n");
+%}
+-- End --
+
+-- Expect stderr --
+Syntax error: Expecting expression
+In line 2, byte 10:
+
+ `    o1 = { []: true };`
+  Near here --^
+
+
+Syntax error: Unexpected token
+Expecting ']'
+In line 3, byte 14:
+
+ `    o2 = { [true, false]: 123 };`
+  Near here ------^
+
+
+-- End --
+
+-- Testcase --
+{%
+	o1 = { []: true };
+	o2 = { [true, false]: 123 };
+%}
+-- End --