Changeset 190

Timestamp:

10/31/02 13:45:21 (21 years ago)

Author:

piso

Message:

Skip preprocessor continuation lines.

File:

• trunk/j/src/org/armedbear/j/CTagger.java (modified) (5 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: CTagger.java,v 1.1.1.1 2002-09-24 16:09:14 piso Exp $
+ * $Id: CTagger.java,v 1.2 2002-10-31 13:45:21 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -24 +24 @@
 import gnu.regexp.RE;
 import gnu.regexp.UncheckedRE;
-import java.util.Vector;
+import java.util.ArrayList;
 
 public final class CTagger extends JavaTagger
@@ -44 +44 @@
     public void run()
     {
-        Vector tags = new Vector();
+        ArrayList tags = new ArrayList();
         pos = new Position(buffer.getFirstLine(), 0);
         token = null;
@@ -63 +63 @@
                 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) {
+                skipPreprocessor(pos);
                 continue;
             }
@@ -169 +173 @@
         token = sb.toString();
     }
+    
+    private static void skipPreprocessor(Position pos)
+    {
+        while (true) {
+            Line line = pos.getLine();
+            Line nextLine = line.next();
+            if (nextLine == null) {
+                pos.setOffset(line.length());
+                return;
+            }
+            pos.moveTo(nextLine, 0);
+            if (line.length() == 0 || line.charAt(line.length()-1) != '\\')
+                return;
+        }
+    }
 
     private static final boolean isIdentifierStart(char c)