Skip to content

Commit 82f6621

Browse files
ColinHColinH
committed
Small fixes.
1 parent 7322fc2 commit 82f6621

12 files changed

+15
-19
lines changed

‎include/tao/config/internal/config_parser.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ namespace tao::config::internal
2828
{
2929
config_parser()
3030
: fm( { { "binary", wrap( binary_function ) },
31-
// { "cbor", wrap( cbor_function ) },
3231
{ "default", wrap( default_function ) },
3332
{ "env", wrap( env_function ) },
3433
{ "env?", wrap( env_if_function ) },
3534
{ "jaxn", wrap( jaxn_function ) },
36-
// { "json", wrap( json_function ) },
37-
// { "msgpack", wrap( msgpack_function ) },
3835
{ "read", wrap( read_function ) },
3936
{ "shell", wrap( shell_function ) },
4037
{ "split", wrap( split_function ) },
4138
{ "string", wrap( string_function ) } } )
42-
//{ "ubjson", wrap( ubjson_function ) } } )
4339
{}
4440

4541
config_parser( config_parser&& ) = delete;

‎include/tao/config/internal/debug_traits.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace tao::config::internal
118118
template< template< typename... > class Traits, typename Consumer >
119119
static void produce( Consumer& c, const part_asterisk_t /*unused*/ )
120120
{
121-
c.string( "star" );
121+
c.string( "asterisk" );
122122
}
123123
};
124124

@@ -138,7 +138,7 @@ namespace tao::config::internal
138138
c.string( "index" );
139139
return;
140140
case key1_kind::asterisk:
141-
c.string( "star" );
141+
c.string( "asterisk" );
142142
return;
143143
case key1_kind::append:
144144
c.string( "append" );

‎include/tao/config/internal/key1_action.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace tao::config::internal
4242
};
4343

4444
template<>
45-
struct key1_action< rules::star >
45+
struct key1_action< rules::asterisk >
4646
{
4747
template< typename Input >
4848
static void apply( const Input& in, std::vector< key1_part >& st )

‎include/tao/config/internal/key1_grammar.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
namespace tao::config::internal::rules
1111
{
1212
// clang-format off
13-
struct star : pegtl::one< '*' > {};
13+
struct asterisk : pegtl::one< '*' > {};
1414

15-
struct key1_part : pegtl::sor< ident, quoted, index, star > {};
15+
struct key1_part : pegtl::sor< ident, quoted, index, asterisk > {};
1616
struct key1_rule : pegtl::list_must< key1_part, dot > {};
1717
// clang-format on
1818

‎include/tao/config/internal/key1_part.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define TAO_CONFIG_INTERNAL_KEY1_PART_HPP
66

77
#include <cassert>
8-
#include <cstdint>
98
#include <cstddef>
9+
#include <cstdint>
1010
#include <memory>
1111
#include <string>
1212
#include <variant>

‎include/tao/config/internal/phase1_append.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace tao::config::internal
7070
case entry_kind::OBJECT:
7171
throw pegtl::parse_error( "cannot index (across) object", p );
7272
case entry_kind::ASTERISK:
73-
throw pegtl::parse_error( "cannot index (across) star", p );
73+
throw pegtl::parse_error( "cannot index (across) asterisk", p );
7474
case entry_kind::REFERENCE:
7575
throw pegtl::parse_error( "cannot index (across) reference", p );
7676
}

‎include/tao/config/internal/phase2_access.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ namespace tao::config::internal
105105
if( down >= 0 ) {
106106
return nullptr;
107107
}
108-
throw pegtl::parse_error( "cannot index (across) star", p );
108+
throw pegtl::parse_error( "cannot index (across) asterisk", p );
109109
case entry_kind::REFERENCE:
110110
throw pegtl::parse_error( "cannot index (across) reference", p );
111111
}
@@ -116,7 +116,7 @@ namespace tao::config::internal
116116
{
117117
switch( p.kind() ) {
118118
case key1_kind::asterisk:
119-
throw pegtl::parse_error( "unable to access star", p.position );
119+
throw pegtl::parse_error( "unable to access asterisk", p.position );
120120
case key1_kind::name:
121121
return phase2_access_name( c, p.position, p.get_name(), suffix, down );
122122
case key1_kind::index:

‎include/tao/config/internal/phase2_additions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace tao::config::internal
6767
break;
6868
}
6969
}
70-
else { // r->kind() == entry_kind::UNSIGNED
70+
else { // r->kind() == entry_kind::UNSIGNED
7171
if( l->kind() == entry_kind::UNSIGNED ) {
7272
r->get_unsigned_atom().value += l->get_unsigned();
7373
break;

‎include/tao/config/internal/phase2_asterisks.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ namespace tao::config::internal
102102
continue;
103103
case entry_kind::ARRAY:
104104
if( !j->get_array().function.empty() ) {
105-
throw pegtl::parse_error( "please do not use a star inside of a function", j->get_array().position );
105+
throw pegtl::parse_error( "please do not use an asterisk inside of a function", j->get_array().position );
106106
}
107107
process_array_concat_entry( j->get_array(), star );
108108
continue;
@@ -128,7 +128,7 @@ namespace tao::config::internal
128128
continue;
129129
case entry_kind::ARRAY:
130130
if( !j->get_array().function.empty() ) {
131-
throw pegtl::parse_error( "please do not use a star inside of a function", j->get_array().position );
131+
throw pegtl::parse_error( "please do not use an asterisk inside of a function", j->get_array().position );
132132
}
133133
process_concat_entry_array( star, j->get_array() );
134134
continue;

‎include/tao/config/internal/phase2_everything.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define TAO_CONFIG_INTERNAL_PHASE2_EVERYTHING_HPP
66

77
#include "forward.hpp"
8-
#include "phase2_asterisks.hpp"
98
#include "phase2_additions.hpp"
9+
#include "phase2_asterisks.hpp"
1010
#include "phase2_functions.hpp"
1111
#include "phase2_references.hpp"
1212
#include "state.hpp"

‎include/tao/config/internal/phase3_remove.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace tao::config::internal
9292
phase3_remove( e.get_object() );
9393
continue;
9494
case entry_kind::ASTERISK:
95-
throw pegtl::parse_error( "unresolved star", e.get_asterisk().position ); // Can happen when there are also unresolved references.
95+
throw pegtl::parse_error( "unresolved asterisk", e.get_asterisk().position ); // Can happen when there are also unresolved references.
9696
case entry_kind::REFERENCE:
9797
throw pegtl::parse_error( "unresolved reference '" + e.get_reference().to_string() + '\'', e.get_reference().at( 0 ).position );
9898
}

‎include/tao/config/internal/statistics.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#ifndef TAO_CONFIG_INTERNAL_STATISTICS_HPP
55
#define TAO_CONFIG_INTERNAL_STATISTICS_HPP
66

7-
#include <cstdlib>
87
#include <cstddef>
8+
#include <cstdlib>
99

1010
#include "array.hpp"
1111
#include "concat.hpp"

0 commit comments

Comments
 (0)