Misc

2025-02-02 09:20:39 +01:00 · 2010-09-20 16:26:25 +00:00 · 2010-09-20 16:26:25 +00:00 · 0eb26b8e97
commit 0eb26b8e97
parent 9b8171d5c1
2 changed files with 63 additions and 79 deletions
--- a/src/jrd/cmp.cpp
+++ b/src/jrd/cmp.cpp
@ -1253,11 +1253,6 @@ jrd_nod* NodeCopier::copy(thread_db* tdbb, jrd_nod* input)
 		}
 		return node;

-	case nod_for:
-		///args = e_for_length;
-		fb_assert(false);
-		break;
-
 	case nod_argument:
 		if (remapArgument())
 			return input;
--- a/src/jrd/nod.h
+++ b/src/jrd/nod.h
@ -24,83 +24,72 @@
 */

 NODE(nod_asn_list, asn_list, "")
-	NODE(nod_assignment, assignment, "")
-	NODE(nod_dcl_variable, declare, "")
-	NODE(nod_erase, erase, "")
-	NODE(nod_for, for, "")
-	NODE(nod_handler, handler, "")
-		NODE(nod_label, label, "")
-			NODE(nod_leave, leave, "")
-			NODE(nod_list, list, "")
-			NODE(nod_loop, loop, "")
-			NODE(nod_message, message, "")
-			NODE(nod_modify, modify, "")
-			NODE(nod_receive, receive, "")
-			NODE(nod_select, select, "")
-			NODE(nod_store, store, "")
+NODE(nod_validate, validate, "")

-			NODE(nod_argument, argument, "")
-			NODE(nod_variable, variable, "")
-			NODE(nod_average, average, "AVG")
-			NODE(nod_count, count, "COUNT")
-			NODE(nod_dbkey, dbkey, "ROWID")
-			NODE(nod_field, field, "")
-			NODE(nod_from, from, "")
-			NODE(nod_literal, literal, "")
-			NODE(nod_max, max, "MAX")
-			NODE(nod_min, min, "MIN")
-			NODE(nod_scalar, scalar, "")
-			NODE(nod_gen_id, recnum, "")
-			NODE(nod_prot_mask, prot_mask, "")
-			NODE(nod_upcase, upcase, "UPPER")
-			NODE(nod_lock_state, lock_state, "")
-			NODE(nod_null, null, "NULL")
-			NODE(nod_substr, substr, "")
-			NODE(nod_total, total, "SUM")
-			NODE(nod_trim, trim, "")
-			NODE(nod_validate, validate, "")
+NODE(nod_assignment, assignment, "")
+NODE(nod_dcl_variable, declare, "")
+NODE(nod_erase, erase, "")
+NODE(nod_handler, handler, "")
+NODE(nod_label, label, "")
+NODE(nod_leave, leave, "")
+NODE(nod_list, list, "")
+NODE(nod_loop, loop, "")
+NODE(nod_message, message, "")
+NODE(nod_modify, modify, "")
+NODE(nod_receive, receive, "")
+NODE(nod_select, select, "")
+NODE(nod_store, store, "")
+NODE(nod_exec_proc, exec_proc, "")
+NODE(nod_block, block, "")
+NODE(nod_error_handler, error_handler, "")
+NODE(nod_start_savepoint, start_savepoint, "")
+NODE(nod_end_savepoint, end_savepoint, "")
+NODE(nod_stall, stall, "SERVER STALL")
+NODE(nod_exec_sql, exec_sql, "EXECUTE STATEMENT")
+NODE(nod_exec_into, exec_sql_into, "EXECUTE VARCHAR INTO")
+NODE(nod_exec_stmt, exec_stmt, "EXECUTE STATEMENT")
+NODE(nod_dcl_cursor, declare_cursor, "DECLARE CURSOR")
+NODE(nod_cursor_stmt, cursor_stmt, "CURSOR STATEMENT")
+NODE(nod_continue_loop, continue_loop, "")

-		  NODE(nod_exec_proc, exec_proc, "")
-		  NODE(nod_block, block, "")
-		  NODE(nod_error_handler, error_handler, "")
-		  NODE(nod_cast, cast, "CAST")
-		  NODE(nod_start_savepoint, start_savepoint, "")
-		  NODE(nod_end_savepoint, end_savepoint, "")
+NODE(nod_set_generator, set_generator, "")
+NODE(nod_set_generator2, set_generator, "")

