Ensure all object asserts are executed, fix #181

Author: sparkprime

core/vm.cpp

@@ -872,6 +872,7 @@ class Interpreter {
         if (stack.alreadyExecutingInvariants(self)) return;
 
         unsigned counter = 0;
+        unsigned initial_stack_size = stack.size();
         stack.newFrame(FRAME_INVARIANTS, loc);
         std::vector<HeapThunk*> &thunks = stack.top().thunks;
         objectInvariants(self, self, counter, thunks);
@@ -880,7 +881,6 @@ class Interpreter {
             return;
         }
         HeapThunk *thunk = thunks[0];
-        unsigned initial_stack_size = stack.size();
         stack.top().elementId = 1;
         stack.top().self = self;
         stack.newCall(loc, thunk, thunk->self, thunk->offset, thunk->upValues);

test_suite/error.obj_assert.fail1.jsonnet

@@ -0,0 +1,22 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+local x = "foo";
+local y = "bar";
+
+{ assert true, assert x == y, x: 1 } == { x: 1 } &&
+
+true

test_suite/error.obj_assert.fail1.jsonnet.golden

@@ -0,0 +1,6 @@
+RUNTIME ERROR: Object assertion failed.
+	error.obj_assert.fail1.jsonnet:20:23-28	thunk <object_assert>
+	std.jsonnet:976:54-57	thunk <a>
+	std.jsonnet:976:54-65	function <anonymous>
+	std.jsonnet:976:54-65	function <anonymous>
+	std.jsonnet:980:21-32	

test_suite/error.obj_assert.fail2.jsonnet

@@ -0,0 +1,22 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+local x = "foo";
+local y = "bar";
+
+{ assert true, assert x == y : "%s was not equal to %s" % [x, y], x: 1 } == { x: 1 } &&
+
+true

test_suite/error.obj_assert.fail2.jsonnet.golden

@@ -0,0 +1,6 @@
+RUNTIME ERROR: foo was not equal to bar
+	error.obj_assert.fail2.jsonnet:20:32-64	thunk <object_assert>
+	std.jsonnet:976:54-57	thunk <a>
+	std.jsonnet:976:54-65	function <anonymous>
+	std.jsonnet:976:54-65	function <anonymous>
+	std.jsonnet:980:21-32