Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
6af5757d
Commit
6af5757d
authored
Nov 06, 2019
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ambiguous operator(), drop unused actor system
parent
d15392b5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
16 deletions
+25
-16
doc/cmake/caf-generate-rst.cpp
doc/cmake/caf-generate-rst.cpp
+25
-16
No files found.
doc/cmake/caf-generate-rst.cpp
View file @
6af5757d
...
@@ -726,6 +726,7 @@ public:
...
@@ -726,6 +726,7 @@ public:
current_node_
=
nullptr
;
current_node_
=
nullptr
;
}
}
protected:
template
<
class
T
,
class
...
Ts
>
template
<
class
T
,
class
...
Ts
>
void
epsilon
(
const
std
::
unique_ptr
<
T
>&
target
,
Ts
&&
...
xs
)
{
void
epsilon
(
const
std
::
unique_ptr
<
T
>&
target
,
Ts
&&
...
xs
)
{
auto
&
st
=
target
->
parent
()
->
state
;
auto
&
st
=
target
->
parent
()
->
state
;
...
@@ -737,7 +738,7 @@ public:
...
@@ -737,7 +738,7 @@ public:
}
}
template
<
class
T
>
template
<
class
T
>
void
operator
()
(
T
&
)
{
void
unexpected
(
T
&
)
{
auto
cstr
=
type_name
<
T
>::
value
;
auto
cstr
=
type_name
<
T
>::
value
;
parse_failure
::
raise
(
dref
().
name
(),
"unexpected command: "
,
cstr
);
parse_failure
::
raise
(
dref
().
name
(),
"unexpected command: "
,
cstr
);
}
}
...
@@ -812,7 +813,6 @@ void rst_writer_state::exit() {
...
@@ -812,7 +813,6 @@ void rst_writer_state::exit() {
using super = rst_writer_state_base<rst_writer::type##_state>; \
using super = rst_writer_state_base<rst_writer::type##_state>; \
type##_state(rst_writer* parent) : super(parent) { \
type##_state(rst_writer* parent) : super(parent) { \
} \
} \
using super::operator(); \
const char* name() const noexcept override { \
const char* name() const noexcept override { \
return #type; \
return #type; \
}
}
...
@@ -834,6 +834,11 @@ BEGIN_STATE(await_section)
...
@@ -834,6 +834,11 @@ BEGIN_STATE(await_section)
transition
(
parent_
->
await_section_label
,
x
.
name
,
'='
);
transition
(
parent_
->
await_section_label
,
x
.
name
,
'='
);
}
}
template
<
class
T
>
void
operator
()(
T
&
x
)
{
unexpected
(
x
);
}
END_STATE
(
await_section
)
END_STATE
(
await_section
)
BEGIN_STATE
(
await_section_label
)
BEGIN_STATE
(
await_section_label
)
...
@@ -997,7 +1002,7 @@ BEGIN_STATE(read_body)
...
@@ -997,7 +1002,7 @@ BEGIN_STATE(read_body)
template
<
class
T
>
template
<
class
T
>
detail
::
enable_if_t
<!
is_inline
<
T
>::
value
>
operator
()(
T
&
x
)
{
detail
::
enable_if_t
<!
is_inline
<
T
>::
value
>
operator
()(
T
&
x
)
{
super
::
operator
()
(
x
);
unexpected
(
x
);
}
}
void
operator
()(
subsection
&
x
)
{
void
operator
()(
subsection
&
x
)
{
...
@@ -1188,8 +1193,6 @@ struct config : actor_system_config {
...
@@ -1188,8 +1193,6 @@ struct config : actor_system_config {
.
add
(
input
,
"input,i"
,
"input .tex file"
)
.
add
(
input
,
"input,i"
,
"input .tex file"
)
.
add
(
output
,
"output,o"
,
"output .rst file"
)
.
add
(
output
,
"output,o"
,
"output .rst file"
)
.
add
(
project_root
,
"project-root,r"
,
"project root for C++ examples"
);
.
add
(
project_root
,
"project-root,r"
,
"project root for C++ examples"
);
set
(
"logger.verbosity"
,
atom
(
"quiet"
));
set
(
"scheduler.max-threads"
,
1
);
}
}
std
::
string
input
;
std
::
string
input
;
...
@@ -1197,16 +1200,26 @@ struct config : actor_system_config {
...
@@ -1197,16 +1200,26 @@ struct config : actor_system_config {
std
::
string
project_root
;
std
::
string
project_root
;
};
};
void
caf_main
(
actor_system
&
,
const
config
&
cfg
)
{
}
// namespace
int
main
(
int
argc
,
char
**
argv
)
{
// Read CAF configuration.
config
cfg
;
if
(
auto
err
=
cfg
.
parse
(
argc
,
argv
))
{
std
::
cerr
<<
"unable to parse CAF config: "
<<
cfg
.
render
(
err
)
<<
'\n'
;
return
EXIT_FAILURE
;
}
if
(
cfg
.
cli_helptext_printed
)
return
EXIT_SUCCESS
;
if
(
cfg
.
input
.
empty
()
||
cfg
.
output
.
empty
())
{
if
(
cfg
.
input
.
empty
()
||
cfg
.
output
.
empty
())
{
std
::
cerr
<<
"input or output path missing
\n
"
;
std
::
cerr
<<
"input or output path missing
\n
"
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
}
rst_writer
consumer
;
rst_writer
consumer
;
consumer
.
out
.
open
(
cfg
.
output
);
consumer
.
out
.
open
(
cfg
.
output
);
if
(
!
consumer
.
out
)
{
if
(
!
consumer
.
out
)
{
std
::
cerr
<<
"unable to open output file: "
<<
cfg
.
output
<<
'\n'
;
std
::
cerr
<<
"unable to open output file: "
<<
cfg
.
output
<<
'\n'
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
}
consumer
.
project_root
=
cfg
.
project_root
;
consumer
.
project_root
=
cfg
.
project_root
;
std
::
ifstream
input
{
cfg
.
input
};
std
::
ifstream
input
{
cfg
.
input
};
...
@@ -1216,23 +1229,19 @@ void caf_main(actor_system&, const config& cfg) {
...
@@ -1216,23 +1229,19 @@ void caf_main(actor_system&, const config& cfg) {
if
(
res
.
i
!=
res
.
e
)
{
if
(
res
.
i
!=
res
.
e
)
{
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
<<
": "
<<
to_string
(
res
.
code
)
<<
'\n'
;
<<
": "
<<
to_string
(
res
.
code
)
<<
'\n'
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
}
}
catch
(
parse_failure
&
x
)
{
}
catch
(
parse_failure
&
x
)
{
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
<<
" while in state "
<<
x
.
state_name
<<
": "
<<
x
.
what
()
<<
'\n'
;
<<
" while in state "
<<
x
.
state_name
<<
": "
<<
x
.
what
()
<<
'\n'
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
catch
(
std
::
exception
&
x
)
{
}
catch
(
std
::
exception
&
x
)
{
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
std
::
cerr
<<
"error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
<<
": "
<<
x
.
what
()
<<
'\n'
;
<<
": "
<<
x
.
what
()
<<
'\n'
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
catch
(...)
{
}
catch
(...)
{
std
::
cerr
<<
"unknown error in line "
<<
res
.
line
<<
" on column "
std
::
cerr
<<
"unknown error in line "
<<
res
.
line
<<
" on column "
<<
res
.
column
<<
'\n'
;
<<
res
.
column
<<
'\n'
;
exit
(
EXIT_FAILURE
)
;
return
EXIT_FAILURE
;
}
}
}
}
}
// namespace
CAF_MAIN
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment