From: Peer B. <am...@us...> - 2005-08-25 09:21:13
|
Update of /cvsroot/plb4jedit/plb4jedit/Plb/src/java/net/sf/plb4jedit/plb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25712/Plb/src/java/net/sf/plb4jedit/plb Modified Files: ListingAnalyzer.java Log Message: Added new RE for plb90-loop-error Index: ListingAnalyzer.java =================================================================== RCS file: /cvsroot/plb4jedit/plb4jedit/Plb/src/java/net/sf/plb4jedit/plb/ListingAnalyzer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ListingAnalyzer.java 8 Jul 2005 09:16:14 -0000 1.4 +++ ListingAnalyzer.java 25 Aug 2005 09:21:06 -0000 1.5 @@ -17,6 +17,9 @@ import java.util.regex.Pattern; /** * $Log$ + * Revision 1.5 2005/08/25 09:21:06 ampeer + * Added new RE for plb90-loop-error + * * Revision 1.4 2005/07/08 09:16:14 schaefep * recognize a-z as include key; new feature in PLB 9.0 * @@ -60,6 +63,7 @@ private Pattern locateErrorPattern; private Pattern undefinedExecutionLabelPattern; private Pattern ifLoopSwitchNotTerminatedPattern; + private Pattern ifLoopSwitchNotTerminatedPattern90; private Pattern lastWordPattern; private Pattern fatalErrorPattern; private Pattern resultPattern; @@ -125,6 +129,9 @@ ifLoopSwitchNotTerminatedPattern = Pattern.compile( "^IF/LOOP/SWITCH statement at line \\((\\d+)(\\.([ ,a-zA-Z]{1,2}))?\\) not terminated\\..*$"); + ifLoopSwitchNotTerminatedPattern90 = + Pattern.compile( + "^IF/LOOP/SWITCH/FOR statement at line \\((\\d+)(\\.([ ,a-zA-Z]{1,2}))?\\) not terminated\\..*$"); lastWordPattern = Pattern.compile("\\.*([a-zA-Z0-9#]+)$"); fatalErrorPattern = Pattern.compile("\\.*FATAL ERROR ENCOUNTERED.*$"); resultPattern = @@ -243,6 +250,24 @@ + lineNumber + ": if/Loop/Switch/ not terminated")); } + if ((matcher = ifLoopSwitchNotTerminatedPattern90.matcher(line)) + .matches()) { + String lineNumber = matcher.group(1); + String key = matcher.group(3); + //System.out.println("Key: "+key); + String sourceName = programName; + if (key != null + && key.trim().length() > 0 + && includes.containsKey(key)) { + sourceName = (String) includes.get(key); + } + addError( + new String( + sourceName + + ":" + + lineNumber + + ": if/Loop/Switch/For not terminated")); + } if ((matcher = fatalErrorPattern.matcher(line)).matches()) { addError(new String(programName + ":1: FATAL ERROR ENCOUNTERED")); } |