Fix bug when the assert macro is disabled

maxbrunsfeld · maxbrunsfeld · commit 0e046fc6c00e · 2019-06-14T14:23:38.000-07:00
Fixes tree-sitter#364
diff --git a/lib/src/parser.c b/lib/src/parser.c
@@ -979,7 +979,8 @@ static void ts_parser__handle_error(TSParser *self, StackVersion version,
   }
 
   for (unsigned i = previous_version_count; i < version_count; i++) {
-    assert(ts_stack_merge(self->stack, version, previous_version_count));
+    bool did_merge = ts_stack_merge(self->stack, version, previous_version_count);
+    assert(did_merge);
   }
 
   ts_stack_record_summary(self->stack, version, MAX_SUMMARY_DEPTH);

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,8 @@ static void ts_parser__handle_error(TSParser *self, StackVersion version,`
`979`	`979`	`}`
`980`	`980`
`981`	`981`	`for (unsigned i = previous_version_count; i < version_count; i++) {`
`982`		`- assert(ts_stack_merge(self->stack, version, previous_version_count));`
	`982`	`+ bool did_merge = ts_stack_merge(self->stack, version, previous_version_count);`
	`983`	`+ assert(did_merge);`
`983`	`984`	`}`
`984`	`985`
`985`	`986`	`ts_stack_record_summary(self->stack, version, MAX_SUMMARY_DEPTH);`