Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge service and resource grammar #1788

Merged
merged 1 commit into from
May 24, 2023
Merged

Merge service and resource grammar #1788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions docs/source-2.0/spec/idl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@ string support defined in :rfc:`7405`.
:/ `EnumStatement`
:/ `AggregateShapeStatement`
:/ `StructureStatement`
:/ `ServiceStatement`
:/ `EntityStatement`
:/ `OperationStatement`
:/ `ResourceStatement`
SimpleShapeStatement :`SimpleTypeName` `SP` `Identifier` [`Mixins`]
SimpleTypeName :%s"blob" / %s"boolean" / %s"document" / %s"string"
:/ %s"byte" / %s"short" / %s"integer" / %s"long"
Expand All @@ -201,8 +200,8 @@ string support defined in :rfc:`7405`.
ShapeMember :(`ExplicitShapeMember` / `ElidedShapeMember`) [`ValueAssignment`]
ExplicitShapeMember :`Identifier` [`SP`] ":" [`SP`] `ShapeId`
ElidedShapeMember :"$" `Identifier`
ServiceStatement :%s"service" `SP` `Identifier` [`Mixins`] [`WS`] `NodeObject`
ResourceStatement :%s"resource" `SP` `Identifier` [`Mixins`] [`WS`] `NodeObject`
EntityStatement :`EntityTypeName` `SP` `Identifier` [`Mixins`] [`WS`] `NodeObject`
EntityTypeName :%s"service" / %s"resource"
OperationStatement :%s"operation" `SP` `Identifier` [`Mixins`] [`WS`] `OperationBody`
OperationBody :"{" [`WS`]
: *(`OperationInput` / `OperationOutput` / `OperationErrors`)
Expand Down Expand Up @@ -1225,7 +1224,7 @@ The following example defines a union shape with several members:
Service shape
-------------

A service shape is defined using a :token:`smithy:ServiceStatement` and the provided
A service shape is defined using a :token:`smithy:EntityStatement` and the provided
:token:`smithy:NodeObject` supports the same properties defined in the
:ref:`service specification <service>`.

Expand Down Expand Up @@ -1431,7 +1430,7 @@ The suffixes for the generated names can be customized using the
Resource shape
--------------

A resource shape is defined using a :token:`smithy:ResourceStatement` and the
A resource shape is defined using a :token:`smithy:EntityStatement` and the
provided :token:`smithy:NodeObject` supports the same properties defined in the
:ref:`resource specification <resource>`.

Expand Down