Save meta_function_name as a string (#661)

nigeltao · web-flow · commit 01962bbb05c4 · 2023-09-09T12:42:36.000-07:00
diff --git a/source/reflect.h b/source/reflect.h
@@ -627,49 +627,50 @@ auto parser::apply_type_meta_functions( declaration_node& n )
     //  For each metafunction, apply it
     for (auto& meta : n.meta_functions)
     {
-        rtype.set_meta_function_name( meta->to_string() );
+        auto name = meta->to_string();
+        rtype.set_meta_function_name( name );
 
-        if (meta->to_string() == "interface") {
+        if (name == "interface") {
             interface( rtype );
         }
-        else if (meta->to_string() == "polymorphic_base") {
+        else if (name == "polymorphic_base") {
             polymorphic_base( rtype );
         }
-        else if (meta->to_string() == "ordered") {
+        else if (name == "ordered") {
             ordered( rtype );
         }
-        else if (meta->to_string() == "weakly_ordered") {
+        else if (name == "weakly_ordered") {
             weakly_ordered( rtype );
         }
-        else if (meta->to_string() == "partially_ordered") {
+        else if (name == "partially_ordered") {
             partially_ordered( rtype );
         }
-        else if (meta->to_string() == "copyable") {
+        else if (name == "copyable") {
             copyable( rtype );
         }
-        else if (meta->to_string() == "basic_value") {
+        else if (name == "basic_value") {
             basic_value( rtype );
         }
-        else if (meta->to_string() == "value") {
+        else if (name == "value") {
             value( rtype );
         }
-        else if (meta->to_string() == "weakly_ordered_value") {
+        else if (name == "weakly_ordered_value") {
             weakly_ordered_value( rtype );
         }
-        else if (meta->to_string() == "partially_ordered_value") {
+        else if (name == "partially_ordered_value") {
             partially_ordered_value( rtype );
         }
-        else if (meta->to_string() == "struct") {
+        else if (name == "struct") {
             cpp2_struct( rtype );
         }
-        else if (meta->to_string() == "enum") {
+        else if (name == "enum") {
             cpp2_enum( rtype );
         }
-        else if (meta->to_string() == "flag_enum") {
+        else if (name == "flag_enum") {
             flag_enum( rtype );
         }
         else {
-            error( "(temporary alpha limitation) unrecognized metafunction name '" + meta->to_string() + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );
+            error( "(temporary alpha limitation) unrecognized metafunction name '" + name + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );
             return false;
         }
     }
diff --git a/source/reflect.h2 b/source/reflect.h2
@@ -962,49 +962,50 @@ auto parser::apply_type_meta_functions( declaration_node& n )
     //  For each metafunction, apply it
     for (auto& meta : n.meta_functions)
     {
-        rtype.set_meta_function_name( meta->to_string() );
+        auto name = meta->to_string();
+        rtype.set_meta_function_name( name );
 
-        if (meta->to_string() == "interface") {
+        if (name == "interface") {
             interface( rtype );
         }
-        else if (meta->to_string() == "polymorphic_base") {
+        else if (name == "polymorphic_base") {
             polymorphic_base( rtype );
         }
-        else if (meta->to_string() == "ordered") {
+        else if (name == "ordered") {
             ordered( rtype );
         }
-        else if (meta->to_string() == "weakly_ordered") {
+        else if (name == "weakly_ordered") {
             weakly_ordered( rtype );
         }
-        else if (meta->to_string() == "partially_ordered") {
+        else if (name == "partially_ordered") {
             partially_ordered( rtype );
         }
-        else if (meta->to_string() == "copyable") {
+        else if (name == "copyable") {
             copyable( rtype );
         }
-        else if (meta->to_string() == "basic_value") {
+        else if (name == "basic_value") {
             basic_value( rtype );
         }
-        else if (meta->to_string() == "value") {
+        else if (name == "value") {
             value( rtype );
         }
-        else if (meta->to_string() == "weakly_ordered_value") {
+        else if (name == "weakly_ordered_value") {
             weakly_ordered_value( rtype );
         }
-        else if (meta->to_string() == "partially_ordered_value") {
+        else if (name == "partially_ordered_value") {
             partially_ordered_value( rtype );
         }
-        else if (meta->to_string() == "struct") {
+        else if (name == "struct") {
             cpp2_struct( rtype );
         }
-        else if (meta->to_string() == "enum") {
+        else if (name == "enum") {
             cpp2_enum( rtype );
         }
-        else if (meta->to_string() == "flag_enum") {
+        else if (name == "flag_enum") {
             flag_enum( rtype );
         }
         else {
-            error( "(temporary alpha limitation) unrecognized metafunction name '" + meta->to_string() + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );
+            error( "(temporary alpha limitation) unrecognized metafunction name '" + name + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );
             return false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -627,49 +627,50 @@ auto parser::apply_type_meta_functions( declaration_node& n )`
`627`	`627`	`// For each metafunction, apply it`
`628`	`628`	`for (auto& meta : n.meta_functions)`
`629`	`629`	`{`
`630`		`- rtype.set_meta_function_name( meta->to_string() );`
	`630`	`+ auto name = meta->to_string();`
	`631`	`+ rtype.set_meta_function_name( name );`
`631`	`632`
`632`		`- if (meta->to_string() == "interface") {`
	`633`	`+ if (name == "interface") {`
`633`	`634`	`interface( rtype );`
`634`	`635`	`}`
`635`		`- else if (meta->to_string() == "polymorphic_base") {`
	`636`	`+ else if (name == "polymorphic_base") {`
`636`	`637`	`polymorphic_base( rtype );`
`637`	`638`	`}`
`638`		`- else if (meta->to_string() == "ordered") {`
	`639`	`+ else if (name == "ordered") {`
`639`	`640`	`ordered( rtype );`
`640`	`641`	`}`
`641`		`- else if (meta->to_string() == "weakly_ordered") {`
	`642`	`+ else if (name == "weakly_ordered") {`
`642`	`643`	`weakly_ordered( rtype );`
`643`	`644`	`}`
`644`		`- else if (meta->to_string() == "partially_ordered") {`
	`645`	`+ else if (name == "partially_ordered") {`
`645`	`646`	`partially_ordered( rtype );`
`646`	`647`	`}`
`647`		`- else if (meta->to_string() == "copyable") {`
	`648`	`+ else if (name == "copyable") {`
`648`	`649`	`copyable( rtype );`
`649`	`650`	`}`
`650`		`- else if (meta->to_string() == "basic_value") {`
	`651`	`+ else if (name == "basic_value") {`
`651`	`652`	`basic_value( rtype );`
`652`	`653`	`}`
`653`		`- else if (meta->to_string() == "value") {`
	`654`	`+ else if (name == "value") {`
`654`	`655`	`value( rtype );`
`655`	`656`	`}`
`656`		`- else if (meta->to_string() == "weakly_ordered_value") {`
	`657`	`+ else if (name == "weakly_ordered_value") {`
`657`	`658`	`weakly_ordered_value( rtype );`
`658`	`659`	`}`
`659`		`- else if (meta->to_string() == "partially_ordered_value") {`
	`660`	`+ else if (name == "partially_ordered_value") {`
`660`	`661`	`partially_ordered_value( rtype );`
`661`	`662`	`}`
`662`		`- else if (meta->to_string() == "struct") {`
	`663`	`+ else if (name == "struct") {`
`663`	`664`	`cpp2_struct( rtype );`
`664`	`665`	`}`
`665`		`- else if (meta->to_string() == "enum") {`
	`666`	`+ else if (name == "enum") {`
`666`	`667`	`cpp2_enum( rtype );`
`667`	`668`	`}`
`668`		`- else if (meta->to_string() == "flag_enum") {`
	`669`	`+ else if (name == "flag_enum") {`
`669`	`670`	`flag_enum( rtype );`
`670`	`671`	`}`
`671`	`672`	`else {`
`672`		`- error( "(temporary alpha limitation) unrecognized metafunction name '" + meta->to_string() + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );`
	`673`	`+ error( "(temporary alpha limitation) unrecognized metafunction name '" + name + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );`
`673`	`674`	`return false;`
`674`	`675`	`}`
`675`	`676`	`}`
Original file line number	Diff line number	Diff line change
`@@ -962,49 +962,50 @@ auto parser::apply_type_meta_functions( declaration_node& n )`
`962`	`962`	`// For each metafunction, apply it`
`963`	`963`	`for (auto& meta : n.meta_functions)`
`964`	`964`	`{`
`965`		`- rtype.set_meta_function_name( meta->to_string() );`
	`965`	`+ auto name = meta->to_string();`
	`966`	`+ rtype.set_meta_function_name( name );`
`966`	`967`
`967`		`- if (meta->to_string() == "interface") {`
	`968`	`+ if (name == "interface") {`
`968`	`969`	`interface( rtype );`
`969`	`970`	`}`
`970`		`- else if (meta->to_string() == "polymorphic_base") {`
	`971`	`+ else if (name == "polymorphic_base") {`
`971`	`972`	`polymorphic_base( rtype );`
`972`	`973`	`}`
`973`		`- else if (meta->to_string() == "ordered") {`
	`974`	`+ else if (name == "ordered") {`
`974`	`975`	`ordered( rtype );`
`975`	`976`	`}`
`976`		`- else if (meta->to_string() == "weakly_ordered") {`
	`977`	`+ else if (name == "weakly_ordered") {`
`977`	`978`	`weakly_ordered( rtype );`
`978`	`979`	`}`
`979`		`- else if (meta->to_string() == "partially_ordered") {`
	`980`	`+ else if (name == "partially_ordered") {`
`980`	`981`	`partially_ordered( rtype );`
`981`	`982`	`}`
`982`		`- else if (meta->to_string() == "copyable") {`
	`983`	`+ else if (name == "copyable") {`
`983`	`984`	`copyable( rtype );`
`984`	`985`	`}`
`985`		`- else if (meta->to_string() == "basic_value") {`
	`986`	`+ else if (name == "basic_value") {`
`986`	`987`	`basic_value( rtype );`
`987`	`988`	`}`
`988`		`- else if (meta->to_string() == "value") {`
	`989`	`+ else if (name == "value") {`
`989`	`990`	`value( rtype );`
`990`	`991`	`}`
`991`		`- else if (meta->to_string() == "weakly_ordered_value") {`
	`992`	`+ else if (name == "weakly_ordered_value") {`
`992`	`993`	`weakly_ordered_value( rtype );`
`993`	`994`	`}`
`994`		`- else if (meta->to_string() == "partially_ordered_value") {`
	`995`	`+ else if (name == "partially_ordered_value") {`
`995`	`996`	`partially_ordered_value( rtype );`
`996`	`997`	`}`
`997`		`- else if (meta->to_string() == "struct") {`
	`998`	`+ else if (name == "struct") {`
`998`	`999`	`cpp2_struct( rtype );`
`999`	`1000`	`}`
`1000`		`- else if (meta->to_string() == "enum") {`
	`1001`	`+ else if (name == "enum") {`
`1001`	`1002`	`cpp2_enum( rtype );`
`1002`	`1003`	`}`
`1003`		`- else if (meta->to_string() == "flag_enum") {`
	`1004`	`+ else if (name == "flag_enum") {`
`1004`	`1005`	`flag_enum( rtype );`
`1005`	`1006`	`}`
`1006`	`1007`	`else {`
`1007`		`- error( "(temporary alpha limitation) unrecognized metafunction name '" + meta->to_string() + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );`
	`1008`	`+ error( "(temporary alpha limitation) unrecognized metafunction name '" + name + "' - currently the supported names are: interface, polymorphic_base, ordered, weakly_ordered, partially_ordered, copyable, basic_value, value, weakly_ordered_value, partially_ordered_value, struct, enum, flag_enum" );`
`1008`	`1009`	`return false;`
`1009`	`1010`	`}`
`1010`	`1011`	`}`