Changeset 25 in default

Timestamp:

11/02/10 12:29:25 (14 years ago)

Author:

zeiss

Message:

 

File:

• trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java (modified) (7 diffs)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java

@@ -36 +36 @@
         private StringBuffer buf;
         private FormatterConfig config;
-        private int bufferPosition = 0;
+        private int bufferPositionFormattedTextNoWhitespaces = 0;
         private int bufferPositionOriginalText = 0;
         private int allCommentsPosition = 0;
@@ -46 +46 @@
         private int bufferPositionFormattedText;
         private String formattedText;
-        private String bufNoWhitespaces;
+        private String formattedTextNoWhitespaces;
         private String originalTextNoWhitespaces;
         
@@ -105 +105 @@
         
         private void skipWhitespacesOriginalText() {
-                while (isWhitespace(originalText.charAt(bufferPositionOriginalText))) {
+                while (bufferPositionOriginalText < originalText.length() && isWhitespace(originalText.charAt(bufferPositionOriginalText))) {
                         bufferPositionOriginalText++;
                 }
@@ -111 +111 @@
 
         private void skipWhitespacesFormattedText(StringBuffer result) {
-                while (isWhitespace(formattedText.charAt(bufferPositionFormattedText))) {
+                while (bufferPositionFormattedText < formattedText.length() && isWhitespace(formattedText.charAt(bufferPositionFormattedText))) {
                         result.append(formattedText.substring(bufferPositionFormattedText, bufferPositionFormattedText+1));
                         bufferPositionFormattedText++;
@@ -175 +175 @@
         
         private void weaveComments() {
-                bufferPosition = 0;
+//              if (true) {
+//                      StringBuffer result = new StringBuffer();
+//                      result.append(buf.toString());
+//                      buf = result;
+//                      return;
+//              }
+                
                 bufferPositionOriginalText = 0;
+                bufferPositionFormattedTextNoWhitespaces = 0;
                 bufferPositionFormattedText = 0;
                 
                 StringBuffer result = new StringBuffer();
-                bufNoWhitespaces = buf.toString().replaceAll("[ \t\n\r]", "");
+                formattedTextNoWhitespaces = buf.toString().replaceAll("[ \t\n\r]", "");
                 formattedText = buf.toString();
                 
-                while (bufferPosition < bufNoWhitespaces.length()) {
+                while (bufferPositionFormattedTextNoWhitespaces < formattedTextNoWhitespaces.length()) {
                         skipWhitespacesOriginalText();
                         skipWhitespacesFormattedText(result);
-
-                        if (bufNoWhitespaces.charAt(bufferPosition) != originalText.charAt(bufferPositionOriginalText)) {
-                                if (isCommentNext(originalText, bufferPositionOriginalText)) {
+                        
+                        if (!(bufferPositionOriginalText < originalText.length()))
+                                break;
+                        
+                        char formattedPositionNoWhitespaces = formattedTextNoWhitespaces.charAt(bufferPositionFormattedTextNoWhitespaces);
+                        char originalPosition = originalText.charAt(bufferPositionOriginalText);
+
+                        if (formattedPositionNoWhitespaces != originalPosition) {
+                                if (formattedPositionNoWhitespaces == ';') { // formatted text always outputs the optional semicolon, skip it if necessary
+                                        bufferPositionFormattedTextNoWhitespaces++;
+                                        bufferPositionFormattedText++;
+                                } else if (isCommentNext(originalText, bufferPositionOriginalText)) {
                                         LeafNode currentComment = allComments.get(allCommentsPosition); 
                                         if (currentComment.getTotalOffset() == bufferPositionOriginalText) {
@@ -194 +210 @@
                                                         int newLinesCount = scanBackNewlinesCount(originalText, bufferPositionOriginalText-1);
                                                         if (newLinesCount > 0) {
+                                                                if (scanBackNewlinesCount(result.toString(), result.toString().length()-1) == 0) {
+                                                                        result.append("\n\n");
+                                                                }
+                                                                
                                                                 result.append(currentComment.getText());
                                                                 result.append("\n");
@@ -216 +236 @@
                                                 allCommentsPosition++;
                                         }
+                                } else { // disaster handling: return original unformatted text!
+                                        buf = new StringBuffer();
+                                        buf.append(originalText);
+                                        return;
                                 }
                         } else {
                                 result.append(formattedText.substring(bufferPositionFormattedText, bufferPositionFormattedText+1));
-
                                 bufferPositionOriginalText++;
                                 bufferPositionFormattedText++;
-                                bufferPosition++;
+                                bufferPositionFormattedTextNoWhitespaces++;
                         }
                 }