├── .github
├── FUNDING.yml
└── workflows
│ └── rust.yml
├── .gitignore
├── .vscode
└── settings.json
├── Cargo.toml
├── LICENSE-APACHE
├── LICENSE-MIT
├── README.md
├── examples
└── app.rs
└── src
├── lib.rs
└── task
├── context.rs
├── from_fn.rs
├── mod.rs
├── provider.rs
└── then.rs
/.github/FUNDING.yml:
--------------------------------------------------------------------------------
1 | github: matthunz
2 |
--------------------------------------------------------------------------------
/.github/workflows/rust.yml:
--------------------------------------------------------------------------------
1 | name: Rust
2 |
3 | on:
4 | push:
5 | branches: [ "main" ]
6 | pull_request:
7 | branches: [ "main" ]
8 |
9 | env:
10 | CARGO_TERM_COLOR: always
11 |
12 | jobs:
13 | build:
14 | runs-on: ubuntu-latest
15 | steps:
16 | - uses: actions/checkout@v3
17 | - run: rustup toolchain install nightly --profile minimal
18 | - name: Build core features
19 | run: cargo +nightly build --verbose
20 | - name: Build all features
21 | run: cargo +nightly build --verbose --features full
22 | - name: Run tests
23 | run: cargo +nightly test --verbose --features full
24 |
--------------------------------------------------------------------------------
/.gitignore:
--------------------------------------------------------------------------------
1 | target
2 | Cargo.lock
3 | dist/
4 |
--------------------------------------------------------------------------------
/.vscode/settings.json:
--------------------------------------------------------------------------------
1 | {
2 | "rust-analyzer.cargo.features": [
3 | "full"
4 | ],
5 | }
--------------------------------------------------------------------------------
/Cargo.toml:
--------------------------------------------------------------------------------
1 | [package]
2 | name = "concoct"
3 | version = "0.19.0-alpha.3"
4 | edition = "2021"
5 | license = "MIT OR Apache-2.0"
6 | description = "Cross-platform UI framework"
7 | repository = "https://github.com/concoct-rs/concoct"
8 |
9 | [features]
10 | full = ["tracing"]
11 |
12 | [dependencies]
13 | futures = { version = "0.3.30", default-features = false }
14 | hashbrown = { version = "0.14.3" }
15 | tracing = { version = "0.1.40", optional = true }
16 |
17 | [package.metadata.docs.rs]
18 | features = ["full"]
19 | rustdoc-args = ["--cfg", "docsrs"]
20 |
--------------------------------------------------------------------------------
/LICENSE-APACHE:
--------------------------------------------------------------------------------
1 | Apache License
2 | Version 2.0, January 2004
3 | http://www.apache.org/licenses/
4 |
5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6 |
7 | 1. Definitions.
8 |
9 | "License" shall mean the terms and conditions for use, reproduction,
10 | and distribution as defined by Sections 1 through 9 of this document.
11 |
12 | "Licensor" shall mean the copyright owner or entity authorized by
13 | the copyright owner that is granting the License.
14 |
15 | "Legal Entity" shall mean the union of the acting entity and all
16 | other entities that control, are controlled by, or are under common
17 | control with that entity. For the purposes of this definition,
18 | "control" means (i) the power, direct or indirect, to cause the
19 | direction or management of such entity, whether by contract or
20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the
21 | outstanding shares, or (iii) beneficial ownership of such entity.
22 |
23 | "You" (or "Your") shall mean an individual or Legal Entity
24 | exercising permissions granted by this License.
25 |
26 | "Source" form shall mean the preferred form for making modifications,
27 | including but not limited to software source code, documentation
28 | source, and configuration files.
29 |
30 | "Object" form shall mean any form resulting from mechanical
31 | transformation or translation of a Source form, including but
32 | not limited to compiled object code, generated documentation,
33 | and conversions to other media types.
34 |
35 | "Work" shall mean the work of authorship, whether in Source or
36 | Object form, made available under the License, as indicated by a
37 | copyright notice that is included in or attached to the work
38 | (an example is provided in the Appendix below).
39 |
40 | "Derivative Works" shall mean any work, whether in Source or Object
41 | form, that is based on (or derived from) the Work and for which the
42 | editorial revisions, annotations, elaborations, or other modifications
43 | represent, as a whole, an original work of authorship. For the purposes
44 | of this License, Derivative Works shall not include works that remain
45 | separable from, or merely link (or bind by name) to the interfaces of,
46 | the Work and Derivative Works thereof.
47 |
48 | "Contribution" shall mean any work of authorship, including
49 | the original version of the Work and any modifications or additions
50 | to that Work or Derivative Works thereof, that is intentionally
51 | submitted to Licensor for inclusion in the Work by the copyright owner
52 | or by an individual or Legal Entity authorized to submit on behalf of
53 | the copyright owner. For the purposes of this definition, "submitted"
54 | means any form of electronic, verbal, or written communication sent
55 | to the Licensor or its representatives, including but not limited to
56 | communication on electronic mailing lists, source code control systems,
57 | and issue tracking systems that are managed by, or on behalf of, the
58 | Licensor for the purpose of discussing and improving the Work, but
59 | excluding communication that is conspicuously marked or otherwise
60 | designated in writing by the copyright owner as "Not a Contribution."
61 |
62 | "Contributor" shall mean Licensor and any individual or Legal Entity
63 | on behalf of whom a Contribution has been received by Licensor and
64 | subsequently incorporated within the Work.
65 |
66 | 2. Grant of Copyright License. Subject to the terms and conditions of
67 | this License, each Contributor hereby grants to You a perpetual,
68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69 | copyright license to reproduce, prepare Derivative Works of,
70 | publicly display, publicly perform, sublicense, and distribute the
71 | Work and such Derivative Works in Source or Object form.
72 |
73 | 3. Grant of Patent License. Subject to the terms and conditions of
74 | this License, each Contributor hereby grants to You a perpetual,
75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76 | (except as stated in this section) patent license to make, have made,
77 | use, offer to sell, sell, import, and otherwise transfer the Work,
78 | where such license applies only to those patent claims licensable
79 | by such Contributor that are necessarily infringed by their
80 | Contribution(s) alone or by combination of their Contribution(s)
81 | with the Work to which such Contribution(s) was submitted. If You
82 | institute patent litigation against any entity (including a
83 | cross-claim or counterclaim in a lawsuit) alleging that the Work
84 | or a Contribution incorporated within the Work constitutes direct
85 | or contributory patent infringement, then any patent licenses
86 | granted to You under this License for that Work shall terminate
87 | as of the date such litigation is filed.
88 |
89 | 4. Redistribution. You may reproduce and distribute copies of the
90 | Work or Derivative Works thereof in any medium, with or without
91 | modifications, and in Source or Object form, provided that You
92 | meet the following conditions:
93 |
94 | (a) You must give any other recipients of the Work or
95 | Derivative Works a copy of this License; and
96 |
97 | (b) You must cause any modified files to carry prominent notices
98 | stating that You changed the files; and
99 |
100 | (c) You must retain, in the Source form of any Derivative Works
101 | that You distribute, all copyright, patent, trademark, and
102 | attribution notices from the Source form of the Work,
103 | excluding those notices that do not pertain to any part of
104 | the Derivative Works; and
105 |
106 | (d) If the Work includes a "NOTICE" text file as part of its
107 | distribution, then any Derivative Works that You distribute must
108 | include a readable copy of the attribution notices contained
109 | within such NOTICE file, excluding those notices that do not
110 | pertain to any part of the Derivative Works, in at least one
111 | of the following places: within a NOTICE text file distributed
112 | as part of the Derivative Works; within the Source form or
113 | documentation, if provided along with the Derivative Works; or,
114 | within a display generated by the Derivative Works, if and
115 | wherever such third-party notices normally appear. The contents
116 | of the NOTICE file are for informational purposes only and
117 | do not modify the License. You may add Your own attribution
118 | notices within Derivative Works that You distribute, alongside
119 | or as an addendum to the NOTICE text from the Work, provided
120 | that such additional attribution notices cannot be construed
121 | as modifying the License.
122 |
123 | You may add Your own copyright statement to Your modifications and
124 | may provide additional or different license terms and conditions
125 | for use, reproduction, or distribution of Your modifications, or
126 | for any such Derivative Works as a whole, provided Your use,
127 | reproduction, and distribution of the Work otherwise complies with
128 | the conditions stated in this License.
129 |
130 | 5. Submission of Contributions. Unless You explicitly state otherwise,
131 | any Contribution intentionally submitted for inclusion in the Work
132 | by You to the Licensor shall be under the terms and conditions of
133 | this License, without any additional terms or conditions.
134 | Notwithstanding the above, nothing herein shall supersede or modify
135 | the terms of any separate license agreement you may have executed
136 | with Licensor regarding such Contributions.
137 |
138 | 6. Trademarks. This License does not grant permission to use the trade
139 | names, trademarks, service marks, or product names of the Licensor,
140 | except as required for reasonable and customary use in describing the
141 | origin of the Work and reproducing the content of the NOTICE file.
142 |
143 | 7. Disclaimer of Warranty. Unless required by applicable law or
144 | agreed to in writing, Licensor provides the Work (and each
145 | Contributor provides its Contributions) on an "AS IS" BASIS,
146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147 | implied, including, without limitation, any warranties or conditions
148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149 | PARTICULAR PURPOSE. You are solely responsible for determining the
150 | appropriateness of using or redistributing the Work and assume any
151 | risks associated with Your exercise of permissions under this License.
152 |
153 | 8. Limitation of Liability. In no event and under no legal theory,
154 | whether in tort (including negligence), contract, or otherwise,
155 | unless required by applicable law (such as deliberate and grossly
156 | negligent acts) or agreed to in writing, shall any Contributor be
157 | liable to You for damages, including any direct, indirect, special,
158 | incidental, or consequential damages of any character arising as a
159 | result of this License or out of the use or inability to use the
160 | Work (including but not limited to damages for loss of goodwill,
161 | work stoppage, computer failure or malfunction, or any and all
162 | other commercial damages or losses), even if such Contributor
163 | has been advised of the possibility of such damages.
164 |
165 | 9. Accepting Warranty or Additional Liability. While redistributing
166 | the Work or Derivative Works thereof, You may choose to offer,
167 | and charge a fee for, acceptance of support, warranty, indemnity,
168 | or other liability obligations and/or rights consistent with this
169 | License. However, in accepting such obligations, You may act only
170 | on Your own behalf and on Your sole responsibility, not on behalf
171 | of any other Contributor, and only if You agree to indemnify,
172 | defend, and hold each Contributor harmless for any liability
173 | incurred by, or claims asserted against, such Contributor by reason
174 | of your accepting any such warranty or additional liability.
175 |
176 | END OF TERMS AND CONDITIONS
177 |
178 | APPENDIX: How to apply the Apache License to your work.
179 |
180 | To apply the Apache License to your work, attach the following
181 | boilerplate notice, with the fields enclosed by brackets "[]"
182 | replaced with your own identifying information. (Don't include
183 | the brackets!) The text should be enclosed in the appropriate
184 | comment syntax for the file format. We also recommend that a
185 | file or class name and description of purpose be included on the
186 | same "printed page" as the copyright notice for easier
187 | identification within third-party archives.
188 |
189 | Copyright [yyyy] [name of copyright owner]
190 |
191 | Licensed under the Apache License, Version 2.0 (the "License");
192 | you may not use this file except in compliance with the License.
193 | You may obtain a copy of the License at
194 |
195 | http://www.apache.org/licenses/LICENSE-2.0
196 |
197 | Unless required by applicable law or agreed to in writing, software
198 | distributed under the License is distributed on an "AS IS" BASIS,
199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200 | See the License for the specific language governing permissions and
201 | limitations under the License.
202 |
--------------------------------------------------------------------------------
/LICENSE-MIT:
--------------------------------------------------------------------------------
1 | MIT License
2 |
3 | Copyright (c) 2023 concoct
4 |
5 | Permission is hereby granted, free of charge, to any person obtaining a copy
6 | of this software and associated documentation files (the "Software"), to deal
7 | in the Software without restriction, including without limitation the rights
8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 | copies of the Software, and to permit persons to whom the Software is
10 | furnished to do so, subject to the following conditions:
11 |
12 | The above copyright notice and this permission notice shall be included in all
13 | copies or substantial portions of the Software.
14 |
15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21 | SOFTWARE.
22 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 |
17 |
18 |
19 |
20 | Concoct is a reactive runtime for embedded systems.
21 |
22 | ```rust
23 | use concoct::{
24 | task::{self, Task},
25 | System,
26 | };
27 |
28 | fn app(_count: &mut i32) -> impl Task {
29 | task::from_fn(|_| dbg!("Hello World!"))
30 | }
31 |
32 | fn main() {
33 | let mut system = System::new(0, app);
34 | system.build();
35 | system.rebuild();
36 | }
37 | ```
38 |
39 | ## Goals
40 | This crate is intended to provide a generic reactive system for a wide range of use cases. It was originally intended for user-interfaces, and is inspired by [xilem](https://github.com/linebender/xilem). However, I noticed the system being created was better suited for robotics or animation (where continous systems are more common than discrete ones).
41 |
--------------------------------------------------------------------------------
/examples/app.rs:
--------------------------------------------------------------------------------
1 | use concoct::{
2 | task::{self, Task},
3 | System,
4 | };
5 |
6 | fn app(_count: &mut i32) -> impl Task {
7 | task::from_fn(|_| dbg!("Hello World!"))
8 | }
9 |
10 | fn main() {
11 | let mut system = System::new(0, app);
12 | system.build();
13 | system.rebuild();
14 | }
15 |
--------------------------------------------------------------------------------
/src/lib.rs:
--------------------------------------------------------------------------------
1 | #![no_std]
2 |
3 | extern crate alloc;
4 |
5 | use alloc::{collections::VecDeque, rc::Rc};
6 | use core::{
7 | cell::RefCell,
8 | task::{Poll, Waker},
9 | };
10 | use hashbrown::HashMap;
11 | use task::{Scope, Task};
12 |
13 | pub mod task;
14 |
15 | struct Queue {
16 | events: VecDeque Option<()>>>,
17 | waker: Option,
18 | }
19 |
20 | pub struct System {
21 | pub model: M,
22 | make_task: F,
23 | state: Option,
24 | cx: Scope,
25 | queue: Rc>>,
26 | }
27 |
28 | impl System {
29 | pub fn new(model: M, make_task: F) -> Self {
30 | let queue = Rc::new(RefCell::new(Queue {
31 | events: VecDeque::new(),
32 | waker: None,
33 | }));
34 |
35 | Self {
36 | model,
37 | make_task,
38 | state: None,
39 | queue: queue.clone(),
40 | cx: Scope {
41 | waker: Rc::new(move |f| {
42 | let mut q = queue.borrow_mut();
43 | q.events.push_back(f);
44 | if let Some(waker) = q.waker.take() {
45 | waker.wake();
46 | }
47 | }),
48 | contexts: RefCell::new(HashMap::new()),
49 | },
50 | }
51 | }
52 |
53 | pub fn build(&mut self) -> T::Output
54 | where
55 | F: FnMut(&mut M) -> T,
56 | T: Task,
57 | {
58 | let mut task = (self.make_task)(&mut self.model);
59 | let (output, state) = task.build(&self.cx, &mut self.model);
60 | self.state = Some(state);
61 | output
62 | }
63 |
64 | pub fn rebuild(&mut self) -> T::Output
65 | where
66 | F: FnMut(&mut M) -> T,
67 | T: Task,
68 | {
69 | let mut task = (self.make_task)(&mut self.model);
70 | task.rebuild(&self.cx, &mut self.model, self.state.as_mut().unwrap())
71 | }
72 |
73 | pub async fn update(&mut self) {
74 | futures::future::poll_fn(|cx| {
75 | let mut queue = self.queue.borrow_mut();
76 | let mut is_ready = false;
77 | while let Some(update) = queue.events.pop_front() {
78 | update(&mut self.model);
79 | is_ready = true;
80 | }
81 | if is_ready {
82 | Poll::Ready(())
83 | } else {
84 | queue.waker = Some(cx.waker().clone());
85 | Poll::Pending
86 | }
87 | })
88 | .await
89 | }
90 | }
91 |
--------------------------------------------------------------------------------
/src/task/context.rs:
--------------------------------------------------------------------------------
1 | use super::Task;
2 | use alloc::rc::Rc;
3 | use core::{any::TypeId, marker::PhantomData};
4 |
5 | pub fn context() -> Context {
6 | Context {
7 | _marker: PhantomData,
8 | }
9 | }
10 |
11 | pub struct Context {
12 | _marker: PhantomData,
13 | }
14 |
15 | impl Task for Context {
16 | type Output = Rc;
17 |
18 | type State = ();
19 |
20 | fn build(&mut self, cx: &super::Scope, _model: &mut M) -> (Self::Output, Self::State) {
21 | let rc = cx
22 | .contexts
23 | .borrow()
24 | .get(&TypeId::of::())
25 | .unwrap()
26 | .clone();
27 | let output = Rc::downcast(rc).unwrap();
28 | (output, ())
29 | }
30 |
31 | fn rebuild(
32 | &mut self,
33 | cx: &super::Scope,
34 | _model: &mut M,
35 | _state: &mut Self::State,
36 | ) -> Self::Output {
37 | let rc = cx
38 | .contexts
39 | .borrow()
40 | .get(&TypeId::of::())
41 | .unwrap()
42 | .clone();
43 | let output = Rc::downcast(rc).unwrap();
44 | output
45 | }
46 | }
47 |
--------------------------------------------------------------------------------
/src/task/from_fn.rs:
--------------------------------------------------------------------------------
1 | use super::Task;
2 | use core::marker::PhantomData;
3 |
4 | pub fn from_fn(f: F) -> FromFn
5 | where
6 | F: FnMut(&mut M) -> O,
7 | {
8 | FromFn {
9 | f,
10 | _marker: PhantomData,
11 | }
12 | }
13 |
14 | pub struct FromFn {
15 | f: F,
16 | _marker: PhantomData,
17 | }
18 |
19 | impl Task for FromFn
20 | where
21 | F: FnMut(&mut M) -> O,
22 | {
23 | type Output = O;
24 |
25 | type State = ();
26 |
27 | fn build(&mut self, _cx: &super::Scope, model: &mut M) -> (Self::Output, Self::State) {
28 | ((self.f)(model), ())
29 | }
30 |
31 | fn rebuild(
32 | &mut self,
33 | _cx: &super::Scope,
34 | model: &mut M,
35 | _state: &mut Self::State,
36 | ) -> Self::Output {
37 | (self.f)(model)
38 | }
39 | }
40 |
--------------------------------------------------------------------------------
/src/task/mod.rs:
--------------------------------------------------------------------------------
1 | use alloc::rc::Rc;
2 | use core::any::{Any, TypeId};
3 | use core::cell::RefCell;
4 | use hashbrown::HashMap;
5 |
6 | mod context;
7 | pub use self::context::{context, Context};
8 |
9 | mod from_fn;
10 | pub use self::from_fn::{from_fn, FromFn};
11 |
12 | mod provider;
13 | pub use self::provider::{provider, Provider};
14 |
15 | mod then;
16 | pub use self::then::Then;
17 |
18 | pub struct Scope {
19 | pub(crate) waker: Rc Option>)>,
20 | pub(crate) contexts: RefCell>>,
21 | }
22 |
23 | impl Scope {
24 | pub fn update(&self, f: impl Fn(&mut M) -> Option + 'static) {
25 | (self.waker)(Rc::new(f))
26 | }
27 | }
28 |
29 | pub trait Task {
30 | type Output;
31 |
32 | type State;
33 |
34 | fn build(&mut self, cx: &Scope, model: &mut M) -> (Self::Output, Self::State);
35 |
36 | fn rebuild(&mut self, cx: &Scope, model: &mut M, state: &mut Self::State)
37 | -> Self::Output;
38 |
39 | fn then(self, f: F) -> Then
40 | where
41 | Self: Sized + 'static,
42 | F: FnMut(&mut M, Self::Output) -> T + 'static,
43 | T: Task + 'static,
44 | M: 'static,
45 | {
46 | Then::new(self, f)
47 | }
48 | }
49 |
50 | impl Task for () {
51 | type Output = ();
52 |
53 | type State = ();
54 |
55 | fn build(&mut self, _cx: &Scope, _model: &mut M) -> (Self::Output, Self::State) {
56 | ((), ())
57 | }
58 |
59 | fn rebuild(
60 | &mut self,
61 | _cx: &Scope,
62 | _model: &mut M,
63 | _state: &mut Self::State,
64 | ) -> Self::Output {
65 | }
66 | }
67 |
--------------------------------------------------------------------------------
/src/task/provider.rs:
--------------------------------------------------------------------------------
1 | use super::Task;
2 | use alloc::rc::Rc;
3 | use core::any::TypeId;
4 |
5 | pub fn provider(value: T) -> Provider {
6 | Provider {
7 | value: Rc::new(value),
8 | }
9 | }
10 |
11 | pub struct Provider {
12 | value: Rc,
13 | }
14 |
15 | impl Task for Provider {
16 | type Output = Rc;
17 |
18 | type State = ();
19 |
20 | fn build(&mut self, cx: &super::Scope, _model: &mut M) -> (Self::Output, Self::State) {
21 | cx.contexts
22 | .borrow_mut()
23 | .insert(TypeId::of::(), self.value.clone());
24 | (self.value.clone(), ())
25 | }
26 |
27 | fn rebuild(
28 | &mut self,
29 | cx: &super::Scope,
30 | _model: &mut M,
31 | _state: &mut Self::State,
32 | ) -> Self::Output {
33 | cx.contexts
34 | .borrow_mut()
35 | .insert(TypeId::of::(), self.value.clone());
36 | self.value.clone()
37 | }
38 | }
39 |
--------------------------------------------------------------------------------
/src/task/then.rs:
--------------------------------------------------------------------------------
1 | use super::{Scope, Task};
2 | use core::marker::PhantomData;
3 |
4 | pub struct Then {
5 | task: T1,
6 | f: F,
7 | _marker: PhantomData<(T2, M)>,
8 | }
9 |
10 | impl Then {
11 | pub(super) fn new(task: T1, f: F) -> Self {
12 | Self {
13 | task,
14 | f,
15 | _marker: PhantomData,
16 | }
17 | }
18 | }
19 |
20 | impl Task for Then
21 | where
22 | T1: Task + 'static,
23 | F: FnMut(&mut M, T1::Output) -> T2 + 'static,
24 | T2: Task + 'static,
25 | M: 'static,
26 | {
27 | type Output = T2::Output;
28 |
29 | type State = (T1::State, T2::State);
30 |
31 | fn build(&mut self, cx: &Scope, model: &mut M) -> (Self::Output, Self::State) {
32 | let (output, state) = self.task.build(cx, model);
33 | let mut next = (self.f)(model, output);
34 | let (next_output, next_state) = next.build(cx, model);
35 | (next_output, (state, next_state))
36 | }
37 |
38 | fn rebuild(
39 | &mut self,
40 | cx: &Scope,
41 | model: &mut M,
42 | state: &mut Self::State,
43 | ) -> Self::Output {
44 | let output = self.task.rebuild(cx, model, &mut state.0);
45 | let mut next = (self.f)(model, output);
46 | next.rebuild(cx, model, &mut state.1)
47 | }
48 | }
49 |
--------------------------------------------------------------------------------
7 |
8 |
9 | 
11 |
12 |
13 | 
15 |
16 |