Browse Source

Fix in parser: make keyword list be created statically.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5404 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
cdac320532
  1. 11
      prism/src/parser/PrismParser.java
  2. 11
      prism/src/parser/PrismParser.jj

11
prism/src/parser/PrismParser.java

@ -16,6 +16,12 @@ public class PrismParser implements PrismParserConstants {
// List of keyword strings
private static ArrayList<String> keywordList = new ArrayList<String>();
{
keywordList.clear();
for (int i = PrismParserConstants.COMMENT+1; i < PrismParserConstants.NOT; i++) {
keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\u005c"", ""));
}
}
//-----------------------------------------------------------------------------------
// Main method for testing purposes
@ -85,11 +91,6 @@ public class PrismParser implements PrismParserConstants {
{
// Call default constructor
this(System.in);
// Build a list of strings for keywords
keywordList.clear();
for (int i = PrismParserConstants.COMMENT+1; i < PrismParserConstants.NOT; i++) {
keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\u005c"", ""));
}
}
// Parse modules file

11
prism/src/parser/PrismParser.jj

@ -49,6 +49,12 @@ public class PrismParser
// List of keyword strings
private static ArrayList<String> keywordList = new ArrayList<String>();
{
keywordList.clear();
for (int i = PrismParserConstants.COMMENT+1; i < PrismParserConstants.NOT; i++) {
keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\"", ""));
}
}
//-----------------------------------------------------------------------------------
// Main method for testing purposes
@ -118,11 +124,6 @@ public class PrismParser
{
// Call default constructor
this(System.in);
// Build a list of strings for keywords
keywordList.clear();
for (int i = PrismParserConstants.COMMENT+1; i < PrismParserConstants.NOT; i++) {
keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\"", ""));
}
}
// Parse modules file

Loading…
Cancel
Save