Browse Source

Using implicit selector expressions in the core library

gingerBill 6 years ago
parent
commit
c634d4a96d
2 changed files with 6 additions and 8 deletions
  1. 2 2
      core/odin/parser/parser.odin
  2. 4 6
      core/os/os.odin

+ 2 - 2
core/odin/parser/parser.odin

@@ -2679,7 +2679,7 @@ parse_simple_stmt :: proc(p: ^Parser, flags: Stmt_Allow_Flags) -> ^ast.Stmt {
 		return stmt;
 		return stmt;
 
 
 	case op.kind == token.In:
 	case op.kind == token.In:
-		if Stmt_Allow_Flag.In in flags {
+		if .In in flags {
 			allow_token(p, token.In);
 			allow_token(p, token.In);
 			prev_allow_range := p.allow_range;
 			prev_allow_range := p.allow_range;
 			p.allow_range = true;
 			p.allow_range = true;
@@ -2697,7 +2697,7 @@ parse_simple_stmt :: proc(p: ^Parser, flags: Stmt_Allow_Flags) -> ^ast.Stmt {
 		}
 		}
 	case op.kind == token.Colon:
 	case op.kind == token.Colon:
 		expect_token_after(p, token.Colon, "identifier list");
 		expect_token_after(p, token.Colon, "identifier list");
-		if Stmt_Allow_Flag.Label in flags && len(lhs) == 1 {
+		if .Label in flags && len(lhs) == 1 {
 			switch p.curr_tok.kind {
 			switch p.curr_tok.kind {
 			case token.Open_Brace, token.If, token.For, token.Switch:
 			case token.Open_Brace, token.If, token.For, token.Switch:
 				label := lhs[0];
 				label := lhs[0];

+ 4 - 6
core/os/os.odin

@@ -123,20 +123,18 @@ read_ptr :: proc(fd: Handle, data: rawptr, len: int) -> (int, Errno) {
 heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
 heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
                             size, alignment: int,
                             size, alignment: int,
                             old_memory: rawptr, old_size: int, flags: u64 = 0, loc := #caller_location) -> rawptr {
                             old_memory: rawptr, old_size: int, flags: u64 = 0, loc := #caller_location) -> rawptr {
-	using mem.Allocator_Mode;
-
 	switch mode {
 	switch mode {
-	case Alloc:
+	case .Alloc:
 		return heap_alloc(size);
 		return heap_alloc(size);
 
 
-	case Free:
+	case .Free:
 		heap_free(old_memory);
 		heap_free(old_memory);
 		return nil;
 		return nil;
 
 
-	case Free_All:
+	case .Free_All:
 		// NOTE(bill): Does nothing
 		// NOTE(bill): Does nothing
 
 
-	case Resize:
+	case .Resize:
 		if old_memory == nil {
 		if old_memory == nil {
 			return heap_alloc(size);
 			return heap_alloc(size);
 		}
 		}