branch: externals/phps-mode
commit 16ce2acfb781cac704cdd7f266ce0ee6d0742cfd
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Removed debug output for bookkeeping
---
Makefile | 2 +-
phps-mode-ast-bookkeeping.el | 16 +++++++---------
phps-mode-ast-imenu.el | 2 +-
phps-mode-ast.el | 7 +++----
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 844be30ae6..f425653679 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ compile:
find . -name "*.el" -exec $(EMACS_CMD) -f batch-byte-compile {} \;
.PHONY: tests
-tests: test-integration test-lexer test-lex-analyzer test-parser
test-syntax-table #test-ast
+tests: test-integration test-lexer test-lex-analyzer test-parser
test-syntax-table test-ast
.PHONY: test-ast
test-ast:
diff --git a/phps-mode-ast-bookkeeping.el b/phps-mode-ast-bookkeeping.el
index de400478eb..3d69800add 100644
--- a/phps-mode-ast-bookkeeping.el
+++ b/phps-mode-ast-bookkeeping.el
@@ -45,9 +45,8 @@
scope-string
(format
"%s namespace %s"
- (setq
- scope-string
- scope-name))))
+ scope-string
+ scope-name)))
((and
(or (equal scope-type 'class)
@@ -110,7 +109,8 @@
(scope name &optional read-only)
"Generate variable scope string from SCOPE and NAME and optionally
READ-ONLY."
(let ((scope-strings)
- (bubbles-stack (list (list "" nil nil (reverse scope))))) ;;
scope-string namespace bubbles
+ (bubbles-stack (list (list "" nil nil (reverse scope))))
+ (bubbles-data))
(while bubbles-stack
(setq
bubbles-data
@@ -433,9 +433,8 @@
((equal type 'if)
(let* ((conditions (reverse (plist-get item 'condition)))
(condition-stack conditions)
- (condition)
- (found-defined-scope)
- (sub-scope scope))
+ (found-defined-scope)
+ (sub-scope scope))
(while condition-stack
(let ((condition (pop condition-stack)))
(when-let ((condition-type (plist-get condition 'ast-type)))
@@ -760,7 +759,6 @@
((equal type 'array-object-dereferencable)
(let* ((subject (plist-get item 'subject))
- (property-name (plist-get item 'property))
(downcase-subject-name (downcase (plist-get subject 'name)))
(property-name (plist-get item 'property-name)))
@@ -998,7 +996,7 @@
phps-mode-ast-bookkeeping--index
bookkeeping)
- (message "\nBookkeeping\n:%S\n" bookkeeping)
+ ;; (message "\nBookkeeping\n:%S\n" bookkeeping)
phps-mode-ast-bookkeeping--index))
diff --git a/phps-mode-ast-imenu.el b/phps-mode-ast-imenu.el
index 082c789bc5..3333f7ddda 100644
--- a/phps-mode-ast-imenu.el
+++ b/phps-mode-ast-imenu.el
@@ -84,7 +84,7 @@
phps-mode-ast-imenu--index
(reverse imenu-index)))
- (message "imenu:\n%S\n\n" phps-mode-ast-imenu--index)
+ ;; (message "imenu:\n%S\n\n" phps-mode-ast-imenu--index)
phps-mode-ast-imenu--index)
diff --git a/phps-mode-ast.el b/phps-mode-ast.el
index a25ee95567..d4c411be41 100644
--- a/phps-mode-ast.el
+++ b/phps-mode-ast.el
@@ -29,10 +29,9 @@
(let ((translation (phps-mode-parser-translate))
(namespace)
(namespace-children)
- (ast)
- (bookkeeping (make-hash-table :test 'equal)))
+ (ast))
- (message "\nTranslation:\n%S\n\n" translation)
+ ;; (message "\nTranslation:\n%S\n\n" translation)
(when translation
(dolist (item translation)
@@ -82,7 +81,7 @@
ast
(reverse ast))
- (message "AST:\n%S\n\n" ast)
+ ;; (message "AST:\n%S\n\n" ast)
(setq
phps-mode-ast--tree
ast)
