Changeset 213

Timestamp:

11/06/02 17:11:43 (21 years ago)

Author:

piso

Message:

Skip over #|...|# comments.

File:

• trunk/j/src/org/armedbear/j/LispTagger.java (modified) (6 diffs)

trunk/j/src/org/armedbear/j/LispTagger.java

@@ -60 +60 @@
                 continue;
             }
+            if (c == '#' && pos.lookingAt("#|")) {
+                pos.skip(2);
+                skipComment(pos);
+                continue;
+            }
             if (c == '\"') {
                 pos.skipQuote();
@@ -85 +90 @@
                     state = NEUTRAL;
                     continue;
-                } 
+                }
                 if (state == OPEN_PAREN) {
                     String preceding =
@@ -108 +113 @@
         buffer.setTags(tags);
     }
-    
+
     private static final String[] tokens = new String[] {
         "defun", "defvar", "defmacro", "defcustom", "defgroup", "defsubst"
     };
-    
+
     // pos points to first char after token.
     private boolean isDefinitionStart(String token, Position pos)
@@ -119 +124 @@
             if (Utilities.isOneOf(token, tokens))
                 return true;
-        
+
         return false;
     }
@@ -135 +140 @@
         return sb.toString();
     }
-    
+
     // Advances pos past token.
     private void skipToken(Position pos)
@@ -144 +149 @@
         }
     }
+
+    private void skipComment(Position pos)
+    {
+        while (!pos.atEnd()) {
+            char c = pos.getChar();
+            if (c == '\\') {
+                // Escape.
+                if (pos.getOffset() < pos.getLineLength()-1)
+                    pos.skip(2);
+                else {
+                    Line nextLine = pos.getNextLine();
+                    if (nextLine == null)
+                        break;
+                    pos.moveTo(nextLine, 0);
+                }
+                continue;
+            }
+            if (c == '|' && pos.lookingAt("|#")) {
+                pos.skip(2);
+                return;
+            }
+            pos.next();
+        }
+    }
 }