hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'pr-1447'

Browse Source
This commit is contained in:
Andreas Dangel
2018-11-21 20:13:47 +01:00
parent 21d2bc5a93 bc29973c3b
commit ced1dd778b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/pages/release_notes.md
View File

@ -102,6 +102,7 @@ now deprecated until 7.0.0. The proposed changes to the API are described [on th
* [#1428](https://github.com/pmd/pmd/pull/1428): \[core] Upgrading JCommander from 1.48 to 1.72 - [Thunderforge](https://github.com/Thunderforge)
* [#1430](https://github.com/pmd/pmd/pull/1430): \[doc] Who really knows regex? - [Dem Pilafian](https://github.com/dpilafian)
* [#1434](https://github.com/pmd/pmd/pull/1434): \[java] JUnitTestsShouldIncludeAssert: Recognize AssertJ soft assertions as valid assert statements - [Loïc Ledoyen](https://github.com/ledoyen)
* [#1447](https://github.com/pmd/pmd/pull/1447): \[fortran] Use diamond operator in impl - [reudismam](https://github.com/reudismam)
* [#1464](https://github.com/pmd/pmd/pull/1464): \[doc] Fix XSS on documentation web page - [Maxime Robert](https://github.com/marob)
{% endtocmaker %}

6
pmd-fortran/src/main/java/net/sourceforge/pmd/cpd/FortranTokenizer.java
View File

@ -19,16 +19,16 @@ public class FortranTokenizer extends AbstractTokenizer implements Tokenizer {
public FortranTokenizer() {
this.spanMultipleLinesString = false; // No such thing in Fortran !
// setting markers for "string" in Fortran
this.stringToken = new ArrayList<String>();
this.stringToken = new ArrayList<>();
this.stringToken.add("\'");
// setting markers for 'ignorable character' in Fortran
this.ignorableCharacter = new ArrayList<String>();
this.ignorableCharacter = new ArrayList<>();
this.ignorableCharacter.add("(");
this.ignorableCharacter.add(")");
this.ignorableCharacter.add(",");
// setting markers for 'ignorable string' in Fortran
this.ignorableStmt = new ArrayList<String>();
this.ignorableStmt = new ArrayList<>();
this.ignorableStmt.add("do");
this.ignorableStmt.add("while");
this.ignorableStmt.add("end");