-		  NODE(nod_set_generator, set_generator, "")
+NODE(nod_argument, argument, "")
+NODE(nod_variable, variable, "")
+NODE(nod_dbkey, dbkey, "ROWID")
+NODE(nod_field, field, "")
+NODE(nod_from, from, "")
+NODE(nod_literal, literal, "")
+NODE(nod_scalar, scalar, "")
+NODE(nod_gen_id, recnum, "")
+NODE(nod_prot_mask, prot_mask, "")
+NODE(nod_upcase, upcase, "UPPER")
+NODE(nod_lock_state, lock_state, "")
+NODE(nod_null, null, "NULL")
+NODE(nod_substr, substr, "")
+NODE(nod_trim, trim, "")
+NODE(nod_cast, cast, "CAST")
+NODE(nod_rec_version, record_version, "RECORD VERSION")
+NODE(nod_extract, extract, "EXTRACT")
+NODE(nod_gen_id2, recnum, "")
+NODE(nod_lowcase, lowcase, "LOWER")
+NODE(nod_strlen, strlen, "STRLEN")
+NODE(nod_src_info, source_info, "")
+NODE(nod_init_variable, init_variable, "")
+NODE(nod_domain_validation, domain_validation, "")
+NODE(nod_derived_expr, derived_expr, "derived_expr")

-/* Required for NULL handling             */
+NODE(nod_stmt_expr, stmt_expr, "stmt_expr")

-		  NODE(nod_rec_version, record_version, "RECORD VERSION")
-		  NODE(nod_stall, stall, "SERVER STALL")
+NODE(nod_average, average, "AVG")
+NODE(nod_count, count, "COUNT")
+NODE(nod_max, max, "MAX")
+NODE(nod_min, min, "MIN")
+NODE(nod_total, total, "SUM")
+NODE(nod_average2, average2, "AVG")
+NODE(nod_total2, total, "SUM")

-/* Improved date handling */
-		  NODE(nod_extract, extract, "EXTRACT")
-
-		  NODE(nod_average2, average2, "AVG")
-		  NODE(nod_gen_id2, recnum, "")
-		  NODE(nod_set_generator2, set_generator, "")
-		  NODE(nod_total2, total, "SUM")
-
-/* EXECUTE STATEMENT */
-		  NODE(nod_exec_sql, exec_sql, "EXECUTE STATEMENT")
-
-/* EXECUTE VARCHAR INTO ...*/
-		  NODE(nod_exec_into, exec_sql_into, "EXECUTE VARCHAR INTO")
-		  NODE(nod_exec_stmt, exec_stmt, "EXECUTE STATEMENT")
-
-		  NODE(nod_dcl_cursor, declare_cursor, "DECLARE CURSOR")
-		  NODE(nod_cursor_stmt, cursor_stmt, "CURSOR STATEMENT")
-		  NODE(nod_lowcase, lowcase, "LOWER")
-
-		  NODE(nod_strlen, strlen, "STRLEN")
-
-		  NODE(nod_src_info, source_info, "")
-		  NODE(nod_init_variable, init_variable, "")
-		  NODE(nod_domain_validation, domain_validation, "")
-		  NODE(nod_class_exprnode_jrd, class_exprnode_jrd, "class_exprnode_jrd")
-		  NODE(nod_class_stmtnode_jrd, class_stmtnode_jrd, "class_stmtnode_jrd")
-		  NODE(nod_class_recsrcnode_jrd, class_recsrcnode_jrd, "class_recsrcnode_jrd")
-		  NODE(nod_stmt_expr, stmt_expr, "stmt_expr")
-  		  NODE(nod_derived_expr, derived_expr, "derived_expr")
-		  NODE(nod_continue_loop, continue_loop, "")
+NODE(nod_class_exprnode_jrd, class_exprnode_jrd, "class_exprnode_jrd")
+NODE(nod_class_stmtnode_jrd, class_stmtnode_jrd, "class_stmtnode_jrd")
+NODE(nod_class_recsrcnode_jrd, class_recsrcnode_jrd, "class_recsrcnode_jrd")