Changeset 202

Timestamp:

11/05/02 02:24:53 (20 years ago)

Author:

piso

Message:

Recognize DEFUN_INT as well as DEFUN; made gatherDefunName() more accurate.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: CTagger.java,v 1.3 2002-11-05 01:25:52 piso Exp $
+ * $Id: CTagger.java,v 1.4 2002-11-05 02:24:53 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -112 +112 @@
             }
             if (isIdentifierStart(c)) {
-                String s = gatherToken();
+                tokenStart = pos.copy();
+                String s = gatherToken(pos);
                 if (s.startsWith("ARGS") && lynxArgsMacroRE.isMatch(s)) {
                     // Lynx "ARGSnn" macro.
@@ -119 +120 @@
                     // Lynx macro.
                     state = METHOD_NAME;
-                } else if (s.equals("DEFUN")) {
+                } else if (isDefunStart(s)) {
                     // Emacs macro.
-                    while (!isIdentifierStart(c = pos.getChar())) {
+                    while (true) {
+                        c = pos.getChar();
+                        if (c == '"') {
+                            pos.next();
+                            break;
+                        }
                         if (!pos.next())
                             break;
                     }
-                    gatherDefunName();
+                    tokenStart = pos.copy();
+                    token = gatherDefunName(pos);
                     tags.add(new CTag(token, tokenStart));
                     while ((c = pos.getChar()) != '{') {
@@ -133 +140 @@
                     if (c == '{')
                         skipBrace();
-                } else {
-                    tokenStart = new Position(pos.getLine(), pos.getOffset() - s.length());
+                } else
                     token = s;
-                }
                 continue;
             }
@@ -149 +154 @@
     }
 
-    private String gatherToken()
+    private String gatherToken(Position pos)
     {
         FastStringBuffer sb = new FastStringBuffer();
@@ -160 +165 @@
         return sb.toString();
     }
-
-    private void gatherDefunName()
-    {
-        tokenStart = new Position(pos);
+    
+    private static boolean isDefunStart(String s)
+    {
+        if (s.length() < 5)
+            return false;
+        if (s.charAt(0) != 'D')
+            return false;
+        if (s.equals("DEFUN")) // Emacs, rep
+            return true;
+        if (s.equals("DEFUN_INT")) // rep
+            return true;
+        return false;
+    }
+
+    private static String gatherDefunName(Position pos)
+    {
         FastStringBuffer sb = new FastStringBuffer();
         char c;
-        while ((c = pos.getChar()) != '"') {
+        while ((c = pos.getChar()) != '"' && c != EOL) {
             sb.append(c);
             if (!pos.next())
                 break;
         }
-        token = sb.toString();
+        return sb.toString();
     }