Changeset 201

Timestamp:

11/05/02 01:26:48 (21 years ago)

Author:

piso

Message:

Use CTagger.skipPreprocessor().

File:

• trunk/j/src/org/armedbear/j/CppTagger.java (modified) (4 diffs)

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

@@ -22 +22 @@
 
 import java.util.Stack;
-import java.util.Vector;
+import java.util.ArrayList;
 
 public final class CppTagger extends JavaTagger implements Constants
@@ -43 +43 @@
     public void run()
     {
-        Vector tags = new Vector();
+        ArrayList tags = new ArrayList();
         String className = null;
         Stack classNames = new Stack();
@@ -64 +64 @@
                 continue;
             }
-            if (pos.lookingAt("//") || (c == '#' && pos.getOffset() == 0)) {
+            if (pos.lookingAt("//")) {
                 Line nextLine = pos.getNextLine();
                 if (nextLine == null)
                     break;
                 pos.moveTo(nextLine, 0);
+                continue;
+            }
+            if (c == '#' && pos.getOffset() == 0) {
+                CTagger.skipPreprocessor(pos);
                 continue;
             }
@@ -192 +196 @@
         }
         // Token can't end with ':'.
-        while (sb.length() > 0 && sb.charAt(sb.length() - 1) == ':')
-            sb.setLength(sb.length() - 1);
+        while (sb.length() > 0 && sb.charAt(sb.length()-1) == ':')
+            sb.setLength(sb.length()-1);
         token = sb.toString();
     }