fix 3 bugs, orelse block defer bypass, raw string #if 0 desync, O(N*K) noreturn tagging

Author: dawnlarsson

parse.c

@@ -1829,8 +1829,10 @@ static Token *tokenize(File *file) {
 	// Scan file-scope tokens for _Noreturn, noreturn, [[noreturn]],
 	// or __attribute__((noreturn)) / __attribute__((__noreturn__)).
 	// When a noreturn specifier is found before a function declaration,
-	// tag all occurrences of that function name with TT_NORETURN_FN.
+	// collect the function name into a hashmap, then do a single O(N)
+	// pass to tag all occurrences (replaces prior O(N*K) inner loop).
 	{
+		HashMap nr_map = {0};
 		for (Token *t = first; t && t->kind != TK_EOF; t = tok_next(t)) {
 			bool is_noreturn = false;
 			Token *scan_start = t;
@@ -1914,14 +1916,19 @@ static Token *tokenize(File *file) {
 				}
 			}
 			if (!fn_name) continue;
+			hashmap_put(&nr_map, tok_loc(fn_name), fn_name->len, (void *)1);
+		}
 
-			// Tag all occurrences of this function name with TT_NORETURN_FN
+		// Single O(N) pass to tag all occurrences of noreturn function names
+		if (nr_map.used > 0) {
 			for (Token *s = first; s && s->kind != TK_EOF; s = tok_next(s)) {
-				if (s->kind == TK_IDENT && tok_name_eq(s, fn_name) &&
-				    !(tok_idx(s) >= 1 && (token_pool[tok_idx(s) - 1].tag & TT_MEMBER)))
+				if (s->kind == TK_IDENT &&
+				    !(tok_idx(s) >= 1 && (token_pool[tok_idx(s) - 1].tag & TT_MEMBER)) &&
+				    hashmap_get(&nr_map, tok_loc(s), s->len))
 					s->tag |= TT_NORETURN_FN;
 			}
 		}
+		free(nr_map.buckets);
 	}
 
 	return first;

prism.c

@@ -4449,6 +4449,8 @@ static Token *validate_defer_statement(Token *tok, bool in_loop, bool in_switch,
 				if (act && match_ch(act, ';'))
 					error_tok(s, "expected statement after 'orelse'");
 				validate_defer_control_flow(act, in_loop, in_switch);
+				if (act && match_ch(act, '{'))
+					validate_defer_statement(act, in_loop, in_switch, depth + 1);
 				break;
 			}
 		}
@@ -5453,11 +5455,11 @@ static void collect_source_defines(const char *input_file) {
 				char *rd = NULL;
 				if (has_unclosed_block_comment(p, &rd)) {
 					in_block_comment = true;
-				} else if (rd) {
+				} else if (rd && cond_depth == 0) {
 					in_raw_string = true;
 					raw_delim = rd;
 					raw_delim_len = (int)strlen(rd);
-				}
+				} else free(rd);
 			}
 			continue;
 		}
@@ -5484,18 +5486,23 @@ static void collect_source_defines(const char *input_file) {
 					char *rd = NULL;
 					if (has_unclosed_block_comment(p, &rd))
 						in_block_comment = true;
-					else if (rd) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+					else if (rd && cond_depth == 0) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+					else free(rd);
 					goto check_continuation;
 				}
 				goto have_hash;
 			}
 			// Non-preprocessor, non-blank line — scan for mid-line
 			// block comment or raw string that spans subsequent lines.
+			// Raw string detection suppressed inside #if/#ifdef blocks:
+			// the C preprocessor doesn't lex tokens in dead branches,
+			// so R"(...)" containing #endif would desync nesting.
 			{
 				char *rd = NULL;
 				if (has_unclosed_block_comment(p, &rd))
 					in_block_comment = true;
-				else if (rd) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+				else if (rd && cond_depth == 0) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+				else free(rd);
 			}
 			goto check_continuation;
 		}
@@ -5729,7 +5736,8 @@ static void collect_source_defines(const char *input_file) {
 				char *rd = NULL;
 				if (has_unclosed_block_comment(line, &rd))
 					in_block_comment = true;
-				else if (rd) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+				else if (rd && cond_depth == 0) { in_raw_string = true; raw_delim = rd; raw_delim_len = (int)strlen(rd); }
+				else free(rd);
 			}
 		}
 	}