aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2018-01-18 17:28:07 +0000
committergingerBill <bill@gingerbill.org>2018-01-18 17:28:07 +0000
commitb03ce0e9b4b43f3d46fec8bb9cf4de56e6ee886a (patch)
treec0cb33dd58cf0c6dfbe5078e8055c185600ba995 /src
parent386f5f596da284e90565b02d7766ebf79fddb8f7 (diff)
Modify implicit semicolon rules
Diffstat (limited to 'src')
-rw-r--r--src/common.cpp1
-rw-r--r--src/parser.cpp8
2 files changed, 6 insertions, 3 deletions
diff --git a/src/common.cpp b/src/common.cpp
index b922980db..1208349b4 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -63,7 +63,6 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
#else
case gbAllocation_Alloc:
// TODO(bill): Make sure this is aligned correctly
- // ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, align_formula_isize(size, alignment));
ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, align_formula_isize(size, alignment));
break;
case gbAllocation_Free:
diff --git a/src/parser.cpp b/src/parser.cpp
index e0c919667..1c03af2e3 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1371,8 +1371,12 @@ void expect_semicolon(AstFile *f, AstNode *s) {
if (is_semicolon_optional_for_node(f, s)) {
return;
}
- } else if (f->curr_token.kind == Token_CloseBrace) {
- return;
+ } else {
+ switch (f->curr_token.kind) {
+ case Token_CloseBrace:
+ case Token_CloseParen:
+ return;
+ }
}
String node_string = ast_node_strings[s->kind];
syntax_error(prev_token, "Expected ';' after %.*s, got %.*s",