From bac38639c3e108e5ddf92b5dfe3fd34d00aa40f5 Mon Sep 17 00:00:00 2001 From: Emil Valeev Date: Sun, 4 Feb 2024 12:04:35 +0600 Subject: [PATCH] refactor(examples) --- examples/3_interfaces/main.neva | 18 +++++++++--------- examples/6_struct_builder/with_sugar/main.neva | 8 ++++---- examples/7_struct_selector/verbose/main.neva | 5 +++-- .../7_struct_selector/with_selectors/main.neva | 4 ++-- std/builtin/base.neva | 1 + std/builtin/bridges.neva | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/examples/3_interfaces/main.neva b/examples/3_interfaces/main.neva index 37c42a1a..19101432 100644 --- a/examples/3_interfaces/main.neva +++ b/examples/3_interfaces/main.neva @@ -2,29 +2,29 @@ // It's essential to understand bridges. interfaces { - IExample(msg T) (msg T) + IExample(data T) (sig T) } components { Main(enter any) (exit any) { nodes { - sub SubComponent { - dep Printer + subNode SecondComponent { + depNode Printer } } net { - in:enter -> sub:msg - sub:msg -> out:exit + in:enter -> subNode:msg + subNode:msg -> out:exit } } - SubComponent (msg any) (msg any) { + SecondComponent (msg any) (msg any) { nodes { - dep IExample + depNode IExample } net { - in:msg -> dep:msg - dep:msg -> out:msg + in:msg -> depNode:data + depNode:sig -> out:msg } } } \ No newline at end of file diff --git a/examples/6_struct_builder/with_sugar/main.neva b/examples/6_struct_builder/with_sugar/main.neva index 4c9a1294..82481ec2 100644 --- a/examples/6_struct_builder/with_sugar/main.neva +++ b/examples/6_struct_builder/with_sugar/main.neva @@ -16,10 +16,10 @@ components { print Print } net { - 32 -> builder.age - 'John' -> builder.name - builder.v -> print.v - print.v -> out:exit + 32 -> builder:age + 'John' -> builder:name + builder:msg -> print:data + print:sig -> out:exit } } } \ No newline at end of file diff --git a/examples/7_struct_selector/verbose/main.neva b/examples/7_struct_selector/verbose/main.neva index bef78f4e..7e9fac9a 100644 --- a/examples/7_struct_selector/verbose/main.neva +++ b/examples/7_struct_selector/verbose/main.neva @@ -13,8 +13,8 @@ types { const { user User { - name: 'john' - pet: { name: 'Charley' } + name: 'John', + pet: { name: 'Charley' }, } path list ['pet', 'name'] } @@ -23,6 +23,7 @@ components { Main(enter any) (exit any) { nodes { printer Printer + #runtime_func_msg(path) selector StructSelector } diff --git a/examples/7_struct_selector/with_selectors/main.neva b/examples/7_struct_selector/with_selectors/main.neva index 49a8d7f2..afffc3f3 100644 --- a/examples/7_struct_selector/with_selectors/main.neva +++ b/examples/7_struct_selector/with_selectors/main.neva @@ -9,7 +9,7 @@ types { } const { - u User { + user User { age: 32 name: 'john' } @@ -22,7 +22,7 @@ components { printer Printer } net { - in:enter -> ($u.pet.name -> printer:msg) + in:enter -> ($user.pet.name -> printer:msg) printer:msg -> out:exit } } diff --git a/std/builtin/base.neva b/std/builtin/base.neva index 1b61b658..a9ebccd1 100644 --- a/std/builtin/base.neva +++ b/std/builtin/base.neva @@ -11,6 +11,7 @@ types { pub list pub stream maybe + pub error struct { text string child maybe diff --git a/std/builtin/bridges.neva b/std/builtin/bridges.neva index 2aed0a63..594c5fab 100644 --- a/std/builtin/bridges.neva +++ b/std/builtin/bridges.neva @@ -2,7 +2,7 @@ // they serve as adapters for stream handlers and outside world: interfaces { - IStreamHandler(seq stream) (res T) + pub IStreamHandler(seq stream) (res T) } components {