cleanup

mhayashi1120 · Jan 18, 2015 · d1cbc26 · d1cbc26
1 parent 5b21888
commit d1cbc26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 32 deletions.
diff --git a/gosh-config.el b/gosh-config.el
@@ -171,7 +171,7 @@
   (gosh-smart-indent-rule '^ 1)
   nil)
 
-;; entry point of configurations
+;; entry point of this configurations
 (defun gosh-config-loading ()
   (gosh-initialize)
   (gosh-config--define-general-indent))
@@ -180,7 +180,7 @@
 (eval-after-load 'gosh-mode
   `(gosh-config-loading))
 
-;; TODO allowance to after loading `gosh-mode'
+;; amend after load `gosh-mode'
 (when (featurep 'gosh-mode)
   (gosh-config-loading))
 

diff --git a/gosh-const.el b/gosh-const.el
@@ -1345,7 +1345,7 @@
 
    ])
 
-(defconst *gosh-undocumented-info*
+(defvar *gosh-undocumented-info*
   '((report-error (lambda (err)))))
 
 

diff --git a/gosh-mode.el b/gosh-mode.el
@@ -45,15 +45,12 @@
 (require 'cmuscheme)
 (require 'info-look)
 
-(defvar system-type)
 (defvar path-separator)
 (defvar process-environment)
-(defvar idle-update-delay)
 (defvar current-prefix-arg)
 (defvar inhibit-quit)
 (defvar quit-flag)
 (defvar unread-command-events)
-(defvar emacs-version)
 (defvar exec-path)
 (defvar auto-mode-interpreter-regexp)
 (defvar read-expression-map)
@@ -1454,28 +1451,6 @@ d:/home == /cygdrive/d/home
          (beginning-of-defun)
          (looking-at "([\s\t\n]*define"))))
 
-;;TODO remove and merge
-(defun gosh-parse--sexp-type-at-point (&optional env)
-  (case (char-syntax (char-after))
-    ((?\()
-     (forward-char 1)
-     (when (eq ?w (char-syntax (char-after)))
-       (let ((op (gosh-parse-symbol-at-point)))
-         (cond
-          ((eq op 'lambda)
-           (let ((params
-                  (gosh-nth-sexp-at-point 1)))
-             `(lambda ,params)))
-          (t
-           (let ((spec (gosh-env-lookup env op)))
-             (and spec
-                  (consp (cadr spec))
-                  (eq 'lambda (caadr spec))
-                  (cddadr spec)
-                  (car (cddadr spec)))))))))
-    (t
-     (gosh-read))))
-
 ;;TODO
 ;; (let* ([aa #f)) (valid-proc _))
 ;; Above case raise invalid-read-syntax error.
@@ -2923,7 +2898,7 @@ Set this variable before open by `gosh-mode'."
          ((and inner-proc
                (not (zerop inner-pos))
                (consp inner-type)
-               (eq 'lambda (car inner-type)))
+               (memq (car inner-type) '(lambda)))
           (let* ((param-type (gosh-complete--lookup-type (cadr inner-type) inner-pos))
                  (set-or-flags
                   (or (and (consp param-type)
@@ -2934,7 +2909,7 @@ Set this variable before open by `gosh-mode'."
                       ;; parameter
                       (and (not (zerop outer-pos))
                            (consp outer-type)
-                           (eq 'lambda (car outer-type))
+                           (memq (car outer-type) '(lambda))
                            (let ((outer-param-type
                                   (gosh-complete--lookup-type (cadr outer-type)
                                                               outer-pos)))
@@ -2976,7 +2951,7 @@ Set this variable before open by `gosh-mode'."
                   (and (cadr x) (atom (cadr x)))
                   (memq (cadr x) '(procedure object nil))
                   (and (consp (cadr x))
-                       (memq (caadr x) '(lambda syntax)))))
+                       (memq (caadr x) '(lambda syntax parameter)))))
             env)))
          ;; complete everything
          (t
@@ -3559,6 +3534,8 @@ PROCEDURE-SYMBOL ::= symbol ;
 ;;; info integration
 ;;;
 
+(defvar gosh-info-doc--env nil)
+
 (defun gosh-info-lookup-add-help (mode)
   (info-lookup-add-help
    ;; For
@@ -3626,7 +3603,6 @@ PROCEDURE-SYMBOL ::= symbol ;
                 (gosh-symbol-p (car-safe e)))
         return (gosh-symbol-name (car-safe e))))
 
-(defvar gosh-info-doc--env nil)
 (defun gosh-info-doc--generate-signatures ()
   (gosh-and*
       ((infofile (ignore-errors (Info-find-file "gauche-refe")))