Browse Source

Minor Simplification of threading demo

Ginger Bill 8 years ago
parent
commit
655931f0ea
2 changed files with 8 additions and 8 deletions
  1. 4 7
      code/demo.odin
  2. 4 1
      src/check_decl.cpp

+ 4 - 7
code/demo.odin

@@ -17,14 +17,10 @@ prefix_table := [...]string{
 };
 
 worker_proc :: proc(t: ^thread.Thread) -> int {
-	do_work :: proc(iteration: int, index: int) {
-		fmt.printf("`%s`: iteration %d\n", prefix_table[index], iteration);
-		win32.sleep(1);
-	}
-
 	for iteration in 1...5 {
-		fmt.printf("Thread %d is on iteration %d\n", t.user_index, iteration);
-		do_work(iteration, t.user_index);
+		fmt.printf("Th/read %d is on iteration %d\n", t.user_index, iteration);
+		fmt.printf("`%s`: iteration %d\n", prefix_table[t.user_index], iteration);
+		win32.sleep(1);
 	}
 	return 0;
 }
@@ -56,3 +52,4 @@ main :: proc() {
 		}
 	}
 }
+

+ 4 - 1
src/check_decl.cpp

@@ -231,6 +231,7 @@ void check_const_decl(Checker *c, Entity *e, AstNode *type_expr, AstNode *init,
 		} break;
 
 	// NOTE(bill): Check to see if the expression it to be aliases
+	#if 1
 		case Addressing_Builtin:
 			if (e->type != nullptr) {
 				error(type_expr, "A constant alias of a built-in procedure may not have a type initializer");
@@ -245,8 +246,9 @@ void check_const_decl(Checker *c, Entity *e, AstNode *type_expr, AstNode *init,
 			e->Alias.base = operand.overload_entities[0];
 			e->type = t_invalid;
 			return;
+	#endif
 		}
-
+	#if 1
 		if (entity != nullptr) {
 			switch (entity->kind) {
 			case Entity_Alias:
@@ -276,6 +278,7 @@ void check_const_decl(Checker *c, Entity *e, AstNode *type_expr, AstNode *init,
 				return;
 			}
 		}
+	#endif
 	}
 
 	if (init != nullptr) {