rename label _Nothing as _None in the generated code, and _!Nothing,_#Nothing...

rename label _Nothing as _None in the generated code, and _!Nothing,_#Nothing and _|Nothing in the compiler to _!None,_#None and _|None

backendC/CleanCompilerSources/codegen1.c

@@ -113,7 +113,7 @@ LabDef unboxed_just_labels[5] = {
 					/*RealObj*/	  {NULL, "", False, "_Justr", 0},
 					/*FileObj*/	  {NULL, "", False, "_Justf", 0}
 	};
-LabDef nothing_lab				= {NULL, "", False, "_Nothing", 0};
+LabDef none_lab					= {NULL, "", False, "_None", 0};
 
 int unboxed_just_mark[5];
 int unboxed_just_array_mark;
@@ -3651,7 +3651,7 @@ void generate_is_constructor (ImpRuleP rule)
 				break;
 			}
 			case none_symb:
-				GenEqDesc (&nothing_lab,case_node->node_arity,0);
+				GenEqDesc (&none_lab,case_node->node_arity,0);
 				break;
 			case just_symb:
 			{
@@ -3659,7 +3659,7 @@ void generate_is_constructor (ImpRuleP rule)
 				
 				symbol=case_node->node_symbol;
 				if (symbol->symb_head_strictness==OVERLOADED_CONS || symbol->symb_head_strictness>=UNBOXED_OVERLOADED_CONS){
-					GenEqDesc (&nothing_lab,0,0);
+					GenEqDesc (&none_lab,0,0);
 					GenNotB();
 				} else
 					GenEqDesc (&just_lab,case_node->node_arity,0);
@@ -4561,7 +4561,7 @@ static int generate_code_for_switch_node (NodeP node,int asp,int bsp,struct esc
 								matches_always=1;
 							} else {
 								if (symbol->symb_head_strictness==OVERLOADED_CONS || symbol->symb_head_strictness>=UNBOXED_OVERLOADED_CONS){
-									GenEqDesc (&nothing_lab,0,asp-a_index);
+									GenEqDesc (&none_lab,0,asp-a_index);
 									GenJmpFalse (&case_label);
 								} else {
 									GenEqDesc (&just_lab,case_node->node_arity,asp-a_index);
@@ -4574,7 +4574,7 @@ static int generate_code_for_switch_node (NodeP node,int asp,int bsp,struct esc
 								GenJmp (&case_label);
 								matches_always=1;
 							} else {
-								GenEqDesc (&nothing_lab,case_node->node_arity,asp-a_index);
+								GenEqDesc (&none_lab,case_node->node_arity,asp-a_index);
 								GenJmpTrue (&case_label);
 							}
 							break;

backendC/CleanCompilerSources/codegen1.h

@@ -21,7 +21,7 @@ extern LabDef
 #if STRICT_LISTS
 	conss_lab,consts_lab,conssts_lab,unboxed_cons_labels[5][2],unboxed_cons_array_label,
 #endif
-	just_lab, justs_lab, unboxed_just_array_label, unboxed_just_labels[5], nothing_lab,
+	just_lab, justs_lab, unboxed_just_array_label, unboxed_just_labels[5], none_lab,
 	select_with_dictionary_lab, update_with_dictionary_lab,
 	CurrentAltLabel;
 

backendC/CleanCompilerSources/codegen2.c

@@ -3679,9 +3679,9 @@ static void FillNormalNode (Node node,int *asp_p,int *bsp_p,NodeId update_node_i
 			}
 			if (update_node_id==NULL){
 				*asp_p+=1;
-				GenBuildh (&nothing_lab,0);
+				GenBuildh (&none_lab,0);
 			} else
-				GenFillh (&nothing_lab,0,*asp_p-update_node_id->nid_a_index,node->node_state.state_kind == SemiStrict ? ReleaseAndFill : NormalFill);
+				GenFillh (&none_lab,0,*asp_p-update_node_id->nid_a_index,node->node_state.state_kind == SemiStrict ? ReleaseAndFill : NormalFill);
 			return;
 		case string_denot:
 			GenBuildString (symb->symb_val);
@@ -4710,7 +4710,7 @@ void FillMatchNode (Node node,int *asp_p,int *bsp_p,NodeId update_node_id,CodeGe
 				break;
 			case just_symb:
 				if (symbol->symb_head_strictness==OVERLOADED_CONS || symbol->symb_head_strictness>=UNBOXED_OVERLOADED_CONS){
-					GenEqDesc (&nothing_lab,0,0);
+					GenEqDesc (&none_lab,0,0);
 					GenNotB();
 				} else
 					GenEqDesc (&just_lab,1,0);

backendC/CleanCompilerSources/codegen3.c

@@ -1044,9 +1044,9 @@ static void CodeNormalRootNode (Node root,NodeId rootid,int asp,int bsp,CodeGenN
 				if (resultstate.state_kind==StrictRedirection){
 					GenPopA	(asp);
 					GenPopB	(bsp);
-					GenBuildh (&nothing_lab,0);
+					GenBuildh (&none_lab,0);
 				} else {
-					GenFillh (&nothing_lab,0,asp,ReleaseAndFill);
+					GenFillh (&none_lab,0,asp,ReleaseAndFill);
 
 					GenPopA	(asp);
 					GenPopB	(bsp);
@@ -1055,7 +1055,7 @@ static void CodeNormalRootNode (Node root,NodeId rootid,int asp,int bsp,CodeGenN
 				return;
 			}
 
-			FillRhsRoot (&nothing_lab,root,asp,bsp,code_gen_node_ids_p);
+			FillRhsRoot (&none_lab,root,asp,bsp,code_gen_node_ids_p);
 			return;
 		case apply_symb:
 #ifdef NEW_APPLY

frontend/predef.icl

@@ -37,10 +37,10 @@ predefined_idents
 					[PD_StrictJustSymbol] = i "_!Just",
 					[PD_UnboxedJustSymbol] = i "_#Just",
 					[PD_OverloadedJustSymbol] = i "_|Just",
-					[PD_NoneSymbol] = i "_Nothing",
-					[PD_StrictNoneSymbol] = i "_!Nothing",
-					[PD_UnboxedNoneSymbol] = i "_#Nothing",
-					[PD_OverloadedNoneSymbol] = i "_|Nothing",
+					[PD_NoneSymbol] = i "_None",
+					[PD_StrictNoneSymbol] = i "_!None",
+					[PD_UnboxedNoneSymbol] = i "_#None",
+					[PD_OverloadedNoneSymbol] = i "_|None",
 					[PD_UnitConsSymbol] = i "_Unit",
 
 					[PD_PredefinedModule] = i "_predefined",