Changeset 10983

Timestamp:

02/04/06 21:15:33 (18 years ago)

Author:

piso

Message:

Support explicit tags for C++.

Location:

trunk/j/src/org/armedbear/j

Files:

• CppTagger.java (modified) (1 diff)
• JavaTagger.java (modified) (5 diffs)

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

@@ -70 +70 @@
         if (pos.lookingAt("//"))
           {
+            LocalTag tag = checkForExplicitTag(pos);
+            if (tag instanceof CppTag)
+              tags.add(tag);
             skipSingleLineComment(pos);
             continue;

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2006 Peter Graves
- * $Id: JavaTagger.java,v 1.7 2006-02-04 21:00:26 piso Exp $
+ * $Id: JavaTagger.java,v 1.8 2006-02-04 21:14:30 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -85 +85 @@
         if (pos.lookingAt("//"))
           {
+            LocalTag tag = checkForExplicitTag(pos);
+            if (tag instanceof JavaTag)
+              tags.add(tag);
             skipSingleLineComment(pos);
             continue;
@@ -364 +367 @@
   protected final void skipSingleLineComment(Position pos)
   {
-    checkForExplicitTag(pos);
     Line next = pos.getNextLine();
     if (next != null)
@@ -372 +374 @@
   }
 
-  private final void checkForExplicitTag(Position pos)
-  {
-    if (tags == null)
-      return; // Only supported for Java and JavaScript for now.
+  protected final LocalTag checkForExplicitTag(Position pos)
+  {
+    // Only supported for Java, JavaScript and C++ for now.
+    final int modeId = buffer.getModeId();
+    if (modeId != JAVA_MODE && modeId != JAVASCRIPT_MODE && modeId != CPP_MODE)
+      return null;
     final String explicitTag =
       Editor.preferences().getStringProperty(Property.EXPLICIT_TAG);
@@ -419 +423 @@
             pos.setOffset(0);
             pos.skipWhitespace();
-            tags.add(new JavaTag(tag, pos, TAG_EXPLICIT, 0, currentClass));
-          }
-      }
+            if (buffer.getModeId() == JAVA_MODE)
+              return new JavaTag(tag, pos, TAG_EXPLICIT, 0, currentClass);
+            else if (buffer.getModeId() == CPP_MODE)
+              return new CppTag(tag, pos, TAG_EXPLICIT);
+          }
+      }
+    return null;
   }