Skip to content

Commit 4552e37

Browse files
committed
Renamed add_declaration -> add_declaration_to_parent_namespace.
1 parent 674c6ac commit 4552e37

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

source/reflect.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ class type_declaration
429429

430430

431431
#line 528 "reflect.h2"
432-
public: auto add_declaration(cpp2::in<std::string_view> source) & -> void;
432+
public: auto add_declaration_to_parent_namespace(cpp2::in<std::string_view> source) & -> void;
433433

434434

435435
#line 535 "reflect.h2"
@@ -1213,7 +1213,7 @@ declaration::declaration(declaration const& that)
12131213
}
12141214
}
12151215

1216-
auto type_declaration::add_declaration(cpp2::in<std::string_view> source) & -> void
1216+
auto type_declaration::add_declaration_to_parent_namespace(cpp2::in<std::string_view> source) & -> void
12171217
{
12181218
if (!(parse_and_add_declaration(source))) {
12191219
error(std::string("error attempting to add declaration:\n") + source);
@@ -1788,7 +1788,7 @@ auto print(cpp2::in<meta::type_declaration> t) -> void
17881788
#line 1269 "reflect.h2"
17891789
auto maker(meta::type_declaration& t) -> void
17901790
{
1791-
CPP2_UFCS(add_declaration, t, "make_" + cpp2::to_string(CPP2_UFCS_0(name, t)) + ": (args...: _) -> _ = { return " + cpp2::to_string(CPP2_UFCS_0(name, t)) + "(args...); }");
1791+
CPP2_UFCS(add_declaration_to_parent_namespace, t, "make_" + cpp2::to_string(CPP2_UFCS_0(name, t)) + ": (args...: _) -> _ = { return " + cpp2::to_string(CPP2_UFCS_0(name, t)) + "(args...); }");
17921792
}
17931793

17941794
#line 1278 "reflect.h2"
@@ -1797,9 +1797,9 @@ auto generate_binary_expression(meta::type_declaration& t) -> void
17971797

17981798
std::string op_name {CPP2_UFCS(substr, CPP2_UFCS_0(name, t), 8)}; // Skip 'Operator'
17991799

1800-
CPP2_UFCS(add_declaration, t, cpp2::to_string(op_name) + ": <A, B> (arg_a: Expression<A>, arg_b: Expression<B>) -> _ = BinaryExpression<A, B, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(arg_a, arg_b);");
1801-
CPP2_UFCS(add_declaration, t, cpp2::to_string(op_name) + ": <A> (arg_a: Expression<A>, arg_b: double) -> _ = BinaryExpression<A, Constant<double>, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(arg_a, Constant<double>(arg_b));");
1802-
CPP2_UFCS(add_declaration, t, cpp2::to_string(std::move(op_name)) + ": <B> (arg_a: double, arg_b: Expression<B>) -> _ = BinaryExpression<Constant<double>, B, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(Constant<double>(arg_a), arg_b);");
1800+
CPP2_UFCS(add_declaration_to_parent_namespace, t, cpp2::to_string(op_name) + ": <A, B> (arg_a: Expression<A>, arg_b: Expression<B>) -> _ = BinaryExpression<A, B, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(arg_a, arg_b);");
1801+
CPP2_UFCS(add_declaration_to_parent_namespace, t, cpp2::to_string(op_name) + ": <A> (arg_a: Expression<A>, arg_b: double) -> _ = BinaryExpression<A, Constant<double>, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(arg_a, Constant<double>(arg_b));");
1802+
CPP2_UFCS(add_declaration_to_parent_namespace, t, cpp2::to_string(std::move(op_name)) + ": <B> (arg_a: double, arg_b: Expression<B>) -> _ = BinaryExpression<Constant<double>, B, " + cpp2::to_string(CPP2_UFCS_0(name, t)) + ">(Constant<double>(arg_a), arg_b);");
18031803
}
18041804

18051805
#line 1293 "reflect.h2"

source/reflect.h2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ type_declaration: @copyable type =
525525
}
526526
}
527527

528-
add_declaration: (inout this, source: std::string_view)
528+
add_declaration_to_parent_namespace: (inout this, source: std::string_view)
529529
= {
530530
if !parse_and_add_declaration(source) {
531531
error( std::string("error attempting to add declaration:\n") + source );
@@ -1268,7 +1268,7 @@ print: (t: meta::type_declaration) =
12681268
//
12691269
maker: (inout t: meta::type_declaration) =
12701270
{
1271-
t.add_declaration("make_(t.name())$: (args...: _) -> _ = { return (t.name())$(args...); }");
1271+
t.add_declaration_to_parent_namespace("make_(t.name())$: (args...: _) -> _ = { return (t.name())$(args...); }");
12721272
}
12731273

12741274
//-----------------------------------------------------------------------
@@ -1280,9 +1280,9 @@ generate_binary_expression: (inout t: meta::type_declaration) =
12801280

12811281
op_name: std::string = t.name().substr(8); // Skip 'Operator'
12821282

1283-
t.add_declaration("(op_name)$: <A, B> (arg_a: Expression<A>, arg_b: Expression<B>) -> _ = BinaryExpression<A, B, (t.name())$>(arg_a, arg_b);");
1284-
t.add_declaration("(op_name)$: <A> (arg_a: Expression<A>, arg_b: double) -> _ = BinaryExpression<A, Constant<double>, (t.name())$>(arg_a, Constant<double>(arg_b));");
1285-
t.add_declaration("(op_name)$: <B> (arg_a: double, arg_b: Expression<B>) -> _ = BinaryExpression<Constant<double>, B, (t.name())$>(Constant<double>(arg_a), arg_b);");
1283+
t.add_declaration_to_parent_namespace("(op_name)$: <A, B> (arg_a: Expression<A>, arg_b: Expression<B>) -> _ = BinaryExpression<A, B, (t.name())$>(arg_a, arg_b);");
1284+
t.add_declaration_to_parent_namespace("(op_name)$: <A> (arg_a: Expression<A>, arg_b: double) -> _ = BinaryExpression<A, Constant<double>, (t.name())$>(arg_a, Constant<double>(arg_b));");
1285+
t.add_declaration_to_parent_namespace("(op_name)$: <B> (arg_a: double, arg_b: Expression<B>) -> _ = BinaryExpression<Constant<double>, B, (t.name())$>(Constant<double>(arg_a), arg_b);");
12861286
}
12871287

12881288

0 commit comments

Comments
 (0)