Changeset 3493

Timestamp:

08/24/03 18:30:18 (19 years ago)

Author:

piso

Message:

isDefiner(): don't include DEFCONSTANT, DEFPARAMETER or DEFVAR!

File:

• trunk/j/src/org/armedbear/j/LispFormatter.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2003 Peter Graves
- * $Id: LispFormatter.java,v 1.31 2003-07-17 00:47:06 piso Exp $
+ * $Id: LispFormatter.java,v 1.32 2003-08-24 18:30:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -96 +96 @@
                 case STATE_CAR: {
                     String token = text.substring(tokenBegin, tokenEnd).trim();
-                    if (LispMode.isDefiner(token)) {
+                    if (isDefiner(token)) {
                         if (isPositionFunctional(text, tokenBegin, currentLine))
                             format = LISP_FORMAT_DEFUN;
@@ -136 +136 @@
             tokenBegin = tokenEnd;
         }
+    }
+
+    // Don't include DEFCONSTANT, DEFPARAMETER or DEFVAR!
+    private static final String[] definers = new String[] {
+        "defclass", "define-condition", "defmacro", "defmethod", "defstruct",
+        "deftype", "defun"
+    };
+
+    private static final boolean isDefiner(String s)
+    {
+        if (s.length() >= 5 && s.startsWith("def"))
+            if (Utilities.isOneOf(s, definers))
+                return true;
+
+        return false;
     }