diff --git a/code/demo.odin b/code/demo.odin index b6d425915..ced72b300 100644 --- a/code/demo.odin +++ b/code/demo.odin @@ -14,10 +14,6 @@ import ( "utf16.odin"; ) -const ( - X = 123; - Y = 432; -) proc main() { proc(s: string){ diff --git a/core/strings.odin b/core/strings.odin index 89750970c..0397e76a1 100644 --- a/core/strings.odin +++ b/core/strings.odin @@ -1,3 +1,10 @@ +proc new_string(s: string) -> string { + var c = make([]u8, len(s)+1); + copy(c, []u8(s)); + c[len(s)] = 0; + return string(c[0.. ^u8 { var c = make([]u8, len(s)+1); copy(c, []u8(s)); diff --git a/src/parser.cpp b/src/parser.cpp index c96070044..a5dead4ce 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -2567,11 +2567,19 @@ AstNode *parse_gen_decl(AstFile *f, Token token, ParseSpecFunc *func) { expect_semicolon(f, spec); } close = expect_token(f, Token_CloseParen); + if (f->curr_token.pos.line == close.pos.line || + open.pos.line == close.pos.line) { + expect_semicolon(f, NULL); + } } else { array_init(&specs, heap_allocator(), 1); array_add(&specs, func(f, token)); } + if (specs.count == 0) { + syntax_error(token, "Empty %.*s declaration list", LIT(token_strings[token.kind])); + } + AstNode *decl = ast_gen_decl(f, token, open, close, specs); if (token.kind == Token_let) { decl->GenDecl.flags |= VarDeclFlag_immutable; @@ -2790,7 +2798,6 @@ AstNode *parse_decl(AstFile *f) { Token token = f->curr_token; next_token(f); - return parse_gen_decl(f, token, func); }