-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,30 +83,31 @@ end _F; | |
> _class-definition_ → **encapsulated**? _class-prefixes_ _class-specifier_ | ||
> _class-prefixes_ →\ | ||
>   **partial**?\ | ||
>   ( **class**\ | ||
>   | **model**\ | ||
>   ~~**partial**?~~\ | ||
>   ( ~~**class**~~\ | ||
>   | ~~**model**~~\ | ||
>   | **flat_model**\ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
olivleno
Author
Collaborator
|
||
>   | **operator**? **record**\ | ||
>   | **block**\ | ||
>   | **expandable**? **connector**\ | ||
>   | ~~**block**~~\ | ||
>   | ~~**expandable**? **connector**~~\ | ||
>   | **type**\ | ||
>   | **package**\ | ||
>   | ~~**package**~~\ | ||
>   | ( **pure** | **impure** )? **operator**? **function**\ | ||
>   | **operator**\ | ||
>   ) | ||
> _class-specifier_ → _long-class-specifier_ | _short-class-specifier_ | _der-class-specifier_ | ||
> _class-specifier_ → _long-class-specifier_ ~~| _short-class-specifier_~~ | _der-class-specifier_ | ||
> _long-class-specifier_\ | ||
>   → _IDENT_ _string-comment_ _composition_ **end** _IDENT_\ | ||
>   | **extends** _IDENT_ _class-modification_? _string-comment_ _composition_ **end** _IDENT_ | ||
>   ~~| **extends** _IDENT_ _class-modification_? _string-comment_ _composition_ **end** _IDENT_~~ | ||
> _short-class-specifier_ →\ | ||
~~> _short-class-specifier_ →\ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
olivleno
Author
Collaborator
|
||
>   _IDENT_ **=**\ | ||
>   ( _base-prefix_? _type-specifier_ _array-subscripts_? _class-modification_?\ | ||
>   | **enumeration** `[(]` ( _enum-list_? | **:** ) `[)]`\ | ||
>   )\ | ||
>   _comment_ | ||
>   _comment_~~ | ||
> _der-class-specifier_ → _IDENT_ **=** **der** `[(]` _type-specifier_ **,** _IDENT_ ( **,** _IDENT_ )* `[)]` _comment_ | ||
|
@@ -132,32 +133,32 @@ end _F; | |
> _external-function-call_ → ( _component-reference_ **=** )? _IDENT_ `[(]` _expression-list_? `[)]` | ||
> _generic-element_ → _import-clause_ | _extends-clause_ | _normal-element_ | ||
> _generic-element_ → ~~_import-clause_ | _extends-clause_ |~~ _normal-element_ | ||
> _normal-element_ →\ | ||
>   ~~**redeclare**?~~\ | ||
>   **final**?\ | ||
This comment has been minimized.
Sorry, something went wrong.
gkurzbach
Collaborator
|
||
>   **inner**? **outer**?\ | ||
>   ( _class-definition_\ | ||
>   ~~**inner**? **outer**?~~\ | ||
>   ( ~~_class-definition_~~\ | ||
This comment has been minimized.
Sorry, something went wrong.
henrikt-ma
Collaborator
|
||
>   | _component-clause_\ | ||
>   | ~~**replaceable**~~ ( _class-definition_ | _component-clause_ ) ( _constraining-clause_ _comment_ )?\ | ||
>   ~~| **replaceable** ( _class-definition_ | _component-clause_ ) ( _constraining-clause_ _comment_ ~~)?\ | ||
>   ) | ||
> _import-clause_ →\ | ||
> ~~_import-clause_ →\ | ||
>   **import**\ | ||
>   ( _IDENT_ **=** _name_\ | ||
>   | _name_ ( `[.]` ( `[*]` | **{** _import-list_ **}** ) | `[.][*]` )?\ | ||
>   )\ | ||
>   _comment_ | ||
> _import-list_ → _IDENT_ ( **,** _IDENT_ )* | ||
> ~~_import-list_ → _IDENT_ ( **,** _IDENT_ )* | ||
|
||
## B23 Extends | ||
|
||
> _extends-clause_ → **extends** _type-specifier_ _class-modification_? _annotation-comment_? | ||
> ~~_extends-clause_ → **extends** _type-specifier_ _class-modification_? _annotation-comment_? | ||
> _constraining-clause_ → **constrainedby** _type-specifier_ _class-modification_? | ||
> ~~_constraining-clause_ → **constrainedby** _type-specifier_ _class-modification_? | ||
|
||
## B24 Component**clause** | ||
|
@@ -179,27 +180,27 @@ end _F; | |
|
||
## B25 Modification | ||
|
||
> _modification_\ | ||
> ~~_modification_\ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
gkurzbach
Collaborator
|
||
>   → _class-modification_ ( **=** _expression_ )?\ | ||
>   | **=** _expression_\ | ||
>   | **:=** _expression_ | ||
> _class-modification_ → `[(]` _argument-list_? `[)]` | ||
> ~~_class-modification_ → `[(]` _argument-list_? `[)]` | ||
> _argument-list_ → _argument_ ( **,** _argument_ )* | ||
> ~~_argument-list_ → _argument_ ( **,** _argument_ )* | ||
> _argument_\ | ||
> ~~_argument_\ | ||
>   → _element-modification-or-replaceable_\ | ||
>   ~~| _element-redeclaration_~~ | ||
>   | _element-redeclaration_~~ | ||
> _element-modification-or-replaceable_ →\ | ||
> ~~_element-modification-or-replaceable_ →\ | ||
>   **each**?\ | ||
>   **final**?\ | ||
>   ( _element-modification_\ | ||
>   ~~| _element-replaceable_~~\ | ||
>   | _element-replaceable_~~\ | ||
>   ) | ||
> _element-modification_ → _name_ _modification_? _string-comment_ | ||
> ~~_element-modification_ → _name_ _modification_? _string-comment_ | ||
> ~~_element-redeclaration_ →~~\ | ||
> ~~  **redeclare** **each**? **final**?~~\ | ||
|
@@ -219,15 +220,15 @@ end _F; | |
> ~~_component-declaration1_ → _declaration_ _comment_~~ | ||
> _short-class-definition_ → _class-prefixes_ _short-class-specifier_ | ||
> ~~_short-class-definition_ → _class-prefixes_ _short-class-specifier_ | ||
## B26 Equations | ||
|
||
> _equation_ →\ | ||
>   ( _simple-expression_ ( **=** _expression_ )?\ | ||
>   | _if-equation_\ | ||
>   | _for-equation_\ | ||
>   | _connect-clause_\ | ||
> ~~  | _connect-clause_~~\ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
casella
Collaborator
|
||
>   | _when-equation_\ | ||
>   )\ | ||
>   _comment_ | ||
|
@@ -301,7 +302,7 @@ end _F; | |
>   )* \ | ||
>   **end** **when** | ||
> _connect-clause_ → **connect** `[(]` _component-reference_ **,** _component-reference_ `[)]` | ||
> ~~_connect-clause_ → **connect** `[(]` _component-reference_ **,** _component-reference_ `[)]` | ||
|
||
## Expressions | ||
|
If we were to go with a language version header, I don't see that there would be an absolute need to replace
model
byflat_model
. On the other hand, in case someone ignores the language version header, using a non-Modelica keyword might also serve to make sure that the file isn't interpreted as Modelica by mistake.