diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index f67328a8..5d105569 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -7,7 +7,7 @@ assignees: '' --- -> **Before posting a new question, please read the documentation](https://github.com/lequal/i-CodeCNES/wiki) and check [existing issues](https://github.com/lequal/i-CodeCNES/issues)** +> **Before posting a new question, please read the documentation](https://github.com/cnescatlab/i-CodeCNES/wiki) and check [existing issues](https://github.com/cnescatlab/i-CodeCNES/issues)** **Describe what you need to know** A clear and concise description of what your question is. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e86f354f..d65042a3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,8 +22,8 @@ What types of changes does your code introduce to i-Code? > _Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._ -- [ ] I have read the [CONTRIBUTING](https://github.com/lequal/i-CodeCNES/blob/master/CONTRIBUTING.md) doc -- [ ] I agree with the [CODE OF CONDUCT](https://github.com/lequal/i-CodeCNES/blob/master/CONTRIBUTING.md) +- [ ] I have read the [CONTRIBUTING](https://github.com/cnescatlab/i-CodeCNES/blob/master/CONTRIBUTING.md) doc +- [ ] I agree with the [CODE OF CONDUCT](https://github.com/cnescatlab/i-CodeCNES/blob/master/CONTRIBUTING.md) - [ ] Lint and unit tests pass locally with my changes - [ ] SonarCloud and Travis CI tests pass with my changes - [ ] I have added tests that prove my fix is effective or that my feature works diff --git a/.travis.yml b/.travis.yml index 1e9466ea..cdd952b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ jdk: addons: sonarcloud: - organization: "lequal" + organization: "cnescatlab" token: secure: "XrTPbT5js+N1quKghtNNwb+F911kkREvm1ucDUb6vBwfGY5n/du9Mas5R632HuV/s8pJcJGi66NwzxhjaZGzvsNT+WhhRzeOTunpPSXzrW1wkN3cYyiURqN7p7c+YhmGVtymgiDmWh9/hamxsWp7PsmnGsAHe8U/omhV/7riU73/AwPahdeAaLdRegUrEvL9814q88d7g6A9gPFssPq9p+NLGP1J7zyNEWfHz59i0GRKFtmBTvqhONvFsostTZ1F+MJRv+Z5YIVCzkiOr99TRYrIQCwBmTXNWp/pZyKTV2xahhdY1UFY7Mtk4IUzrGhTBwaqsazMwF5EI2qdL0oKTabNEQoLtJoIA+vVLS9vONf3/zijcGnMQZvtI0M7HaXuAdIdXXpj/OZdPSrqZy1rVy7RQWoTyK4Wv8jwls3Ocrbpojo/uaSJk4t/iCyToURgQzTPPbeSkX52fFt0ylOnCEQVm8OSjcnx3WeM5jm8moaPXGsJjSvsUjGbyVWwTiqe/oAY1vJDY6TT11+v4mCmLyv21AQg16euMhuSQMKaml/F8Gt/th0Yr1HCXn6Vcw7fwU9IX2sbFrTlip7e4XQ/ohZXuM37IjG/9CrqFU2AI55HneQXERH7qkMTEiZOTYg7vbHZkzzBLTBlPEwtmlnYSObiOq2BFXxzY1wgP3jGTVQ=" diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7d537b11..d34a0dea 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at L-lequal@cnes.fr. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at catlab@cnes.fr. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61eeda3a..a98b6f69 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to i-Code CNES First off, thanks for taking the time to contribute! -The following is a set of guidelines for contributing to i-Code Cnes, which are hosted in the [Lequal Organization](https://github.com/lequal) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request. +The following is a set of guidelines for contributing to i-Code Cnes, which are hosted in the [CATLab Organization](https://github.com/cnescatlab) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request. #### Table Of Contents + [Code of Conduct](#code-of-conduct) @@ -11,7 +11,7 @@ The following is a set of guidelines for contributing to i-Code Cnes, which are * [Git Commit Messages](#git-commit-messages) ## Code of Conduct -This project and everyone participating in it is governed by the [Lequal Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [L-lequal@cnes.fr](mailto:L-lequal@cnes.fr). +This project and everyone participating in it is governed by the [CATLab Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [catlab@cnes.fr](mailto:catlab@cnes.fr). ## How Can I Contribute? @@ -32,7 +32,7 @@ Explain the problem and include additional details to help maintainers reproduce Provide more context by answering these questions: * **Did the problem start happening recently** (e.g. after updating to a new version of the plugin or SonarQube) or was this always a problem? -* If the problem started happening recently, **can you reproduce the problem in an older version?** What's the most recent version in which the problem doesn't happen? You can download older versions from [the releases page](https://github.com/lequal/i-CodeCNES/releases). +* If the problem started happening recently, **can you reproduce the problem in an older version?** What's the most recent version in which the problem doesn't happen? You can download older versions from [the releases page](https://github.com/cnescatlab/i-CodeCNES/releases). * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens. Include details about your configuration and environment: @@ -72,7 +72,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com All contributions are welcome. They are made via a *pull request* on the branch `dev` which is the branch of the next version. -* pull request with **major** changes must be approved by at least one maintainer of each team and the LEQUAL. +* pull request with **major** changes must be approved by at least one maintainer of each team and the CNES CatLab. * pull requests with **minor** changes must be approved by at least one organization's member. diff --git a/README.md b/README.md index 67ddf882..1f021a8c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -![i-Code logo](https://github.com/lequal/i-CodeCNES/blob/master/img/logo-i-code-cnes.png) +![i-Code logo](https://github.com/cnescatlab/i-CodeCNES/blob/master/img/logo-i-code-cnes.png) -[![Build Status](https://travis-ci.org/lequal/i-CodeCNES.svg?branch=master)](https://travis-ci.org/lequal/i-CodeCNES) +[![Build Status](https://travis-ci.org/cnescatlab/i-CodeCNES.svg?branch=master)](https://travis-ci.org/cnescatlab/i-CodeCNES) [![SonarQube Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=alert_status)](https://sonarcloud.io/dashboard?id=lequal_i-CodeCNES) [![SonarQube Bugs](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=bugs)](https://sonarcloud.io/project/issues?id=lequal_i-CodeCNES&resolved=false&types=BUG) [![SonarQube Coverage](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=coverage)](https://sonarcloud.io/component_measures?id=lequal_i-CodeCNES&metric=Coverage) @@ -8,10 +8,10 @@ i-Code CNES is a static code analysis tool to help developers write code compliant with CNES coding rules for Fortran 77, Fortran 90 and Shell. -All the information on CNES standards coverage, and rules availabilities and limitations can be read in the [documentation](https://github.com/lequal/i-CodeCNES/wiki). +All the information on CNES standards coverage, and rules availabilities and limitations can be read in the [documentation](https://github.com/cnescatlab/i-CodeCNES/wiki). ## Quick start -- Download latest i-Code version on [GitHub Releases](https://github.com/lequal/i-CodeCNES/releases). +- Download latest i-Code version on [GitHub Releases](https://github.com/cnescatlab/i-CodeCNES/releases). - Unzip i-Code archive where you need it. - Add `icode` to your path. - Grant `icode` execution permission. @@ -30,7 +30,7 @@ This is the common GUI application for i-Code. ##### i-Code plugin for Eclipse The Eclipse plugin for i-Code allows to use i-Code from Eclipse IDE. ##### i-Code plugin for SonarQube -The SonarQube plugin for i-Code allows to use i-Code through SonarQube analysis. Please refer to [sonar-icode-cnes-plugin](https://github.com/lequal/sonar-icode-cnes-plugin) for more details. +The SonarQube plugin for i-Code allows to use i-Code through SonarQube analysis. Please refer to [sonar-icode-cnes-plugin](https://github.com/cnescatlab/sonar-icode-cnes-plugin) for more details. ## Installation ##### i-Code CLI @@ -65,22 +65,26 @@ Analyze Shell, F77 & F90 code to find defects & bugs. -x,--excluded-rules Comma separated list of rules id to exclude from analysis. None by default. -Please report issues at https://github.com/lequal/i-CodeCNES/issues +Please report issues at https://github.com/cnescatlab/i-CodeCNES/issues ``` ## Build You can easily rebuild all i-Code products with Maven: ```bash -git clone https://github.com/lequal/i-CodeCNES icode +git clone https://github.com/cnescatlab/i-CodeCNES icode cd ./icode/ mvn clean install ``` ## Extending i-Code with your own plugin -If you need to add some new feature, the easiest way is to implment your own plugin by forking [icode-custom-plugin-example](https://github.com/lequal/icode-custom-plugin-example) and its dedicated [Developer Guide](https://github.com/lequal/icode-custom-plugin-example/wiki/Developer-guide). +If you need to add some new feature, the easiest way is to implment your own plugin by forking [icode-custom-plugin-example](https://github.com/cnescatlab/icode-custom-plugin-example) and its dedicated [Developer Guide](https://github.com/cnescatlab/icode-custom-plugin-example/wiki/Developer-guide). ## Changelog +#### Release 4.1.1 +###### Fixed bugs +- [x] **BUG #221** > Too many open files + #### Release 4.1.0 ###### New features @@ -110,17 +114,17 @@ If you need to add some new feature, the easiest way is to implment your own plu - Update packaging of i-Code #165 - Update CI #145 - Reintegrate RCP as a submodule using i-Code Core #165 -- This 4.0.0 version integrate a whole new architecture described in https://github.com/lequal/i-CodeCNES/wiki +- This 4.0.0 version integrate a whole new architecture described in https://github.com/cnescatlab/i-CodeCNES/wiki - `icode-core`: contains core feature to build analyzer - `icode-library`: contains the minimal classes to run i-Code analyzers in a Java application - `icode-app`: a standalone command line version of i-Code analyzer - `icode-ide`: contains the i-Code IDE version and Eclipse plugin - `*-language`, `*-rules` and `*-metrics`: contain analyzer for several languages: Shell, Fortran, ... -- The new documentation is available as a wiki https://github.com/lequal/i-CodeCNES/wiki -- A `Developer Guide` is now available here: https://github.com/lequal/icode-custom-plugin-example/wiki/Developer-guide +- The new documentation is available as a wiki https://github.com/cnescatlab/i-CodeCNES/wiki +- A `Developer Guide` is now available here: https://github.com/cnescatlab/icode-custom-plugin-example/wiki/Developer-guide - Users are able to add custom plugins by putting their `jar` files into `icode/plugins/` directory - Bug about recursive analysis is fixed and users can now simply analyze a directory, e.g.: `icode .` -- The continuous integration was enhanced with Travis(https://travis-ci.org/lequal/i-CodeCNES) and SonarCloud(https://sonarcloud.io/dashboard?id=lequal_i-CodeCNES) +- The continuous integration was enhanced with Travis(https://travis-ci.org/cnescatlab/i-CodeCNES) and SonarCloud(https://sonarcloud.io/dashboard?id=lequal_i-CodeCNES) - The contributing page and issue templates were updated - Eclipse RCP was removed from core features of i-Code - Some other minor enhancements and fixes @@ -200,20 +204,20 @@ If you need to add some new feature, the easiest way is to implment your own plu * Improvements of analysis failure notifications #50 * XML and CSV export improvements #69  #19 -*Minor fixes and other enhancements : [milestone 3.0.0](https://github.com/lequal/i-CodeCNES/milestone/1).* +*Minor fixes and other enhancements : [milestone 3.0.0](https://github.com/cnescatlab/i-CodeCNES/milestone/1).* ### Previous Releases -* [Release 3.1.0](https://github.com/lequal/i-CodeCNES/releases/tag/v3.1.0) -* [Release 3.0.1](https://github.com/lequal/i-CodeCNES/releases/tag/v3.0.1) -* [Release 3.0.0](https://github.com/lequal/i-CodeCNES/releases/tag/v3.0.0) -* [Release 2.0.0](https://github.com/lequal/i-CodeCNES/releases/tag/v2.0.0) -* [Release 1.0.0](https://github.com/lequal/i-CodeCNES/releases/tag/v1.0.0) +* [Release 3.1.0](https://github.com/cnescatlab/i-CodeCNES/releases/tag/v3.1.0) +* [Release 3.0.1](https://github.com/cnescatlab/i-CodeCNES/releases/tag/v3.0.1) +* [Release 3.0.0](https://github.com/cnescatlab/i-CodeCNES/releases/tag/v3.0.0) +* [Release 2.0.0](https://github.com/cnescatlab/i-CodeCNES/releases/tag/v2.0.0) +* [Release 1.0.0](https://github.com/cnescatlab/i-CodeCNES/releases/tag/v1.0.0) ### Feedback and Support -Contact : L-lequal@cnes.fr +Contact : catlab@cnes.fr -Bugs and feature requests: https://github.com/lequal/i-CodeCNES/issues +Bugs and feature requests: https://github.com/cnescatlab/i-CodeCNES/issues ### How to contribute If you experienced a problem with the plugin please open an issue. Inside this issue please explain us how to reproduce this issue and paste the log. @@ -221,7 +225,7 @@ If you experienced a problem with the plugin please open an issue. Inside this i If you want to do a PR, please put inside of it the reason of this pull request. If this pull request fix an issue please insert the number of the issue or explain inside of the PR how to reproduce this issue. ### License -Copyright 2019 LEQUAL. +Copyright 2022 CATLab. This software is licensed under the terms in the file named "LICENSE" in this directory. diff --git a/fortran77-metrics/src/main/resources/example/ExampleMetric.lex b/fortran77-metrics/src/main/resources/example/ExampleMetric.lex index 5e4d7efd..797de717 100644 --- a/fortran77-metrics/src/main/resources/example/ExampleMetric.lex +++ b/fortran77-metrics/src/main/resources/example/ExampleMetric.lex @@ -107,6 +107,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" fileValue.setFileValue(valueOfFile); return fileValue; %eofval} +%eofclose /* Here is where you can declare transition words for the Metric. */ METRIC_WORD = first_word | SECOND_WORD diff --git a/fortran77-metrics/src/main/resources/lex/F77METComplexitySimplified.lex b/fortran77-metrics/src/main/resources/lex/F77METComplexitySimplified.lex index 8d4308df..98a68a72 100755 --- a/fortran77-metrics/src/main/resources/lex/F77METComplexitySimplified.lex +++ b/fortran77-metrics/src/main/resources/lex/F77METComplexitySimplified.lex @@ -118,6 +118,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran77-metrics/src/main/resources/lex/F77METLineOfCode.lex b/fortran77-metrics/src/main/resources/lex/F77METLineOfCode.lex index 13876f97..a9c76684 100755 --- a/fortran77-metrics/src/main/resources/lex/F77METLineOfCode.lex +++ b/fortran77-metrics/src/main/resources/lex/F77METLineOfCode.lex @@ -108,6 +108,7 @@ SPACE = [\ \r\f\t] this.computeMetric(null, numTotal, 0); return getCheckResults(); %eofval} +%eofclose %% /************************************************************************/ diff --git a/fortran77-metrics/src/main/resources/lex/F77METLineOfComment.lex b/fortran77-metrics/src/main/resources/lex/F77METLineOfComment.lex index 4f9a61be..e085ec08 100644 --- a/fortran77-metrics/src/main/resources/lex/F77METLineOfComment.lex +++ b/fortran77-metrics/src/main/resources/lex/F77METLineOfComment.lex @@ -109,7 +109,7 @@ END = END | end this.computeMetric(null, numCommentTotal, 0); return getCheckResults(); %eofval} - +%eofclose %% /*********************/ diff --git a/fortran77-metrics/src/main/resources/lex/F77METNesting.lex b/fortran77-metrics/src/main/resources/lex/F77METNesting.lex index 9b0a393a..2bc653db 100755 --- a/fortran77-metrics/src/main/resources/lex/F77METNesting.lex +++ b/fortran77-metrics/src/main/resources/lex/F77METNesting.lex @@ -131,6 +131,7 @@ SMBL = \& | \+ | \$ this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran77-metrics/src/main/resources/lex/F77METRatioComment.lex b/fortran77-metrics/src/main/resources/lex/F77METRatioComment.lex index 67da4e5b..ffbbc529 100755 --- a/fortran77-metrics/src/main/resources/lex/F77METRatioComment.lex +++ b/fortran77-metrics/src/main/resources/lex/F77METRatioComment.lex @@ -114,7 +114,7 @@ END = END | end this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} - +%eofclose %% /*********************/ diff --git a/fortran77-rules/src/main/resources/example/ExampleRule.lex b/fortran77-rules/src/main/resources/example/ExampleRule.lex index 6085ff47..334221cc 100755 --- a/fortran77-rules/src/main/resources/example/ExampleRule.lex +++ b/fortran77-rules/src/main/resources/example/ExampleRule.lex @@ -95,7 +95,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return violations; %eofval} - +%eofclose /* Here is where you can declare transition words for the rule. */ RULE_WORD = first_word | SECOND_WORD diff --git a/fortran77-rules/src/main/resources/lex/COMDATAFloatCompare.lex b/fortran77-rules/src/main/resources/lex/COMDATAFloatCompare.lex index a702f81f..53099a36 100755 --- a/fortran77-rules/src/main/resources/lex/COMDATAFloatCompare.lex +++ b/fortran77-rules/src/main/resources/lex/COMDATAFloatCompare.lex @@ -107,6 +107,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* Transition word are real, complex and double precision. Whenever this word is */ /* encountered, we store all variables declared. */ diff --git a/fortran77-rules/src/main/resources/lex/COMDATAInitialisation.lex b/fortran77-rules/src/main/resources/lex/COMDATAInitialisation.lex index 5908fd81..ef513aec 100755 --- a/fortran77-rules/src/main/resources/lex/COMDATAInitialisation.lex +++ b/fortran77-rules/src/main/resources/lex/COMDATAInitialisation.lex @@ -293,7 +293,7 @@ SEE_FUNC = ([^a-zA-Z0-9\_])?("if" | "elseif" | "forall" | "while" | "where" | " displayErrorVariableByType(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMDATAInvariant.lex b/fortran77-rules/src/main/resources/lex/COMDATAInvariant.lex index 77394815..1926fbac 100755 --- a/fortran77-rules/src/main/resources/lex/COMDATAInvariant.lex +++ b/fortran77-rules/src/main/resources/lex/COMDATAInvariant.lex @@ -125,7 +125,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMDATALoopCondition.lex b/fortran77-rules/src/main/resources/lex/COMDATALoopCondition.lex index 720437f6..8365c6b0 100755 --- a/fortran77-rules/src/main/resources/lex/COMDATALoopCondition.lex +++ b/fortran77-rules/src/main/resources/lex/COMDATALoopCondition.lex @@ -179,7 +179,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose /* Transition word is do (or DO). If this word is met, we focus on out condition */ /* end verifies that it's not modified within the DO-loop. If WHILE is found, */ /* nothing has to be done. We also look for END, which means modification can be */ diff --git a/fortran77-rules/src/main/resources/lex/COMDATANotUsed.lex b/fortran77-rules/src/main/resources/lex/COMDATANotUsed.lex index a9043013..79633842 100755 --- a/fortran77-rules/src/main/resources/lex/COMDATANotUsed.lex +++ b/fortran77-rules/src/main/resources/lex/COMDATANotUsed.lex @@ -112,7 +112,7 @@ EQUAL = \= [^\,\n\"\']* return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMDESIGNActiveWait.lex b/fortran77-rules/src/main/resources/lex/COMDESIGNActiveWait.lex index 0f13ee36..7210e12b 100755 --- a/fortran77-rules/src/main/resources/lex/COMDESIGNActiveWait.lex +++ b/fortran77-rules/src/main/resources/lex/COMDESIGNActiveWait.lex @@ -82,7 +82,7 @@ WAIT = "sleep" | "wait" | "pause" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMDESIGNAlloc.lex b/fortran77-rules/src/main/resources/lex/COMDESIGNAlloc.lex index 33ade3fc..5adbf6ed 100755 --- a/fortran77-rules/src/main/resources/lex/COMDESIGNAlloc.lex +++ b/fortran77-rules/src/main/resources/lex/COMDESIGNAlloc.lex @@ -154,7 +154,7 @@ INT = [0-9]+ sortResults(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWAbort.lex b/fortran77-rules/src/main/resources/lex/COMFLOWAbort.lex index 00078f5a..0c7c350e 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWAbort.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWAbort.lex @@ -79,6 +79,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex b/fortran77-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex index 7cd4cf9f..e3b6d159 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex @@ -85,6 +85,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex b/fortran77-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex index 7aac31cf..3253a28e 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex @@ -247,6 +247,7 @@ AVOIDED = {SPACE}*( "abs" | "achar" | "acos" | "acosh" | "adjustl" | "adjustr" sortResults(); return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWCheckUser.lex b/fortran77-rules/src/main/resources/lex/COMFLOWCheckUser.lex index c8dee1cd..0de42f4b 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWCheckUser.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWCheckUser.lex @@ -84,6 +84,7 @@ GETUID = "GETUID"{SPACE}*\({SPACE}*\) } return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWExit.lex b/fortran77-rules/src/main/resources/lex/COMFLOWExit.lex index f4d632c7..94d68b70 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWExit.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWExit.lex @@ -84,6 +84,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWExitLoop.lex b/fortran77-rules/src/main/resources/lex/COMFLOWExitLoop.lex index 6af474fd..b54c315d 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWExitLoop.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWExitLoop.lex @@ -89,6 +89,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word are STOP, EXIT, CYCLE and GO TO. If these words are met inside */ /* a DO-loop, an error is thrown. */ diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWFileExistence.lex b/fortran77-rules/src/main/resources/lex/COMFLOWFileExistence.lex index 2b322632..51aa78b3 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWFileExistence.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWFileExistence.lex @@ -94,7 +94,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMFLOWFilePath.lex b/fortran77-rules/src/main/resources/lex/COMFLOWFilePath.lex index 33c4c771..6c716e1c 100755 --- a/fortran77-rules/src/main/resources/lex/COMFLOWFilePath.lex +++ b/fortran77-rules/src/main/resources/lex/COMFLOWFilePath.lex @@ -82,7 +82,7 @@ FILENAME = \'[\.]*[a-zA-Z\/][a-zA-Z0-9\_\/]*(\.[a-zA-Z0-9]+)?\' | %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMINSTBoolNegation.lex b/fortran77-rules/src/main/resources/lex/COMINSTBoolNegation.lex index a35e3223..9076b5be 100755 --- a/fortran77-rules/src/main/resources/lex/COMINSTBoolNegation.lex +++ b/fortran77-rules/src/main/resources/lex/COMINSTBoolNegation.lex @@ -82,7 +82,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMINSTBrace.lex b/fortran77-rules/src/main/resources/lex/COMINSTBrace.lex index cfd94686..0b4ab582 100755 --- a/fortran77-rules/src/main/resources/lex/COMINSTBrace.lex +++ b/fortran77-rules/src/main/resources/lex/COMINSTBrace.lex @@ -172,7 +172,7 @@ SPACE = [\ \r\t\f] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMINSTCodeComment.lex b/fortran77-rules/src/main/resources/lex/COMINSTCodeComment.lex index 50183cb5..05b472db 100755 --- a/fortran77-rules/src/main/resources/lex/COMINSTCodeComment.lex +++ b/fortran77-rules/src/main/resources/lex/COMINSTCodeComment.lex @@ -139,7 +139,7 @@ SPACE = [\ \r\t\f] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMINSTGoTo.lex b/fortran77-rules/src/main/resources/lex/COMINSTGoTo.lex index 36a086eb..250ca7e9 100755 --- a/fortran77-rules/src/main/resources/lex/COMINSTGoTo.lex +++ b/fortran77-rules/src/main/resources/lex/COMINSTGoTo.lex @@ -79,7 +79,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMINSTLoopCondition.lex b/fortran77-rules/src/main/resources/lex/COMINSTLoopCondition.lex index 11bcb5f5..4b62de27 100755 --- a/fortran77-rules/src/main/resources/lex/COMINSTLoopCondition.lex +++ b/fortran77-rules/src/main/resources/lex/COMINSTLoopCondition.lex @@ -83,7 +83,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMNAMEHomonymy.lex b/fortran77-rules/src/main/resources/lex/COMNAMEHomonymy.lex index c437d9cf..b5fc2059 100755 --- a/fortran77-rules/src/main/resources/lex/COMNAMEHomonymy.lex +++ b/fortran77-rules/src/main/resources/lex/COMNAMEHomonymy.lex @@ -130,7 +130,7 @@ SPACE = [\ \r\t\f] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMPRESIndent.lex b/fortran77-rules/src/main/resources/lex/COMPRESIndent.lex index e451a52e..07b4fdf9 100755 --- a/fortran77-rules/src/main/resources/lex/COMPRESIndent.lex +++ b/fortran77-rules/src/main/resources/lex/COMPRESIndent.lex @@ -105,7 +105,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMPRESLengthLine.lex b/fortran77-rules/src/main/resources/lex/COMPRESLengthLine.lex index da7bf1c5..b99f6e41 100755 --- a/fortran77-rules/src/main/resources/lex/COMPRESLengthLine.lex +++ b/fortran77-rules/src/main/resources/lex/COMPRESLengthLine.lex @@ -77,7 +77,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/COMPROJECTHeader.lex b/fortran77-rules/src/main/resources/lex/COMPROJECTHeader.lex index 7f791ae5..48775d21 100755 --- a/fortran77-rules/src/main/resources/lex/COMPROJECTHeader.lex +++ b/fortran77-rules/src/main/resources/lex/COMPROJECTHeader.lex @@ -160,6 +160,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" lines.clear(); return getCheckResults(); %eofval} +%eofclose /* There is no specific rule word in this rule. However, we define END to avoid */ /* Violations on FUNCTION put after END. */ diff --git a/fortran77-rules/src/main/resources/lex/COMTYPEExpression.lex b/fortran77-rules/src/main/resources/lex/COMTYPEExpression.lex index 62a3c680..0853b657 100755 --- a/fortran77-rules/src/main/resources/lex/COMTYPEExpression.lex +++ b/fortran77-rules/src/main/resources/lex/COMTYPEExpression.lex @@ -149,7 +149,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] | \* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77BLOCCommon.lex b/fortran77-rules/src/main/resources/lex/F77BLOCCommon.lex index e8034554..65c480db 100755 --- a/fortran77-rules/src/main/resources/lex/F77BLOCCommon.lex +++ b/fortran77-rules/src/main/resources/lex/F77BLOCCommon.lex @@ -76,7 +76,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose /* Transition word is common (or COMMON). If COMMON is found without a */ diff --git a/fortran77-rules/src/main/resources/lex/F77BLOCElse.lex b/fortran77-rules/src/main/resources/lex/F77BLOCElse.lex index d20bf449..aff0ab28 100755 --- a/fortran77-rules/src/main/resources/lex/F77BLOCElse.lex +++ b/fortran77-rules/src/main/resources/lex/F77BLOCElse.lex @@ -82,6 +82,7 @@ INT = [0-9]+ %eofval{ return getCheckResults(); %eofval} +%eofclose /* A list of String is made, with identifiers such as DO and IF. Its aim */ /* is to determine when an END is met if it corresponds to an IF. */ diff --git a/fortran77-rules/src/main/resources/lex/F77BLOCFunction.lex b/fortran77-rules/src/main/resources/lex/F77BLOCFunction.lex index 39692718..05e9b642 100755 --- a/fortran77-rules/src/main/resources/lex/F77BLOCFunction.lex +++ b/fortran77-rules/src/main/resources/lex/F77BLOCFunction.lex @@ -106,6 +106,7 @@ EQUAL = \= checkList(); return getCheckResults(); %eofval} +%eofclose %% {FREE_COMMENT} { diff --git a/fortran77-rules/src/main/resources/lex/F77BLOCLoop.lex b/fortran77-rules/src/main/resources/lex/F77BLOCLoop.lex index 4c5b747b..380dce5d 100755 --- a/fortran77-rules/src/main/resources/lex/F77BLOCLoop.lex +++ b/fortran77-rules/src/main/resources/lex/F77BLOCLoop.lex @@ -94,6 +94,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is else (or ELSE). We also look for DO, END, THEN and IF. */ DO = do | DO diff --git a/fortran77-rules/src/main/resources/lex/F77DATAArray.lex b/fortran77-rules/src/main/resources/lex/F77DATAArray.lex index 316af8a5..3c7da617 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATAArray.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATAArray.lex @@ -88,7 +88,7 @@ SMB = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77DATACommon.lex b/fortran77-rules/src/main/resources/lex/F77DATACommon.lex index bc0852ba..a45e6f32 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATACommon.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATACommon.lex @@ -118,7 +118,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77DATADouble.lex b/fortran77-rules/src/main/resources/lex/F77DATADouble.lex index 2cb7e5d3..cf891f55 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATADouble.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATADouble.lex @@ -99,6 +99,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] | \~ %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77DATAIO.lex b/fortran77-rules/src/main/resources/lex/F77DATAIO.lex index eb10a5f4..f04129e3 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATAIO.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATAIO.lex @@ -73,6 +73,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77DATAInitialisation.lex b/fortran77-rules/src/main/resources/lex/F77DATAInitialisation.lex index fee315cb..790b749f 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATAInitialisation.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATAInitialisation.lex @@ -77,6 +77,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77DATALoopDO.lex b/fortran77-rules/src/main/resources/lex/F77DATALoopDO.lex index 0523dd6f..ddeacf46 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATALoopDO.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATALoopDO.lex @@ -77,6 +77,7 @@ SPACE = [\ \t\r] %eofval{ return getCheckResults(); %eofval} +%eofclose /* A boolean called error is to determine if a non integer value is found. */ /* A list of String will contain name of declared variables. */ diff --git a/fortran77-rules/src/main/resources/lex/F77DATAParameter.lex b/fortran77-rules/src/main/resources/lex/F77DATAParameter.lex index 2abd8b2a..d17d4d31 100755 --- a/fortran77-rules/src/main/resources/lex/F77DATAParameter.lex +++ b/fortran77-rules/src/main/resources/lex/F77DATAParameter.lex @@ -104,7 +104,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] | \* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77ERROpenRead.lex b/fortran77-rules/src/main/resources/lex/F77ERROpenRead.lex index 753f5658..090417b4 100755 --- a/fortran77-rules/src/main/resources/lex/F77ERROpenRead.lex +++ b/fortran77-rules/src/main/resources/lex/F77ERROpenRead.lex @@ -97,7 +97,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77INSTAssign.lex b/fortran77-rules/src/main/resources/lex/F77INSTAssign.lex index 54720a26..14235a40 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTAssign.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTAssign.lex @@ -68,7 +68,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose /* Transition word is assign (or ASSIGN). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTDimension.lex b/fortran77-rules/src/main/resources/lex/F77INSTDimension.lex index 611bd684..076dcfb1 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTDimension.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTDimension.lex @@ -68,6 +68,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is dimension (or DIMENSION). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTEquivalence.lex b/fortran77-rules/src/main/resources/lex/F77INSTEquivalence.lex index a52c587f..4d3287cd 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTEquivalence.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTEquivalence.lex @@ -69,7 +69,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose /* Transition word is equivalence (or EQUIVALENCE). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTFunction.lex b/fortran77-rules/src/main/resources/lex/F77INSTFunction.lex index a3932865..4e309c16 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTFunction.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTFunction.lex @@ -73,6 +73,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77INSTIf.lex b/fortran77-rules/src/main/resources/lex/F77INSTIf.lex index 8f8229c0..5639c95c 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTIf.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTIf.lex @@ -75,6 +75,7 @@ INT = [0-9]+ %eofval{ return getCheckResults(); %eofval} +%eofclose /* An integer called LAST_STATE is used to avoid error due to line continuation. */ %{ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTInclude.lex b/fortran77-rules/src/main/resources/lex/F77INSTInclude.lex index e209627e..5c18e104 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTInclude.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTInclude.lex @@ -154,7 +154,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% /*************************/ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTPause.lex b/fortran77-rules/src/main/resources/lex/F77INSTPause.lex index 0fa2f6dc..3df7b86b 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTPause.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTPause.lex @@ -68,6 +68,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is pause (or PAUSE). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTReturn.lex b/fortran77-rules/src/main/resources/lex/F77INSTReturn.lex index 960e9c8a..e7dc623f 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTReturn.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTReturn.lex @@ -70,6 +70,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is return (or RETURN). This word can only be found once and */ /* without any value following it. */ diff --git a/fortran77-rules/src/main/resources/lex/F77INSTSave.lex b/fortran77-rules/src/main/resources/lex/F77INSTSave.lex index d650505f..0e3cc58c 100755 --- a/fortran77-rules/src/main/resources/lex/F77INSTSave.lex +++ b/fortran77-rules/src/main/resources/lex/F77INSTSave.lex @@ -82,7 +82,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77METLine.lex b/fortran77-rules/src/main/resources/lex/F77METLine.lex index 6788b8e8..9fd526dd 100755 --- a/fortran77-rules/src/main/resources/lex/F77METLine.lex +++ b/fortran77-rules/src/main/resources/lex/F77METLine.lex @@ -72,7 +72,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77NAMEGenericIntrinsic.lex b/fortran77-rules/src/main/resources/lex/F77NAMEGenericIntrinsic.lex index 9279f1fe..237f08ee 100755 --- a/fortran77-rules/src/main/resources/lex/F77NAMEGenericIntrinsic.lex +++ b/fortran77-rules/src/main/resources/lex/F77NAMEGenericIntrinsic.lex @@ -89,6 +89,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | [0-9] %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77NAMEIntrinsic.lex b/fortran77-rules/src/main/resources/lex/F77NAMEIntrinsic.lex index e62ede2a..47bbc841 100755 --- a/fortran77-rules/src/main/resources/lex/F77NAMEIntrinsic.lex +++ b/fortran77-rules/src/main/resources/lex/F77NAMEIntrinsic.lex @@ -109,6 +109,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77NAMEKeyWords.lex b/fortran77-rules/src/main/resources/lex/F77NAMEKeyWords.lex index 81009f95..88bd108b 100755 --- a/fortran77-rules/src/main/resources/lex/F77NAMEKeyWords.lex +++ b/fortran77-rules/src/main/resources/lex/F77NAMEKeyWords.lex @@ -82,6 +82,7 @@ SPACE = [\ \t\r] %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77NAMELabel.lex b/fortran77-rules/src/main/resources/lex/F77NAMELabel.lex index b99a7857..0166efa9 100755 --- a/fortran77-rules/src/main/resources/lex/F77NAMELabel.lex +++ b/fortran77-rules/src/main/resources/lex/F77NAMELabel.lex @@ -73,6 +73,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77PROTODeclaration.lex b/fortran77-rules/src/main/resources/lex/F77PROTODeclaration.lex index 614f61aa..52a34da3 100755 --- a/fortran77-rules/src/main/resources/lex/F77PROTODeclaration.lex +++ b/fortran77-rules/src/main/resources/lex/F77PROTODeclaration.lex @@ -120,6 +120,7 @@ SIMBOL = \& | \$ | \+ | [A-Za-z][\ ] | \. | \* compareLists(); return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77REFIO.lex b/fortran77-rules/src/main/resources/lex/F77REFIO.lex index e878a433..4849cb10 100755 --- a/fortran77-rules/src/main/resources/lex/F77REFIO.lex +++ b/fortran77-rules/src/main/resources/lex/F77REFIO.lex @@ -73,7 +73,7 @@ INT = [0-9]+ %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77REFOpen.lex b/fortran77-rules/src/main/resources/lex/F77REFOpen.lex index bf9b85a0..6bafb5f0 100755 --- a/fortran77-rules/src/main/resources/lex/F77REFOpen.lex +++ b/fortran77-rules/src/main/resources/lex/F77REFOpen.lex @@ -88,6 +88,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Rule words are FILE, SCRATCH, STATUS, UNKNOWN and POSITION. */ /* The main rule word is OPEN, to see when an OPEN statement starts. */ diff --git a/fortran77-rules/src/main/resources/lex/F77REFParameter.lex b/fortran77-rules/src/main/resources/lex/F77REFParameter.lex index 47865054..c3384a56 100755 --- a/fortran77-rules/src/main/resources/lex/F77REFParameter.lex +++ b/fortran77-rules/src/main/resources/lex/F77REFParameter.lex @@ -76,7 +76,7 @@ PARAM = [^\,\)\n\ ] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77TYPEBasic.lex b/fortran77-rules/src/main/resources/lex/F77TYPEBasic.lex index aa37575a..72e14dc3 100755 --- a/fortran77-rules/src/main/resources/lex/F77TYPEBasic.lex +++ b/fortran77-rules/src/main/resources/lex/F77TYPEBasic.lex @@ -76,6 +76,7 @@ SPACE = [\ \t\r] %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran77-rules/src/main/resources/lex/F77TYPEHollerith.lex b/fortran77-rules/src/main/resources/lex/F77TYPEHollerith.lex index 0aef2940..13fc8e38 100755 --- a/fortran77-rules/src/main/resources/lex/F77TYPEHollerith.lex +++ b/fortran77-rules/src/main/resources/lex/F77TYPEHollerith.lex @@ -68,6 +68,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* The structure of transitional word is a number followed by H (or h) and some */ /* letters. The import in this is the number and h letter. */ diff --git a/fortran77-rules/src/main/resources/lex/GetFunctionName.lex b/fortran77-rules/src/main/resources/lex/GetFunctionName.lex index 72734f0c..5d1c18ca 100755 --- a/fortran77-rules/src/main/resources/lex/GetFunctionName.lex +++ b/fortran77-rules/src/main/resources/lex/GetFunctionName.lex @@ -72,6 +72,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-metrics/src/main/resources/lex/F90METComplexitySimplified.lex b/fortran90-metrics/src/main/resources/lex/F90METComplexitySimplified.lex index e5be6ad1..80d7075f 100755 --- a/fortran90-metrics/src/main/resources/lex/F90METComplexitySimplified.lex +++ b/fortran90-metrics/src/main/resources/lex/F90METComplexitySimplified.lex @@ -109,6 +109,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran90-metrics/src/main/resources/lex/F90METLineOfCode.lex b/fortran90-metrics/src/main/resources/lex/F90METLineOfCode.lex index c0785271..c178cdc6 100755 --- a/fortran90-metrics/src/main/resources/lex/F90METLineOfCode.lex +++ b/fortran90-metrics/src/main/resources/lex/F90METLineOfCode.lex @@ -95,6 +95,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" this.computeMetric(null, numTotal, 0); return getCheckResults(); %eofval} +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran90-metrics/src/main/resources/lex/F90METLineOfComment.lex b/fortran90-metrics/src/main/resources/lex/F90METLineOfComment.lex index 2a3cf445..d13a6acb 100644 --- a/fortran90-metrics/src/main/resources/lex/F90METLineOfComment.lex +++ b/fortran90-metrics/src/main/resources/lex/F90METLineOfComment.lex @@ -103,6 +103,7 @@ END = END | end this.computeMetric(null, numCommentTotal, 0); return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-metrics/src/main/resources/lex/F90METNesting.lex b/fortran90-metrics/src/main/resources/lex/F90METNesting.lex index 53b32646..41b83774 100755 --- a/fortran90-metrics/src/main/resources/lex/F90METNesting.lex +++ b/fortran90-metrics/src/main/resources/lex/F90METNesting.lex @@ -115,6 +115,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran90-metrics/src/main/resources/lex/F90METRatioComment.lex b/fortran90-metrics/src/main/resources/lex/F90METRatioComment.lex index efe7226a..56a56107 100755 --- a/fortran90-metrics/src/main/resources/lex/F90METRatioComment.lex +++ b/fortran90-metrics/src/main/resources/lex/F90METRatioComment.lex @@ -108,6 +108,7 @@ END = END | end this.computeMetric(null, Float.NaN, 0); return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-rules/src/main/resources/example/ExampleRule.lex b/fortran90-rules/src/main/resources/example/ExampleRule.lex index 3a43324a..83b11209 100755 --- a/fortran90-rules/src/main/resources/example/ExampleRule.lex +++ b/fortran90-rules/src/main/resources/example/ExampleRule.lex @@ -106,7 +106,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" /* Here is where you can declare transition words for the rule. */ RULE_WORD = first_word | SECOND_WORD - +%eofclose %% /* This is the general automaton. Each part will be described later. */ diff --git a/fortran90-rules/src/main/resources/lex/COMDATAFloatCompare.lex b/fortran90-rules/src/main/resources/lex/COMDATAFloatCompare.lex index 1d4f406d..bce0a360 100755 --- a/fortran90-rules/src/main/resources/lex/COMDATAFloatCompare.lex +++ b/fortran90-rules/src/main/resources/lex/COMDATAFloatCompare.lex @@ -98,6 +98,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* Transition word are real, complex and double precision. Whenever this word is */ /* encountered, we store all variables declared. */ diff --git a/fortran90-rules/src/main/resources/lex/COMDATAInitialisation.lex b/fortran90-rules/src/main/resources/lex/COMDATAInitialisation.lex index d9b9e8fa..2d1b15eb 100755 --- a/fortran90-rules/src/main/resources/lex/COMDATAInitialisation.lex +++ b/fortran90-rules/src/main/resources/lex/COMDATAInitialisation.lex @@ -267,6 +267,7 @@ SEE_FUNC = ([^a-zA-Z0-9\_])?("if" | "elseif" | "forall" | "while" | "where" | " displayErrorVariableByType(); return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMDATAInvariant.lex b/fortran90-rules/src/main/resources/lex/COMDATAInvariant.lex index 200d07cb..7c9d3339 100755 --- a/fortran90-rules/src/main/resources/lex/COMDATAInvariant.lex +++ b/fortran90-rules/src/main/resources/lex/COMDATAInvariant.lex @@ -107,7 +107,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMDATALoopCondition.lex b/fortran90-rules/src/main/resources/lex/COMDATALoopCondition.lex index ae13f6e2..5c276391 100755 --- a/fortran90-rules/src/main/resources/lex/COMDATALoopCondition.lex +++ b/fortran90-rules/src/main/resources/lex/COMDATALoopCondition.lex @@ -162,6 +162,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is do (or DO). If this word is met, we focus on out condition */ /* end verifies that it's not modified within the DO-loop. If WHILE is found, */ diff --git a/fortran90-rules/src/main/resources/lex/COMDATANotUsed.lex b/fortran90-rules/src/main/resources/lex/COMDATANotUsed.lex index c7ea4282..4dcae2cc 100755 --- a/fortran90-rules/src/main/resources/lex/COMDATANotUsed.lex +++ b/fortran90-rules/src/main/resources/lex/COMDATANotUsed.lex @@ -98,7 +98,7 @@ EQUAL = \= [^\,\n\"\']* return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMDESIGNActiveWait.lex b/fortran90-rules/src/main/resources/lex/COMDESIGNActiveWait.lex index eaf68e75..a6a9fd91 100755 --- a/fortran90-rules/src/main/resources/lex/COMDESIGNActiveWait.lex +++ b/fortran90-rules/src/main/resources/lex/COMDESIGNActiveWait.lex @@ -73,7 +73,7 @@ WAIT = "sleep" | "wait" | "pause" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMDESIGNAlloc.lex b/fortran90-rules/src/main/resources/lex/COMDESIGNAlloc.lex index 04992490..442f22c0 100755 --- a/fortran90-rules/src/main/resources/lex/COMDESIGNAlloc.lex +++ b/fortran90-rules/src/main/resources/lex/COMDESIGNAlloc.lex @@ -140,7 +140,7 @@ INT = [0-9]+ sortResults(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWAbort.lex b/fortran90-rules/src/main/resources/lex/COMFLOWAbort.lex index 18d6c2d6..ff794866 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWAbort.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWAbort.lex @@ -73,7 +73,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex b/fortran90-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex index 8112babb..0bfa4029 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex @@ -82,7 +82,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex b/fortran90-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex index 03883f2e..e5e7c5d9 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex @@ -75,7 +75,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex b/fortran90-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex index 76deb21b..d9b550ea 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWCheckCodeReturn.lex @@ -228,7 +228,7 @@ AVOIDED = {SPACE}*( "abs" | "achar" | "acos" | "acosh" | "adjustl" | "adjustr" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWCheckUser.lex b/fortran90-rules/src/main/resources/lex/COMFLOWCheckUser.lex index 0c53374c..37e8f3f8 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWCheckUser.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWCheckUser.lex @@ -71,7 +71,7 @@ GETUID = "GETUID"{SPACE}*\({SPACE}*\) %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWExit.lex b/fortran90-rules/src/main/resources/lex/COMFLOWExit.lex index a65bd416..ff77b31c 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWExit.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWExit.lex @@ -78,7 +78,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWExitLoop.lex b/fortran90-rules/src/main/resources/lex/COMFLOWExitLoop.lex index defa6818..d88aa81f 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWExitLoop.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWExitLoop.lex @@ -80,6 +80,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word are STOP, EXIT, CYCLE and GO TO. If these words are met inside */ /* a DO-loop, an error is thrown. */ diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWFileExistence.lex b/fortran90-rules/src/main/resources/lex/COMFLOWFileExistence.lex index cf38ba55..a259adb9 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWFileExistence.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWFileExistence.lex @@ -94,7 +94,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWFilePath.lex b/fortran90-rules/src/main/resources/lex/COMFLOWFilePath.lex index 4084025a..5a70f912 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWFilePath.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWFilePath.lex @@ -78,7 +78,7 @@ FILENAME = \'[\.]*[a-zA-Z\/][a-zA-Z0-9\_\/]*(\.[a-zA-Z0-9]+)?\' | return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMFLOWRecursion.lex b/fortran90-rules/src/main/resources/lex/COMFLOWRecursion.lex index ee1ab8ef..fbafec53 100755 --- a/fortran90-rules/src/main/resources/lex/COMFLOWRecursion.lex +++ b/fortran90-rules/src/main/resources/lex/COMFLOWRecursion.lex @@ -68,6 +68,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* Transition word is recursive (or RECURSIVE). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran90-rules/src/main/resources/lex/COMINSTBoolNegation.lex b/fortran90-rules/src/main/resources/lex/COMINSTBoolNegation.lex index 0522db46..5a3a7d2d 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTBoolNegation.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTBoolNegation.lex @@ -79,7 +79,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMINSTBrace.lex b/fortran90-rules/src/main/resources/lex/COMINSTBrace.lex index fd4a52ec..7ebc812d 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTBrace.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTBrace.lex @@ -141,7 +141,7 @@ SPACE = [\ \r\t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMINSTCodeComment.lex b/fortran90-rules/src/main/resources/lex/COMINSTCodeComment.lex index ab96d1fd..6df83f2b 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTCodeComment.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTCodeComment.lex @@ -146,7 +146,7 @@ SPACE = [\ \r\t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMINSTGoTo.lex b/fortran90-rules/src/main/resources/lex/COMINSTGoTo.lex index febd855d..324a9b8e 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTGoTo.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTGoTo.lex @@ -71,7 +71,7 @@ GOTO = [^a-zA-Z0-9\_]("go") {SPACE}*("to") return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMINSTLine.lex b/fortran90-rules/src/main/resources/lex/COMINSTLine.lex index c6b84a20..e9b1b952 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTLine.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTLine.lex @@ -73,7 +73,7 @@ CHAR = [a-zA-Z0-9] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMINSTLoopCondition.lex b/fortran90-rules/src/main/resources/lex/COMINSTLoopCondition.lex index 59449023..baf6ff0a 100755 --- a/fortran90-rules/src/main/resources/lex/COMINSTLoopCondition.lex +++ b/fortran90-rules/src/main/resources/lex/COMINSTLoopCondition.lex @@ -82,7 +82,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMNAMEHomonymy.lex b/fortran90-rules/src/main/resources/lex/COMNAMEHomonymy.lex index cdeb8d8f..e306f0e0 100755 --- a/fortran90-rules/src/main/resources/lex/COMNAMEHomonymy.lex +++ b/fortran90-rules/src/main/resources/lex/COMNAMEHomonymy.lex @@ -126,7 +126,7 @@ SPACE = [\ \r\t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMPRESIndent.lex b/fortran90-rules/src/main/resources/lex/COMPRESIndent.lex index dce6bec9..5ba39610 100755 --- a/fortran90-rules/src/main/resources/lex/COMPRESIndent.lex +++ b/fortran90-rules/src/main/resources/lex/COMPRESIndent.lex @@ -100,7 +100,7 @@ SPACE = [\ \r\t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMPRESLengthLine.lex b/fortran90-rules/src/main/resources/lex/COMPRESLengthLine.lex index 1496223e..9b767b5a 100755 --- a/fortran90-rules/src/main/resources/lex/COMPRESLengthLine.lex +++ b/fortran90-rules/src/main/resources/lex/COMPRESLengthLine.lex @@ -74,7 +74,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/COMPROJECTHeader.lex b/fortran90-rules/src/main/resources/lex/COMPROJECTHeader.lex index 5975de0e..6800a733 100755 --- a/fortran90-rules/src/main/resources/lex/COMPROJECTHeader.lex +++ b/fortran90-rules/src/main/resources/lex/COMPROJECTHeader.lex @@ -200,6 +200,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* There is no specific rule word in this rule. However, we define END to avoid */ /* CheckResult on FUNCTION put after END. */ diff --git a/fortran90-rules/src/main/resources/lex/COMTYPEExpression.lex b/fortran90-rules/src/main/resources/lex/COMTYPEExpression.lex index 9c95e953..f8c6552b 100755 --- a/fortran90-rules/src/main/resources/lex/COMTYPEExpression.lex +++ b/fortran90-rules/src/main/resources/lex/COMTYPEExpression.lex @@ -144,7 +144,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90BLOCFile.lex b/fortran90-rules/src/main/resources/lex/F90BLOCFile.lex index c36186dc..bb9ec391 100755 --- a/fortran90-rules/src/main/resources/lex/F90BLOCFile.lex +++ b/fortran90-rules/src/main/resources/lex/F90BLOCFile.lex @@ -104,7 +104,7 @@ UNIT = (("unit"){SPACE}*("="))?{SPACE}*{VAR} checkOpenClose(); return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90DATAArray.lex b/fortran90-rules/src/main/resources/lex/F90DATAArray.lex index e56dba19..56495388 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAArray.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAArray.lex @@ -91,7 +91,7 @@ SPACE = [\ \t\f\r] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATAArrayAccess.lex b/fortran90-rules/src/main/resources/lex/F90DATAArrayAccess.lex index 0f147a7a..a59963c6 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAArrayAccess.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAArrayAccess.lex @@ -106,7 +106,7 @@ SPACE = [\ \t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATAConstant.lex b/fortran90-rules/src/main/resources/lex/F90DATAConstant.lex index a3f1d69e..b47009ce 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAConstant.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAConstant.lex @@ -88,7 +88,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATAConstantFloat.lex b/fortran90-rules/src/main/resources/lex/F90DATAConstantFloat.lex index 01365340..5e25a4c5 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAConstantFloat.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAConstantFloat.lex @@ -101,7 +101,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATADeclaration.lex b/fortran90-rules/src/main/resources/lex/F90DATADeclaration.lex index 16b95b3a..a6203249 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATADeclaration.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATADeclaration.lex @@ -152,7 +152,7 @@ SPACE = [\ \t\f\r] comparerError(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATAFloat.lex b/fortran90-rules/src/main/resources/lex/F90DATAFloat.lex index 0c43c711..38ff9002 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAFloat.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAFloat.lex @@ -105,7 +105,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DATAParameter.lex b/fortran90-rules/src/main/resources/lex/F90DATAParameter.lex index aa13018f..209350e5 100755 --- a/fortran90-rules/src/main/resources/lex/F90DATAParameter.lex +++ b/fortran90-rules/src/main/resources/lex/F90DATAParameter.lex @@ -92,7 +92,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNFree.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNFree.lex index 2710d5b5..25d4725b 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNFree.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNFree.lex @@ -91,7 +91,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNIO.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNIO.lex index 949681b9..14500299 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNIO.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNIO.lex @@ -102,7 +102,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNInclude.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNInclude.lex index 70a5d2ea..d10c862a 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNInclude.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNInclude.lex @@ -78,6 +78,7 @@ INCLUDE = [^a-zA-Z0-9\_]("include"){SPACE}+{STRING} return getCheckResults(); %eofval} +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNInterface.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNInterface.lex index a0c4e22f..d24aac10 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNInterface.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNInterface.lex @@ -81,7 +81,7 @@ ERROR = "allocatable" | "allocate" | "assign" | "backspace" | "block" | "call" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNObsolete.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNObsolete.lex index ebcde570..e4f67303 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNObsolete.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNObsolete.lex @@ -139,7 +139,7 @@ CHAR = "character" {SPACE}* \* sortResults(); return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteArithmeticalIf.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteArithmeticalIf.lex index d612f33b..4da8ad0c 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteArithmeticalIf.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteArithmeticalIf.lex @@ -75,6 +75,7 @@ INT = [0-9]+ %eofval{ return getCheckResults(); %eofval} +%eofclose /* An integer called LAST_STATE is used to avoid error due to line continuation. */ %{ diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoEnding.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoEnding.lex index 56f06cb3..2c114c01 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoEnding.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoEnding.lex @@ -74,6 +74,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* The word to catch are DO, END DO and CONTINUE. **/ DO = [^a-zA-Z0-9\_]("do")[^a-zA-Z0-9\_] diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoReal.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoReal.lex index e23c6a6f..854e5ce3 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoReal.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoReal.lex @@ -77,6 +77,7 @@ SPACE = [\ \t\r] %eofval{ return getCheckResults(); %eofval} +%eofclose /* A boolean called error is to determine if a non integer value is found. */ /* A list of String will contain name of declared variables. */ diff --git a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoShared.lex b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoShared.lex index 40212dad..2714c78e 100755 --- a/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoShared.lex +++ b/fortran90-rules/src/main/resources/lex/F90DESIGNObsoleteDoShared.lex @@ -84,6 +84,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is else (or ELSE). We also look for DO, END, THEN and IF. */ DO = do | DO diff --git a/fortran90-rules/src/main/resources/lex/F90ERRAllocate.lex b/fortran90-rules/src/main/resources/lex/F90ERRAllocate.lex index cf84f3cc..14469fbb 100755 --- a/fortran90-rules/src/main/resources/lex/F90ERRAllocate.lex +++ b/fortran90-rules/src/main/resources/lex/F90ERRAllocate.lex @@ -101,7 +101,7 @@ SPACE = [\ \t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90ERROpenRead.lex b/fortran90-rules/src/main/resources/lex/F90ERROpenRead.lex index 22a679e3..c57bbd37 100755 --- a/fortran90-rules/src/main/resources/lex/F90ERROpenRead.lex +++ b/fortran90-rules/src/main/resources/lex/F90ERROpenRead.lex @@ -98,7 +98,7 @@ IOSTAT = ("iostat") {SPACE}* \= {SPACE}* {VAR} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90INSTAssociated.lex b/fortran90-rules/src/main/resources/lex/F90INSTAssociated.lex index a6b42adf..e2ed221a 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTAssociated.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTAssociated.lex @@ -92,7 +92,7 @@ ASSOCIATED = ("associated") return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTEntry.lex b/fortran90-rules/src/main/resources/lex/F90INSTEntry.lex index a8beddee..cf4c88aa 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTEntry.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTEntry.lex @@ -66,6 +66,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} +%eofclose /* Transition word is entry (or ENTRY). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran90-rules/src/main/resources/lex/F90INSTEquivalence.lex b/fortran90-rules/src/main/resources/lex/F90INSTEquivalence.lex index 8bdf2c3c..fa7c3abf 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTEquivalence.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTEquivalence.lex @@ -74,7 +74,7 @@ EQUIV = [^a-zA-Z0-9\_]("equivalence")[^a-zA-Z0-9\_] return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTIf.lex b/fortran90-rules/src/main/resources/lex/F90INSTIf.lex index b2d1fbab..3ec2b9e0 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTIf.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTIf.lex @@ -81,7 +81,7 @@ BRANCH = [^a-zA-Z0-9\_]("exit" | "cycle" | "goto" | "return")[^a-zA-Z0-9\_] return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTIntent.lex b/fortran90-rules/src/main/resources/lex/F90INSTIntent.lex index 9aa634df..356c1f5f 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTIntent.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTIntent.lex @@ -99,7 +99,7 @@ SPACE = [\ \t\f] return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90INSTNullify.lex b/fortran90-rules/src/main/resources/lex/F90INSTNullify.lex index 07d16227..65578c47 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTNullify.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTNullify.lex @@ -88,7 +88,7 @@ NULLIFY = [^a-zA-Z0-9\_]("nullify"){SPACE}*("(") return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTOnly.lex b/fortran90-rules/src/main/resources/lex/F90INSTOnly.lex index b7caeee4..42129968 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTOnly.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTOnly.lex @@ -76,7 +76,7 @@ ONLY = "only" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTOperator.lex b/fortran90-rules/src/main/resources/lex/F90INSTOperator.lex index 202b922e..f80a08ca 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTOperator.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTOperator.lex @@ -74,7 +74,7 @@ OP_RELAT = ".eq." | ".ne." | ".lt." | ".le." | ".gt." | ".ge." return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90INSTPointer.lex b/fortran90-rules/src/main/resources/lex/F90INSTPointer.lex index af0076e6..360c233a 100755 --- a/fortran90-rules/src/main/resources/lex/F90INSTPointer.lex +++ b/fortran90-rules/src/main/resources/lex/F90INSTPointer.lex @@ -78,7 +78,7 @@ TIPUS = "type" return getCheckResults(); %eofval} - +%eofclose %% {COMMENT_WORD} {yybegin(COMMENT);} diff --git a/fortran90-rules/src/main/resources/lex/F90NAMEGenericIntrinsic.lex b/fortran90-rules/src/main/resources/lex/F90NAMEGenericIntrinsic.lex index 6957ae74..6b1545c6 100755 --- a/fortran90-rules/src/main/resources/lex/F90NAMEGenericIntrinsic.lex +++ b/fortran90-rules/src/main/resources/lex/F90NAMEGenericIntrinsic.lex @@ -88,6 +88,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* Transition word is entry (or ENTRY). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran90-rules/src/main/resources/lex/F90NAMEKeyWords.lex b/fortran90-rules/src/main/resources/lex/F90NAMEKeyWords.lex index ea0c9246..6d48c1c9 100755 --- a/fortran90-rules/src/main/resources/lex/F90NAMEKeyWords.lex +++ b/fortran90-rules/src/main/resources/lex/F90NAMEKeyWords.lex @@ -118,6 +118,7 @@ SPACE = [\ \t\f] return getCheckResults(); %eofval} +%eofclose /* Transition word is entry (or ENTRY). This word must not be found. */ /* Whenever it's found, an error is returned. */ diff --git a/fortran90-rules/src/main/resources/lex/F90PROTOOverload.lex b/fortran90-rules/src/main/resources/lex/F90PROTOOverload.lex index 24c7ae9e..85a365df 100755 --- a/fortran90-rules/src/main/resources/lex/F90PROTOOverload.lex +++ b/fortran90-rules/src/main/resources/lex/F90PROTOOverload.lex @@ -81,7 +81,7 @@ OPERATEUR = "+" | "-" | "*" | "/" | "**" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90REFArray.lex b/fortran90-rules/src/main/resources/lex/F90REFArray.lex index 8da68dae..ea022547 100755 --- a/fortran90-rules/src/main/resources/lex/F90REFArray.lex +++ b/fortran90-rules/src/main/resources/lex/F90REFArray.lex @@ -91,7 +91,7 @@ SPACE = [\ \t\f] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90REFInterface.lex b/fortran90-rules/src/main/resources/lex/F90REFInterface.lex index 031ecde2..6be9824d 100755 --- a/fortran90-rules/src/main/resources/lex/F90REFInterface.lex +++ b/fortran90-rules/src/main/resources/lex/F90REFInterface.lex @@ -123,7 +123,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90REFLabel.lex b/fortran90-rules/src/main/resources/lex/F90REFLabel.lex index d62b40a9..8d19c879 100755 --- a/fortran90-rules/src/main/resources/lex/F90REFLabel.lex +++ b/fortran90-rules/src/main/resources/lex/F90REFLabel.lex @@ -85,7 +85,7 @@ FALSE_END = ("end"[\ ]*"if") | ("end"[\ ]*"do") | ("end"[\ ]*"file") | ("end"[\ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90REFOpen.lex b/fortran90-rules/src/main/resources/lex/F90REFOpen.lex index cf0205cb..ec584a95 100755 --- a/fortran90-rules/src/main/resources/lex/F90REFOpen.lex +++ b/fortran90-rules/src/main/resources/lex/F90REFOpen.lex @@ -122,6 +122,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} +%eofclose /* Rule words are FILE, SCRATCH, STATUS, UNKNOWN and POSITION. */ /* The main rule word is OPEN, to see when an OPEN statement starts. */ diff --git a/fortran90-rules/src/main/resources/lex/F90REFVariable.lex b/fortran90-rules/src/main/resources/lex/F90REFVariable.lex index 6c87cd46..6951a93c 100755 --- a/fortran90-rules/src/main/resources/lex/F90REFVariable.lex +++ b/fortran90-rules/src/main/resources/lex/F90REFVariable.lex @@ -115,7 +115,7 @@ PARAM = \( [^\)]* \) return getCheckResults(); %eofval} - +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90TYPEDerivate.lex b/fortran90-rules/src/main/resources/lex/F90TYPEDerivate.lex index 39e5b7c7..a9782584 100755 --- a/fortran90-rules/src/main/resources/lex/F90TYPEDerivate.lex +++ b/fortran90-rules/src/main/resources/lex/F90TYPEDerivate.lex @@ -73,6 +73,7 @@ END_STRUCT = "end"{SPACE}*"type" %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90TYPEInteger.lex b/fortran90-rules/src/main/resources/lex/F90TYPEInteger.lex index eeeefcf0..8ffdd98e 100755 --- a/fortran90-rules/src/main/resources/lex/F90TYPEInteger.lex +++ b/fortran90-rules/src/main/resources/lex/F90TYPEInteger.lex @@ -81,6 +81,7 @@ SELECTED = ("selected_")("int"|"real"|"char")("_kind") %eofval{ return getCheckResults(); %eofval} +%eofclose %% diff --git a/fortran90-rules/src/main/resources/lex/F90TYPEReal.lex b/fortran90-rules/src/main/resources/lex/F90TYPEReal.lex index 6ed33c28..0041687d 100755 --- a/fortran90-rules/src/main/resources/lex/F90TYPEReal.lex +++ b/fortran90-rules/src/main/resources/lex/F90TYPEReal.lex @@ -79,6 +79,7 @@ ERROR = ( "real" | ("double"){SPACE}*("precision") | "complex" ) return getCheckResults(); %eofval} +%eofclose %% diff --git a/icode-app/src/main/java/fr/cnes/icode/application/CommandLineManager.java b/icode-app/src/main/java/fr/cnes/icode/application/CommandLineManager.java index d9d298a2..c5147619 100644 --- a/icode-app/src/main/java/fr/cnes/icode/application/CommandLineManager.java +++ b/icode-app/src/main/java/fr/cnes/icode/application/CommandLineManager.java @@ -14,8 +14,6 @@ /** * Manage the command line by parsing it and providing preprocessed data. - * - * @author lequal */ public class CommandLineManager { @@ -150,7 +148,7 @@ public boolean parse(final String[] pArgs) { if(!areOptionsCorrect || commandLine.hasOption(HELP)) { helpFormatter.printHelp(128, "icode [ [...]]", "Analyze Shell, F77 & F90 code to find defects & bugs.\n\n", options, - "\n\nPlease report issues at https://github.com/lequal/i-CodeCNES/issues", true); + "\n\nPlease report issues at https://github.com/cnescatlab/i-CodeCNES/issues", true); // If version option is present, version information are displayed. } else if (commandLine.hasOption(VERSION)) { final String title = getClass().getPackage().getImplementationTitle(); diff --git a/icode-app/src/main/java/fr/cnes/icode/application/DisplayFormatter.java b/icode-app/src/main/java/fr/cnes/icode/application/DisplayFormatter.java index 8893f316..56f6c4f4 100644 --- a/icode-app/src/main/java/fr/cnes/icode/application/DisplayFormatter.java +++ b/icode-app/src/main/java/fr/cnes/icode/application/DisplayFormatter.java @@ -11,8 +11,6 @@ /** * Format log message to be displayed on the console. - * - * @author lequal */ public class DisplayFormatter extends Formatter { diff --git a/icode-app/src/main/java/fr/cnes/icode/application/ICodeApplication.java b/icode-app/src/main/java/fr/cnes/icode/application/ICodeApplication.java index 6ab81bab..1e5552a6 100644 --- a/icode-app/src/main/java/fr/cnes/icode/application/ICodeApplication.java +++ b/icode-app/src/main/java/fr/cnes/icode/application/ICodeApplication.java @@ -30,8 +30,6 @@ /** * This class provide a main command line application to * use i-Code in a console without GUI. - * - * @author lequal */ public class ICodeApplication { diff --git a/icode-core/src/main/java/fr/cnes/icode/exception/JFlexException.java b/icode-core/src/main/java/fr/cnes/icode/exception/JFlexException.java index 50c8e8e7..e796a5a0 100644 --- a/icode-core/src/main/java/fr/cnes/icode/exception/JFlexException.java +++ b/icode-core/src/main/java/fr/cnes/icode/exception/JFlexException.java @@ -94,7 +94,7 @@ private static String errorMessage(String pRuleName, String pFileName, String pM + "Last word scanned: [" + pLastScan + "] [" + toDecimalCode(pLastScan) + "]" + BLANK - + "Please report this issue on : https://github.com/lequal/i-CodeCNES/issues/"; + + "Please report this issue on : https://github.com/cnescatlab/i-CodeCNES/issues/"; return message; } diff --git a/icode-ide/fr.cnes.analysis.tools.ui/META-INF/MANIFEST.MF b/icode-ide/fr.cnes.analysis.tools.ui/META-INF/MANIFEST.MF index 3f62630c..d47cf5b8 100755 --- a/icode-ide/fr.cnes.analysis.tools.ui/META-INF/MANIFEST.MF +++ b/icode-ide/fr.cnes.analysis.tools.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: i-Code CNES UI Bundle-SymbolicName: fr.cnes.analysis.tools.ui;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.1.qualifier Bundle-Activator: fr.cnes.analysis.tools.ui.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", org.eclipse.ui;bundle-version="3.107.0", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", org.eclipse.ui.editors;bundle-version="3.9.0", org.eclipse.e4.core.di;bundle-version="1.6.0", org.eclipse.jface, - icode.library.plugin;bundle-version="4.1.0" + icode.library.plugin;bundle-version="4.1.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: fr.cnes.analysis.tools.ui.exception, diff --git a/icode-ide/fr.cnes.analysis.tools.ui/pom.xml b/icode-ide/fr.cnes.analysis.tools.ui/pom.xml index 1ae39f76..529a8847 100644 --- a/icode-ide/fr.cnes.analysis.tools.ui/pom.xml +++ b/icode-ide/fr.cnes.analysis.tools.ui/pom.xml @@ -6,7 +6,7 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT fr.cnes.analysis.tools.ui diff --git a/icode-ide/fr.cnes.icode.feature.ui/feature.xml b/icode-ide/fr.cnes.icode.feature.ui/feature.xml index 3c04288b..ff520f0e 100644 --- a/icode-ide/fr.cnes.icode.feature.ui/feature.xml +++ b/icode-ide/fr.cnes.icode.feature.ui/feature.xml @@ -2,7 +2,7 @@ diff --git a/icode-ide/fr.cnes.icode.feature.ui/pom.xml b/icode-ide/fr.cnes.icode.feature.ui/pom.xml index 5c657356..ee4d9d78 100644 --- a/icode-ide/fr.cnes.icode.feature.ui/pom.xml +++ b/icode-ide/fr.cnes.icode.feature.ui/pom.xml @@ -6,7 +6,7 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT fr.cnes.icode.feature.ui diff --git a/icode-ide/fr.cnes.icode.repository/category.xml b/icode-ide/fr.cnes.icode.repository/category.xml index fe971971..d0125bf2 100755 --- a/icode-ide/fr.cnes.icode.repository/category.xml +++ b/icode-ide/fr.cnes.icode.repository/category.xml @@ -1,7 +1,7 @@ - + diff --git a/icode-ide/fr.cnes.icode.repository/icode-ide.product b/icode-ide/fr.cnes.icode.repository/icode-ide.product index acec25e3..c1ba9d51 100644 --- a/icode-ide/fr.cnes.icode.repository/icode-ide.product +++ b/icode-ide/fr.cnes.icode.repository/icode-ide.product @@ -1,7 +1,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/icode-ide/fr.cnes.icode.repository/pom.xml b/icode-ide/fr.cnes.icode.repository/pom.xml index 585cb708..aef25a64 100644 --- a/icode-ide/fr.cnes.icode.repository/pom.xml +++ b/icode-ide/fr.cnes.icode.repository/pom.xml @@ -6,11 +6,11 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT fr.cnes.icode.repository - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT eclipse-repository diff --git a/icode-ide/fr.cnes.icode.tp/pom.xml b/icode-ide/fr.cnes.icode.tp/pom.xml index 2b6dd355..2a366eef 100644 --- a/icode-ide/fr.cnes.icode.tp/pom.xml +++ b/icode-ide/fr.cnes.icode.tp/pom.xml @@ -5,7 +5,7 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT fr.cnes.icode.tp diff --git a/icode-ide/icode-library-feature/feature.xml b/icode-ide/icode-library-feature/feature.xml index 94434d2a..0bd52ea7 100644 --- a/icode-ide/icode-library-feature/feature.xml +++ b/icode-ide/icode-library-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/icode-ide/icode-library-feature/pom.xml b/icode-ide/icode-library-feature/pom.xml index 0ffc8ef8..93ace916 100644 --- a/icode-ide/icode-library-feature/pom.xml +++ b/icode-ide/icode-library-feature/pom.xml @@ -6,7 +6,7 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT icode.library.feature diff --git a/icode-ide/icode-library-plugin/META-INF/MANIFEST.MF b/icode-ide/icode-library-plugin/META-INF/MANIFEST.MF index cb7d6640..f6383467 100644 --- a/icode-ide/icode-library-plugin/META-INF/MANIFEST.MF +++ b/icode-ide/icode-library-plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: i-Code Library Plugin Bundle-SymbolicName: icode.library.plugin;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.1.qualifier Bundle-ClassPath: target/lib/icode-library.jar Bundle-Vendor: CNES Export-Package: com.google.common.annotations, diff --git a/icode-ide/icode-library-plugin/pom.xml b/icode-ide/icode-library-plugin/pom.xml index af477940..44a3f315 100644 --- a/icode-ide/icode-library-plugin/pom.xml +++ b/icode-ide/icode-library-plugin/pom.xml @@ -6,7 +6,7 @@ fr.cnes.icode icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT icode.library.plugin diff --git a/icode-ide/pom.xml b/icode-ide/pom.xml index f7c7acbd..ecbac782 100644 --- a/icode-ide/pom.xml +++ b/icode-ide/pom.xml @@ -11,7 +11,7 @@ icode-ide - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT pom i-Code CNES IDE diff --git a/pom.xml b/pom.xml index 63830de5..898f6d39 100644 --- a/pom.xml +++ b/pom.xml @@ -43,14 +43,14 @@ GitHub - https://github.com/lequal/i-CodeCNES/issues + https://github.com/cnescatlab/i-CodeCNES/issues Travis-CI - https://travis-ci.org/lequal/i-CodeCNES + https://travis-ci.org/cnescatlab/i-CodeCNES - https://github.com/lequal/i-CodeCNES + https://github.com/cnescatlab/i-CodeCNES @@ -64,13 +64,13 @@ github - GitHub LEQUAL Apache Maven Packages - https://maven.pkg.github.com/LEQUAL/i-CodeCNES + GitHub CNES CatLab Apache Maven Packages + https://maven.pkg.github.com/cnescatlab/i-CodeCNES - 4.1.0 + 4.1.1 UTF-8 UTF-8 1.8 diff --git a/shell-metrics/src/main/resources/lex/SHMETComplexitySimplified.lex b/shell-metrics/src/main/resources/lex/SHMETComplexitySimplified.lex index 8e070649..d6d12568 100755 --- a/shell-metrics/src/main/resources/lex/SHMETComplexitySimplified.lex +++ b/shell-metrics/src/main/resources/lex/SHMETComplexitySimplified.lex @@ -121,6 +121,7 @@ CASE_STATEMENT = ({SPACE}*([^\space\(\)\n]*|{VAR})+{SPACE}*)([\|]({SPACE}*([^\s this.computeMetric(null, mainComplexity+totalComplexity, 0); return getCheckResults(); %eofval} +%eofclose %% /************************/ diff --git a/shell-metrics/src/main/resources/lex/SHMETLineOfCode.lex b/shell-metrics/src/main/resources/lex/SHMETLineOfCode.lex index 585c1278..971cc1ad 100755 --- a/shell-metrics/src/main/resources/lex/SHMETLineOfCode.lex +++ b/shell-metrics/src/main/resources/lex/SHMETLineOfCode.lex @@ -146,6 +146,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" this.computeMetric(null, linesTotal, 0); return getCheckResults(); %eofval} +%eofclose %% /************************/ diff --git a/shell-metrics/src/main/resources/lex/SHMETLineOfComment.lex b/shell-metrics/src/main/resources/lex/SHMETLineOfComment.lex index cd7e3079..fe267933 100644 --- a/shell-metrics/src/main/resources/lex/SHMETLineOfComment.lex +++ b/shell-metrics/src/main/resources/lex/SHMETLineOfComment.lex @@ -165,6 +165,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" return getCheckResults(); %eofval} +%eofclose %% /************************/ diff --git a/shell-metrics/src/main/resources/lex/SHMETNesting.lex b/shell-metrics/src/main/resources/lex/SHMETNesting.lex index 4f5dc677..80adc4ae 100755 --- a/shell-metrics/src/main/resources/lex/SHMETNesting.lex +++ b/shell-metrics/src/main/resources/lex/SHMETNesting.lex @@ -120,6 +120,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" this.computeMetric(null, mainMaxNesting, 0); return getCheckResults(); %eofval} +%eofclose %% /************************/ diff --git a/shell-metrics/src/main/resources/lex/SHMETRatioComment.lex b/shell-metrics/src/main/resources/lex/SHMETRatioComment.lex index 761ae6bf..5356e04e 100755 --- a/shell-metrics/src/main/resources/lex/SHMETRatioComment.lex +++ b/shell-metrics/src/main/resources/lex/SHMETRatioComment.lex @@ -176,6 +176,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" } return getCheckResults(); %eofval} +%eofclose %% /************************/ diff --git a/shell-rules/src/main/resources/lex/COMDATAInitialisation.lex b/shell-rules/src/main/resources/lex/COMDATAInitialisation.lex index 03c71bc2..a03f4071 100755 --- a/shell-rules/src/main/resources/lex/COMDATAInitialisation.lex +++ b/shell-rules/src/main/resources/lex/COMDATAInitialisation.lex @@ -169,7 +169,7 @@ OPTION = \- ("a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "k" | %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMDATAInvariant.lex b/shell-rules/src/main/resources/lex/COMDATAInvariant.lex index 27833a06..5c55eafa 100755 --- a/shell-rules/src/main/resources/lex/COMDATAInvariant.lex +++ b/shell-rules/src/main/resources/lex/COMDATAInvariant.lex @@ -315,7 +315,7 @@ CLE = "alias" | "apropos" | "apt-get" | "aptitude" | "ascp" | "aspell" | } return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMDATALoopCondition.lex b/shell-rules/src/main/resources/lex/COMDATALoopCondition.lex index 8fcd8abd..3b3df7af 100755 --- a/shell-rules/src/main/resources/lex/COMDATALoopCondition.lex +++ b/shell-rules/src/main/resources/lex/COMDATALoopCondition.lex @@ -133,7 +133,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMDATANotUsed.lex b/shell-rules/src/main/resources/lex/COMDATANotUsed.lex index f6783434..5f576f36 100755 --- a/shell-rules/src/main/resources/lex/COMDATANotUsed.lex +++ b/shell-rules/src/main/resources/lex/COMDATANotUsed.lex @@ -98,7 +98,7 @@ VAR = [a-zA-Z][a-zA-Z0-9\_]* notUsedVariables(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMDESIGNActiveWait.lex b/shell-rules/src/main/resources/lex/COMDESIGNActiveWait.lex index 564de42b..d8159a70 100755 --- a/shell-rules/src/main/resources/lex/COMDESIGNActiveWait.lex +++ b/shell-rules/src/main/resources/lex/COMDESIGNActiveWait.lex @@ -108,7 +108,7 @@ ACTWAIT = "read" | "sleep" | "wait" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWAbort.lex b/shell-rules/src/main/resources/lex/COMFLOWAbort.lex index 01afc1e3..a624aa33 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWAbort.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWAbort.lex @@ -106,7 +106,7 @@ OPTIONS = \- ("9" | "SIGKILL" | "kill") %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex b/shell-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex index b12d62df..8af42e07 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWBooleanExpression.lex @@ -74,7 +74,7 @@ BOOL = \|\| | \&\& | \-"o" | \-"a" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex b/shell-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex index 9244b935..a611d1fb 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWCaseSwitch.lex @@ -107,7 +107,7 @@ ESAC = "esac" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWExit.lex b/shell-rules/src/main/resources/lex/COMFLOWExit.lex index 17b15f34..de927aa2 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWExit.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWExit.lex @@ -72,7 +72,7 @@ RETURN = "return" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWExitLoop.lex b/shell-rules/src/main/resources/lex/COMFLOWExitLoop.lex index eea57347..a7fc5827 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWExitLoop.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWExitLoop.lex @@ -77,7 +77,7 @@ BREAK = "break" | "exit" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWFileExistence.lex b/shell-rules/src/main/resources/lex/COMFLOWFileExistence.lex index 00cd835e..7c7f1e55 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWFileExistence.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWFileExistence.lex @@ -150,7 +150,7 @@ IGNORE = {REDIRECT_IGNORE} | {STRING_ESCAPED} | ([\\][\#]) | "ssh" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWFilePath.lex b/shell-rules/src/main/resources/lex/COMFLOWFilePath.lex index a43c6f2e..b377e793 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWFilePath.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWFilePath.lex @@ -135,7 +135,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMFLOWRecursion.lex b/shell-rules/src/main/resources/lex/COMFLOWRecursion.lex index 8001129c..bddfbe44 100755 --- a/shell-rules/src/main/resources/lex/COMFLOWRecursion.lex +++ b/shell-rules/src/main/resources/lex/COMFLOWRecursion.lex @@ -154,7 +154,7 @@ IGNORE_STRING_S = [\\][\'] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMINSTBoolNegation.lex b/shell-rules/src/main/resources/lex/COMINSTBoolNegation.lex index 6f9748fe..c9eaa3f2 100755 --- a/shell-rules/src/main/resources/lex/COMINSTBoolNegation.lex +++ b/shell-rules/src/main/resources/lex/COMINSTBoolNegation.lex @@ -111,7 +111,7 @@ OPER = \&\& | \|\| | \-"o" | \-"a" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMINSTBrace.lex b/shell-rules/src/main/resources/lex/COMINSTBrace.lex index 9d5243db..4821a1be 100755 --- a/shell-rules/src/main/resources/lex/COMINSTBrace.lex +++ b/shell-rules/src/main/resources/lex/COMINSTBrace.lex @@ -134,7 +134,7 @@ BRACING = "expr" | "let" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMINSTCodeComment.lex b/shell-rules/src/main/resources/lex/COMINSTCodeComment.lex index 807efd35..bc7b579f 100755 --- a/shell-rules/src/main/resources/lex/COMINSTCodeComment.lex +++ b/shell-rules/src/main/resources/lex/COMINSTCodeComment.lex @@ -125,7 +125,7 @@ CLE = {RESERVED}| {POSIX} | {BUILTINS} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMINSTLine.lex b/shell-rules/src/main/resources/lex/COMINSTLine.lex index 76fda46b..d432566d 100755 --- a/shell-rules/src/main/resources/lex/COMINSTLine.lex +++ b/shell-rules/src/main/resources/lex/COMINSTLine.lex @@ -88,7 +88,7 @@ CONDITIONAL_STRUCT = [\[][\[]({VAR}|{SPACE}|{VALUE}|{OPERATOR}|{BRACKET})*[\]][ %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMINSTLoopCondition.lex b/shell-rules/src/main/resources/lex/COMINSTLoopCondition.lex index 38ec1d96..0752d907 100755 --- a/shell-rules/src/main/resources/lex/COMINSTLoopCondition.lex +++ b/shell-rules/src/main/resources/lex/COMINSTLoopCondition.lex @@ -85,7 +85,7 @@ LOOP = {WHILE} | {UNTIL} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMNAMEHomonymy.lex b/shell-rules/src/main/resources/lex/COMNAMEHomonymy.lex index 70d82057..e3ea64fe 100755 --- a/shell-rules/src/main/resources/lex/COMNAMEHomonymy.lex +++ b/shell-rules/src/main/resources/lex/COMNAMEHomonymy.lex @@ -232,7 +232,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMPRESHeader.lex b/shell-rules/src/main/resources/lex/COMPRESHeader.lex index 1f7198dd..f661f16f 100755 --- a/shell-rules/src/main/resources/lex/COMPRESHeader.lex +++ b/shell-rules/src/main/resources/lex/COMPRESHeader.lex @@ -127,7 +127,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMPRESIndent.lex b/shell-rules/src/main/resources/lex/COMPRESIndent.lex index 7bef91e2..28ce2631 100755 --- a/shell-rules/src/main/resources/lex/COMPRESIndent.lex +++ b/shell-rules/src/main/resources/lex/COMPRESIndent.lex @@ -200,7 +200,7 @@ IGNORETEXT = "<<" {SPACE}* "EOF" [^"<<"]* "EOF" | ` [^`]* ` %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMPRESLengthLine.lex b/shell-rules/src/main/resources/lex/COMPRESLengthLine.lex index ee1d1aa3..278db5f9 100755 --- a/shell-rules/src/main/resources/lex/COMPRESLengthLine.lex +++ b/shell-rules/src/main/resources/lex/COMPRESLengthLine.lex @@ -112,7 +112,7 @@ IGNORE_STRING_S = [\\][\'] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/COMTYPEExpression.lex b/shell-rules/src/main/resources/lex/COMTYPEExpression.lex index 424dd1c1..bd8a0fe1 100755 --- a/shell-rules/src/main/resources/lex/COMTYPEExpression.lex +++ b/shell-rules/src/main/resources/lex/COMTYPEExpression.lex @@ -117,7 +117,7 @@ EXPR = {VARIABLE} {SPACE}+ {OPER} {SPACE}+ ({STRING}|{INT}|{VARIABLE}) %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHDATAIFS.lex b/shell-rules/src/main/resources/lex/SHDATAIFS.lex index 9658d2f9..aa829297 100755 --- a/shell-rules/src/main/resources/lex/SHDATAIFS.lex +++ b/shell-rules/src/main/resources/lex/SHDATAIFS.lex @@ -72,7 +72,7 @@ IFS = "IFS"\= %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHDATAInteger.lex b/shell-rules/src/main/resources/lex/SHDATAInteger.lex index cbdb35d9..2d1f1f37 100755 --- a/shell-rules/src/main/resources/lex/SHDATAInteger.lex +++ b/shell-rules/src/main/resources/lex/SHDATAInteger.lex @@ -78,7 +78,7 @@ TYPESET = "typeset"{SPACE}+\-"i" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHDESIGNBash.lex b/shell-rules/src/main/resources/lex/SHDESIGNBash.lex index c45a94a9..ef15ebb6 100755 --- a/shell-rules/src/main/resources/lex/SHDESIGNBash.lex +++ b/shell-rules/src/main/resources/lex/SHDESIGNBash.lex @@ -69,7 +69,7 @@ CORRECT = \#\!\/"bin"\/"bash" | %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHDESIGNOptions.lex b/shell-rules/src/main/resources/lex/SHDESIGNOptions.lex index d78022b9..085897a7 100755 --- a/shell-rules/src/main/resources/lex/SHDESIGNOptions.lex +++ b/shell-rules/src/main/resources/lex/SHDESIGNOptions.lex @@ -91,7 +91,7 @@ ESAC = "esac" } return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHERRHelp.lex b/shell-rules/src/main/resources/lex/SHERRHelp.lex index fbc28ae3..988df570 100755 --- a/shell-rules/src/main/resources/lex/SHERRHelp.lex +++ b/shell-rules/src/main/resources/lex/SHERRHelp.lex @@ -95,7 +95,7 @@ HELP = "help" } return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHERRNoPipe.lex b/shell-rules/src/main/resources/lex/SHERRNoPipe.lex index 28f51f8b..a84fe0ba 100755 --- a/shell-rules/src/main/resources/lex/SHERRNoPipe.lex +++ b/shell-rules/src/main/resources/lex/SHERRNoPipe.lex @@ -88,7 +88,7 @@ OR = \|\| %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHERRString.lex b/shell-rules/src/main/resources/lex/SHERRString.lex index 21e8ae08..3f35d407 100755 --- a/shell-rules/src/main/resources/lex/SHERRString.lex +++ b/shell-rules/src/main/resources/lex/SHERRString.lex @@ -72,7 +72,7 @@ COMPARISON = ("if" | "while") {SPACE}* \[ {SPACE} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHFLOWCheckArguments.lex b/shell-rules/src/main/resources/lex/SHFLOWCheckArguments.lex index 10ed60b9..de9d0db4 100755 --- a/shell-rules/src/main/resources/lex/SHFLOWCheckArguments.lex +++ b/shell-rules/src/main/resources/lex/SHFLOWCheckArguments.lex @@ -75,7 +75,7 @@ NUMBER_PARAMS = \$\# | \$\{\#\} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHFLOWCheckCodeReturn.lex b/shell-rules/src/main/resources/lex/SHFLOWCheckCodeReturn.lex index 9963aeab..a23bfe4e 100755 --- a/shell-rules/src/main/resources/lex/SHFLOWCheckCodeReturn.lex +++ b/shell-rules/src/main/resources/lex/SHFLOWCheckCodeReturn.lex @@ -164,7 +164,7 @@ IGNORE_STRING_S = [\\][\'] /* The eofval function MUST NOT be used in combination with EOF recognition in states (exclusive). */ /* ------------------------------------------------------------------------------------------------- */ - +%eofclose %% @@ -394,4 +394,4 @@ IGNORE_STRING_S = [\\][\'] final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format."; throw new JFlexException(this.getClass().getName(), parsedFileName, errorMessage, yytext(), yyline, yycolumn); - } \ No newline at end of file + } diff --git a/shell-rules/src/main/resources/lex/SHFLOWCheckUser.lex b/shell-rules/src/main/resources/lex/SHFLOWCheckUser.lex index 4a3cc6d3..8c106b1e 100755 --- a/shell-rules/src/main/resources/lex/SHFLOWCheckUser.lex +++ b/shell-rules/src/main/resources/lex/SHFLOWCheckUser.lex @@ -102,7 +102,7 @@ DIRECT_CHECK = {DIRECT_USER} {SPACE}+ {OP} {SPACE}+ {ROOT_VALUE} checkErrors(); return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTBasename.lex b/shell-rules/src/main/resources/lex/SHINSTBasename.lex index 5493baf1..c0729060 100755 --- a/shell-rules/src/main/resources/lex/SHINSTBasename.lex +++ b/shell-rules/src/main/resources/lex/SHINSTBasename.lex @@ -73,7 +73,7 @@ DIRNAME = "dirname"{SPACE}+\$"0" | "dirname"{SPACE}+\"\$"0"\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTContinue.lex b/shell-rules/src/main/resources/lex/SHINSTContinue.lex index d2afe513..51e4ae69 100755 --- a/shell-rules/src/main/resources/lex/SHINSTContinue.lex +++ b/shell-rules/src/main/resources/lex/SHINSTContinue.lex @@ -69,7 +69,7 @@ CONTINUE = "continue" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTFind.lex b/shell-rules/src/main/resources/lex/SHINSTFind.lex index 96d0e4ef..40a915d3 100755 --- a/shell-rules/src/main/resources/lex/SHINSTFind.lex +++ b/shell-rules/src/main/resources/lex/SHINSTFind.lex @@ -72,7 +72,7 @@ LS = "ls" | "/bin/ls" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTGetOpts.lex b/shell-rules/src/main/resources/lex/SHINSTGetOpts.lex index b107aade..8a3f58ef 100755 --- a/shell-rules/src/main/resources/lex/SHINSTGetOpts.lex +++ b/shell-rules/src/main/resources/lex/SHINSTGetOpts.lex @@ -94,7 +94,7 @@ ESCAPE_STRING = [\\]([\']|[\"]) } return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTInterpreter.lex b/shell-rules/src/main/resources/lex/SHINSTInterpreter.lex index d3b6935e..7dc4ecad 100755 --- a/shell-rules/src/main/resources/lex/SHINSTInterpreter.lex +++ b/shell-rules/src/main/resources/lex/SHINSTInterpreter.lex @@ -66,7 +66,7 @@ CORRECT = [\#][\!][\ ]*[\/] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTKeywords.lex b/shell-rules/src/main/resources/lex/SHINSTKeywords.lex index df1db4ba..26cdb49d 100755 --- a/shell-rules/src/main/resources/lex/SHINSTKeywords.lex +++ b/shell-rules/src/main/resources/lex/SHINSTKeywords.lex @@ -101,7 +101,7 @@ NO_ERROR = (([a-zA-Z0-9\_]+{KEYWORD}|{KEYWORD}[a-zA-Z0-9\_]+)[\=])| {KEYWORD_VAR %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTLogical.lex b/shell-rules/src/main/resources/lex/SHINSTLogical.lex index 3d16e62f..aed677fd 100755 --- a/shell-rules/src/main/resources/lex/SHINSTLogical.lex +++ b/shell-rules/src/main/resources/lex/SHINSTLogical.lex @@ -75,7 +75,7 @@ ENDCOND = "do" | "then" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTPOSIX.lex b/shell-rules/src/main/resources/lex/SHINSTPOSIX.lex index 611f4a26..4ceb32a9 100755 --- a/shell-rules/src/main/resources/lex/SHINSTPOSIX.lex +++ b/shell-rules/src/main/resources/lex/SHINSTPOSIX.lex @@ -142,7 +142,7 @@ VAR_ERROR = ([\$]{ERROR}) | ([\$][\{]{ERROR}[\}]) %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTSetShift.lex b/shell-rules/src/main/resources/lex/SHINSTSetShift.lex index 77727dbc..e2374cef 100755 --- a/shell-rules/src/main/resources/lex/SHINSTSetShift.lex +++ b/shell-rules/src/main/resources/lex/SHINSTSetShift.lex @@ -73,7 +73,7 @@ AVOID = "set"{SPACE}+\-"o"{SPACE}+"pipefail" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHINSTVariables.lex b/shell-rules/src/main/resources/lex/SHINSTVariables.lex index b6692e90..37f0975d 100755 --- a/shell-rules/src/main/resources/lex/SHINSTVariables.lex +++ b/shell-rules/src/main/resources/lex/SHINSTVariables.lex @@ -77,7 +77,7 @@ VAR_ERROR = ([\$]({NAME}|{SHELL_VAR})) %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHIORedirect.lex b/shell-rules/src/main/resources/lex/SHIORedirect.lex index c6e3e21b..2c912803 100755 --- a/shell-rules/src/main/resources/lex/SHIORedirect.lex +++ b/shell-rules/src/main/resources/lex/SHIORedirect.lex @@ -127,7 +127,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHMETLimitAWK.lex b/shell-rules/src/main/resources/lex/SHMETLimitAWK.lex index b1a7de4b..a20eb30f 100755 --- a/shell-rules/src/main/resources/lex/SHMETLimitAWK.lex +++ b/shell-rules/src/main/resources/lex/SHMETLimitAWK.lex @@ -71,7 +71,7 @@ STRING = \'[^\']*\' | \"[^\"]*\" %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHMETLimitSed.lex b/shell-rules/src/main/resources/lex/SHMETLimitSed.lex index 2a00ec42..360a5afb 100755 --- a/shell-rules/src/main/resources/lex/SHMETLimitSed.lex +++ b/shell-rules/src/main/resources/lex/SHMETLimitSed.lex @@ -74,7 +74,7 @@ OPTION = "-e" | "--expression" | "-f" | "--file" | %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHMETPipeLine.lex b/shell-rules/src/main/resources/lex/SHMETPipeLine.lex index 5c77c70a..44e6288e 100755 --- a/shell-rules/src/main/resources/lex/SHMETPipeLine.lex +++ b/shell-rules/src/main/resources/lex/SHMETPipeLine.lex @@ -128,7 +128,7 @@ IGNORE_STRING_S = [\\][\'] %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHREFExport.lex b/shell-rules/src/main/resources/lex/SHREFExport.lex index 123feedc..1fcea56d 100755 --- a/shell-rules/src/main/resources/lex/SHREFExport.lex +++ b/shell-rules/src/main/resources/lex/SHREFExport.lex @@ -108,7 +108,7 @@ EXPORT = "export"{SPACE}+\-"f"{SPACE}+{FNAME} %eofval{ return getCheckResults(); %eofval} - +%eofclose %% diff --git a/shell-rules/src/main/resources/lex/SHSYNCSignals.lex b/shell-rules/src/main/resources/lex/SHSYNCSignals.lex index e79898bf..f962ae85 100755 --- a/shell-rules/src/main/resources/lex/SHSYNCSignals.lex +++ b/shell-rules/src/main/resources/lex/SHSYNCSignals.lex @@ -107,7 +107,7 @@ FUNCEND = \} | \) | \)\) | \]\] | "fi" | "esac" | "done" %eofval{ return getCheckResults(); %eofval} - +%eofclose %%