escet merge requestshttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests2023-11-20T08:08:25Zhttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/688#679 PLCgen: Introduce infix/informal/formal supported notations for function...2023-11-20T08:08:25ZAlbert Hofkamp#679 PLCgen: Introduce infix/informal/formal supported notations for function calls.Introduces an enumeration for expressing support notation forms of a function call.
Also cleaned up function call construction and switched to using parameter order for adding arguments to the call.
Commits should be readable, Only nea...Introduces an enumeration for expressing support notation forms of a function call.
Also cleaned up function call construction and switched to using parameter order for adding arguments to the call.
Commits should be readable, Only near the final commits is the code error-free again.
#Addresses #676 #679v2.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/687#667 Support logical implication operator in CIF to mCRL22023-11-02T18:57:54ZMartijn Goorden#667 Support logical implication operator in CIF to mCRL2Closes #667.
The changed test case is accepted by mCRL2 as a well-formed mCRL2 specification.Closes #667.
The changed test case is accepted by mCRL2 as a well-formed mCRL2 specification.v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/686#272 Added utils classes for JavasScript export function.2023-12-19T09:05:37ZRik Lubking#272 Added utils classes for JavasScript export function.- Added xxxUtils.js, a (direct as possible) translation of utils classes
taken from the Java export function.
- Utils functions can be called via JS console, the next commit adds UI and tests.
Discussion, see: https://gitlab.eclipse.org...- Added xxxUtils.js, a (direct as possible) translation of utils classes
taken from the Java export function.
- Utils functions can be called via JS console, the next commit adds UI and tests.
Discussion, see: https://gitlab.eclipse.org/riklubking/escet/-/issues/27
Addresses #272
Fixed after feedback at https://gitlab.eclipse.org/riklubking/escet/-/issues/27#note_1221642:
- Removed trailing whitespaces.
- Introduced MIN_INT / MAX_INT instead of Number.MIN_SAFE_INTEGER /
Number.MAX_SAFE_INTEGER, equal to Java Integer min/max.
- Improved custom exception.
- Added backticks in the place of all {@code} tags in JSDocs.
- Fixed capitals: javascript -> JavaScript / javaScript -> JavaScript,
number -> Number.
- Added space for for(), changed ++i to i++.
- div() returns integers only (truncated result).
- escape() replaces all instances, not just first instance.
- Removed makeList() and intToReal() (not required for JavaScript).
- mod() don't return -0.0 (change to 0.0, same as exp() and others).
- Refactored project() functions, renamed to projectList and
projectString. Fixed projectList().
- strToInt/strToReal: Remove exception (wasn't thrown), add if check for
bounds/NaN instead.
- Added TODO's with essential info.
* TODO 1: fmt() function supports only %d and %s at the moment, which is
all that's used so far. Will need to extend as more options become
required.
* TODO 2: realToStr() will need to implement some formatting code. This
may become a bit messy, perhaps there is some standard function/way to
do this, will discuss and do in a separate commit.v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/685#669 Added history page to CIF documentation2023-11-20T08:16:00ZDennis Hendriks#669 Added history page to CIF documentation* Added a 'CIF history' page to the CIF documentation. I turned this history page into a page that explains more of history, not only why 'CIF' was named 'CIF'. It is thus quite a bit longer than what was [proposed](https://gitlab.eclips...* Added a 'CIF history' page to the CIF documentation. I turned this history page into a page that explains more of history, not only why 'CIF' was named 'CIF'. It is thus quite a bit longer than what was [proposed](https://gitlab.eclipse.org/eclipse/escet/escet/-/issues/669#note_1224537) earlier by @ahofkamp.
* I linked the new page in several relevant places.
* I dropped the old meaning of 'CIF' as 'Compositional Interchange Format' where it was still mentioned (CIF tutorial + CIF metamodel docs).
* I tried to reconstruct history best I could. Let me know if anything is incorrect.
* I added some reference to publications that I think are most representative. If you disagree, let me know.
Closes #669v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/684#682 Fix default target language in CIF code generator documentation.2023-11-02T07:50:19ZDennis Hendriks#682 Fix default target language in CIF code generator documentation.Closes #682Closes #682v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/683#679 PLCgen: Add formal invoke options2023-11-13T09:36:37ZAlbert Hofkamp#679 PLCgen: Add formal invoke optionsAdds the formal invoke options.
- `FormalInvokeArg*` was actually about `FormalInvokeParam*` (the number of parameters of the function rather than the number of supplied arguments).
- `ModelTextGenerator` is now an instance taking the v...Adds the formal invoke options.
- `FormalInvokeArg*` was actually about `FormalInvokeParam*` (the number of parameters of the function rather than the number of supplied arguments).
- `ModelTextGenerator` is now an instance taking the values of the invoke option settings.
- Comparing against `cif2plc` was messy as generated output is hugely different. In the end if grabbed function-like text of the form `NAME(......`, that is an all-uppercase name and a parenthesis, and then some text behind it to get the tell-tale `:=` and then sorted on function use. See the attached output file for all combinations of the new option values. Also added the python script just in case.
text[output.txt](/uploads/97b7c300b09bfe2dd370ff4eabcc10eb/output.txt)
[find_funcs.py](/uploads/1f3e4ee30b56a2a296c766d0c1e62fc3/find_funcs.py)
- It seems complicated to get the result I'd like. Possibly the notion of "std" differs between both programs, and/or the collection of allowed forms of expressions. Also how to decide between infix / non-formal prefix / formal prefix is likely different.
- My current guess is that we need more precise options to better express the desired result. I'd like to do that not now though.
Addresses #679v2.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/682#675 PLCgen Siemens target: location variables get assigned non-existing values.2023-10-31T10:48:34ZAlbert Hofkamp#675 PLCgen Siemens target: location variables get assigned non-existing values.Resolve the undefined `someConstantVariable` in the PLC code by unfolding the referenced constants to their value.
Closes #675Resolve the undefined `someConstantVariable` in the PLC code by unfolding the referenced constants to their value.
Closes #675v2.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/681#272 CIF code generator: add JavaScript as code generation target2023-11-02T07:56:05ZRik Lubking#272 CIF code generator: add JavaScript as code generation target- Added JavaScript export option to export menu.
- Added empty search/replace template (to be filled in later).
- Created empty stub methods for most implementations (to be filled in
later).
* Export feature works without problems/error...- Added JavaScript export option to export menu.
- Added empty search/replace template (to be filled in later).
- Created empty stub methods for most implementations (to be filled in
later).
* Export feature works without problems/errors, but currently only
generates an empty .html file.
Fixed after feedback from: https://gitlab.eclipse.org/riklubking/escet/-/issues/27#note_1215200
- Fixed formatting.
- Added stub method TODO's.
- Added documentation.
- Javascript -> JavaScript.
- Renamed main.html -> index.html
Addresses #272v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/680#272 JavaScript code generation step 1: add export menu option2023-10-30T08:49:18ZRik Lubking#272 JavaScript code generation step 1: add export menu option- Added JavaScript export option to export menu.
- Added empty search/replace template (to be filled in later).
- Created empty stub methods for most implementations (to be filled in
later).
* Export feature works without problems/error...- Added JavaScript export option to export menu.
- Added empty search/replace template (to be filled in later).
- Created empty stub methods for most implementations (to be filled in
later).
* Export feature works without problems/errors, but currently only
generates an empty .html file.
For discussion, see: https://gitlab.eclipse.org/riklubking/escet/-/issues/27
Addresses #272v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/679#593 CIF docs: indicate whether/how tools support/handle annotations.2023-10-30T20:34:36ZDennis Hendriks#593 CIF docs: indicate whether/how tools support/handle annotations.Some unrelated documentation improvements:
- CIF explorer: fixed a copy/paste mistake.
- CIF explorer: fixed an incomplete sentence.
Addresses #593Some unrelated documentation improvements:
- CIF explorer: fixed a copy/paste mistake.
- CIF explorer: fixed an incomplete sentence.
Addresses #593v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/678#680 CIF merger checks annotation post-check constraints after merge.2023-10-30T20:35:49ZDennis Hendriks#680 CIF merger checks annotation post-check constraints after merge.Closes #680Closes #680v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/677#672 Improved CIF type checker messages for component definition/instantiatio...2023-11-13T08:31:29ZDennis Hendriks#672 Improved CIF type checker messages for component definition/instantiation mismatchCloses #672Closes #672v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/675#676 PLCgen: Postpone remaining options to after the first release2023-10-31T15:57:42ZAlbert Hofkamp#676 PLCgen: Postpone remaining options to after the first releaseDropped PlcMaxIterOption PlcFormalFuncInvokeArgOption
and PlcFormalFuncInvokeFuncOption for now.
Addresses #676Dropped PlcMaxIterOption PlcFormalFuncInvokeArgOption
and PlcFormalFuncInvokeFuncOption for now.
Addresses #676v2.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/674#676 Make 'plcgen' available from ToolDef2023-10-30T09:59:43ZAlbert Hofkamp#676 Make 'plcgen' available from ToolDefMakes the `plcgen` tool available from ToolDef.
Addresses #676Makes the `plcgen` tool available from ToolDef.
Addresses #676v2.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/673#542 Add warning for duplicated state invariant2023-12-15T12:07:30ZFerdie Reijnen#542 Add warning for duplicated state invariantCloses #542Closes #542v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/672#678 Free dropped bits for CifBddBitVector resize.2023-10-24T20:09:07ZFerdie Reijnen#678 Free dropped bits for CifBddBitVector resize.Closes #678Closes #678v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/671#661 Large expressions in exception reporting crash the CIF simulator2023-10-16T18:39:09ZMartijn Goorden#661 Large expressions in exception reporting crash the CIF simulatorCloses #661.Closes #661.v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/670#648 CIF metamodel: rename parameters/params to arguments.2023-10-21T07:07:33ZDennis Hendriks#648 CIF metamodel: rename parameters/params to arguments.* For `ComponentInst` and `FunctionCallExpression`.
* Went through entire Git repo to make it more consistent.
* Quite some changes, but hopefully easy to review per commit.
Closes #648* For `ComponentInst` and `FunctionCallExpression`.
* Went through entire Git repo to make it more consistent.
* Quite some changes, but hopefully easy to review per commit.
Closes #648v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/668#593 CifAnnotationsTypeChecker: JavaDoc/comment fixes.2023-10-15T12:10:52ZDennis Hendriks#593 CifAnnotationsTypeChecker: JavaDoc/comment fixes.Addresses #593Addresses #593v2.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/667#593 Add annotations + doc annotations info to CIF reference manual.2023-10-24T07:17:50ZDennis Hendriks#593 Add annotations + doc annotations info to CIF reference manual.Addresses #593Addresses #593v2.0