Changeset 3075

Timestamp:

Apr 25, 2013, 11:45:08 PM (6 years ago)

Author:

ksherdy

Message:

Updated genrated code.

Location:

proto/RE/src

Files:

• lexicalAnalyzer/Lextant.java (modified) (3 diffs)
• lexicalAnalyzer/Scanner.java (modified) (3 diffs)
• lexicalAnalyzer/tokenRecognizers/CharacterTokenRecognizer.java (modified) (2 diffs)
• lexicalAnalyzer/tokenRecognizers/TokenRecognizerImp.java (modified) (1 diff)
• parser/Parser.java (modified) (1 diff)

proto/RE/src/lexicalAnalyzer/Lextant.java

@@ -19 +19 @@
 public enum Lextant {
         ANY(".", "main"),
-        RIGHTSQUARE("]", "charClass", "]", "main"),
+        RIGHTSQUARE("]", "charClass"),
         BACKSLASH("\\", "charClass", "\\", "main"),
         OR("|", "main"),
@@ -26 +26 @@
         STAR("*", "main"),
         PLUS("+", "main"),
-        RIGHTCURLY("}", "boundedRepetition", "}", "main"),
+        RIGHTCURLY("}", "boundedRepetition"),
         LEFTROUND("(", "main"),
         RIGHTROUND(")", "main"),
@@ -32 +32 @@
         SOS("^", "main"),
         LEFTSQUARE("[", "main"),
-        EOS("!", "main"),
+        EOS("$", "main"),
         LEFTCURLY("{", "main"),
-        COMMA(",", "boundedRepetition", ",", "main"),
+        COMMA(",", "boundedRepetition"),
 
         

proto/RE/src/lexicalAnalyzer/Scanner.java

@@ -72 +72 @@
                 return new Scanner(charStream,
                         new WhitespaceTokenRecognizer(charStream, IGNORE),
+                        new PunctuatorTokenRecognizer(charStream, LEXTANT, context),
                         new CommentTokenRecognizer(charStream, IGNORE, "(?#", ")"),
-                        new CharacterTokenRecognizer(charStream, CHARACTER, "(", ")", "[", "|", "?", "*", "+", ".", "^", "!", "\\", "{"),
-                        new PunctuatorTokenRecognizer(charStream, LEXTANT, context),
-                        new EndOfInputTokenRecognizer(charStream, NONE)
+                        new EndOfInputTokenRecognizer(charStream, NONE),
+                        new CharacterTokenRecognizer(charStream, CHARACTER)
                 );
         }
@@ -84 +84 @@
                 return new Scanner(charStream,
                         new WhitespaceTokenRecognizer(charStream, IGNORE),
-                        new CharacterTokenRecognizer(charStream, CHARACTER, "]", "^", "-", "\\"),
                         new PunctuatorTokenRecognizer(charStream, LEXTANT, context),
+                        new CharacterTokenRecognizer(charStream, CHARACTER),
                         new EndOfInputTokenRecognizer(charStream, NONE)
                 );
@@ -95 +95 @@
                 return new Scanner(charStream,
                         new WhitespaceTokenRecognizer(charStream, IGNORE),
+                        new PunctuatorTokenRecognizer(charStream, LEXTANT, context),
                         new IntegerTokenRecognizer(charStream, INTEGER_CONST),
-                        new PunctuatorTokenRecognizer(charStream, LEXTANT, context),
                         new EndOfInputTokenRecognizer(charStream, NONE)
                 );

proto/RE/src/lexicalAnalyzer/tokenRecognizers/CharacterTokenRecognizer.java

@@ -18 +18 @@
 public class CharacterTokenRecognizer extends TokenRecognizerImp {
 
-        private String [] excludedCharacters = null;
-
-        public CharacterTokenRecognizer(BookmarkCharStream input, LexicalType lexicalType, String ... excludedCharacters) {
+        public CharacterTokenRecognizer(BookmarkCharStream input, LexicalType lexicalType) {
                 super(input, lexicalType);
-                
-                this.excludedCharacters = new String [excludedCharacters.length];
-                for(int i=0;i<excludedCharacters.length;i++) {
-                        this.excludedCharacters[i] = excludedCharacters[i];
-                }
         }
 
         protected Result tryToReadToken() {
                 
-                if(isEndOfInput(input.peek())) {
-                        setToken(NullToken.make(lexicalType));
-                        return Result.NOT_FOUND;
-                }
-                
-                // ?
-                if(inputStartsWithAny(excludedCharacters)) {
-                        return Result.NOT_FOUND;
-                }       
-
                 LocatedChar firstChar = input.next();
                 TextLocation location = firstChar.getLocation();
@@ -51 +34 @@
         }
         
-        private boolean isEndOfInput(LocatedChar c) {
-                return c == LocatedCharStream.FLAG_END_OF_INPUT;
-        }
 }
 

proto/RE/src/lexicalAnalyzer/tokenRecognizers/TokenRecognizerImp.java

@@ -115 +115 @@
                 return result;
         }
-        
-        // ?
-        protected boolean inputStartsWithAny(String ... lexemes) {
-                Bookmark bookmark = input.bookmark();
-                boolean result = false;
                 
-                for(int i=0; i<lexemes.length; i++) {
-                        result = sloppyInputStartsWith(lexemes[i], input.peek().getCharacter());
-                        
-                        if(result) {
-                                break;
-                        }
-                }       
-                
-                input.moveback(bookmark);
-                return result;
-        }
-
-        // ? single character prefix without progressing the input stream
-        private boolean sloppyInputStartsWith(String lexeme, char c) {
-                for(int i=0; i<lexeme.length(); i++) {
-                        if(c != lexeme.charAt(i)) {
-                                return false;
-                        }
-                }
-                return true;
-        }
-        
         private boolean sloppyInputStartsWith(String lexeme) {
                 for(int i=0; i<lexeme.length(); i++) {

proto/RE/src/parser/Parser.java

@@ -435 +435 @@
                 else if( nowReading.isLextant(Lextant.BACKSLASH) ) {
                         expect(Lextant.BACKSLASH);
+                }
+                else if( nowReading.isLextant(Lextant.LEFTCURLY) ) {
+                        expect(Lextant.LEFTCURLY);
                 }
                 if(allowCompression) {