Fixed: Parse Errors

This commit is contained in:
TheJoKlLa 2021-08-27 00:28:33 +02:00
parent 6f8889d23d
commit 66bda1eed5
5 changed files with 20 additions and 21 deletions

View File

@ -8,18 +8,17 @@ $CSharp.namespace("FabAccessAPI.Schema");
using General = import "general.capnp"; using General = import "general.capnp";
using Machine = import "machine.capnp".Machine; using Machine = import "machine.capnp".Machine;
using Space = import "space.capnp".Space;
interface MachineSystem interface MachineSystem
{ {
info @0 :Info; info @0 () -> ( info : Info );
interface Info $CSharp.name("InfoInterface") { interface Info $CSharp.name("InfoInterface") {
getMachineList @0 () -> ( machines :List(Machine) ); getMachineList @0 () -> ( machine_list :List(Machine) );
getMachine @1 ( uuid :General.UUID ) -> ( machine :Machine); getMachine @1 ( uuid :General.UUID ) -> ( machine :Machine);
} }
manage @1 :Manage; manage @1 () -> ( manage : Manage );
interface Manage $CSharp.name("ManageInterface") { interface Manage $CSharp.name("ManageInterface") {
addMachine @0 (machine :Machine); addMachine @0 (machine :Machine);
updateMachine @1 (machine :Machine); updateMachine @1 (machine :Machine);

View File

@ -6,15 +6,17 @@ $Rust.parentModule("schema");
using CSharp = import "programming_language/csharp.capnp"; using CSharp = import "programming_language/csharp.capnp";
$CSharp.namespace("FabAccessAPI.Schema"); $CSharp.namespace("FabAccessAPI.Schema");
using Role = import "role.capnp".Role;
interface PermissionSystem interface PermissionSystem
{ {
info @0 :Info; info @0 () -> ( info : Info );
interface Info $CSharp.name("InfoInterface") { interface Info $CSharp.name("InfoInterface") {
} }
manage @1 :Manage; manage @1 () -> ( manage : Manage );
interface Manage $CSharp.name("ManageInterface") { interface Manage $CSharp.name("ManageInterface") {
getRoleList @0 () -> ( role_list :List(Text) ); getRoleList @0 () -> ( role_list :List(Role) );
} }
} }

View File

@ -1,4 +1,4 @@
@0xbacaff4190ac7d80; @0xb61c6ec239895b01;
using Rust = import "programming_language/rust.capnp"; using Rust = import "programming_language/rust.capnp";
$Rust.parentModule("schema"); $Rust.parentModule("schema");
@ -6,11 +6,7 @@ $Rust.parentModule("schema");
using CSharp = import "programming_language/csharp.capnp"; using CSharp = import "programming_language/csharp.capnp";
$CSharp.namespace("FabAccessAPI.Schema"); $CSharp.namespace("FabAccessAPI.Schema");
using General = import "general.capnp"; struct Role
struct Space
{ {
id @0 :General.UUID; name @0 :Text;
name @1 :Text;
info @2 :Text;
} }

View File

@ -8,6 +8,7 @@ $CSharp.namespace("FabAccessAPI.Schema");
using General = import "general.capnp"; using General = import "general.capnp";
using Space = import "space.capnp".Space; using Space = import "space.capnp".Space;
using Role = import "role.capnp".Role;
struct User struct User
{ {
@ -40,11 +41,13 @@ struct User
interface Manage $CSharp.name("ManageInterface") { interface Manage $CSharp.name("ManageInterface") {
getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended ); getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
pwd @1 ( pwd :Text ) -> (); pwd @1 ( pwd :Text ) -> ();
addRole @2 ( )
addRole @2 ( role :Role ) -> ();
removeRole @3 ( role :Role ) -> ();
} }
card_DESFire @2 :Card_DESFire; cardDESFire @2 :CardDESFire;
interface Card_DESFire $CSharp.name("CardDESFireInterface") { interface CardDESFire $CSharp.name("CardDESFireInterface") {
getPIDList @0 () -> ( pids :List(Text) ); getPIDList @0 () -> ( pids :List(Text) );
getNewURL @1 () -> ( url :Text ); getNewURL @1 () -> ( url :Text );
bind @2 ( pid :Text, auth_key :Text ) -> (); bind @2 ( pid :Text, auth_key :Text ) -> ();

View File

@ -11,17 +11,16 @@ using User = import "user.capnp".User;
interface UserSystem interface UserSystem
{ {
info @0 :Info; info @0 () -> ( info : Info );
interface Info $CSharp.name("InfoInterface") { interface Info $CSharp.name("InfoInterface") {
getUserSelf @1 ( ) -> ( user :User ); getUserSelf @0 ( ) -> ( user :User );
} }
manage @1 :Manage; manage @1 () -> ( manage : Manage );
interface Manage $CSharp.name("ManageInterface") { interface Manage $CSharp.name("ManageInterface") {
getUserList @0 () -> ( user_list :List(User) ); getUserList @0 () -> ( user_list :List(User) );
addUser @1 (username :Text, password: Text) -> ( user :User ); addUser @1 (username :Text, password: Text) -> ( user :User );
removeUser @2 (user :User ); removeUser @2 (user :User );
#updateUser @3 (user :User );
} }
} }