branch: externals/phps-mode
commit fe89129aaadfa37b7883c12b9fdb7141375cecf0
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
More work on PHP 8.1 automation
---
Makefile | 2 +-
phps-mode-automation-parser-generator.el | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 340eff5aed..a1b068a775 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ parser: clean generate-parser
.PHONY: generate-parser
generate-parser:
- rm phps-mode-automation-grammar.elc; $(EMACS_CMD) -L
~/.emacs.d/emacs-parser-generator/ -l phps-mode-lexer.el -l
admin/phps-mode-automation.el -eval "(progn (require
'parser-generator-lr-export)(setq debug-on-signal t)(setq debug-on-error
t)(phps-mode-automation))"
+ $(EMACS_CMD) -L ~/.emacs.d/emacs-parser-generator/ -l
phps-mode-lexer.el -l admin/phps-mode-automation.el -eval "(progn (require
'parser-generator-lr-export)(setq debug-on-signal t)(setq debug-on-error
t)(phps-mode-automation))"
.PHONY: compile
compile:
diff --git a/phps-mode-automation-parser-generator.el
b/phps-mode-automation-parser-generator.el
index 9398474c47..c439e73d64 100644
--- a/phps-mode-automation-parser-generator.el
+++ b/phps-mode-automation-parser-generator.el
@@ -9,6 +9,8 @@
;;; Code:
+(require 'url)
+
(autoload 'parser-generator-set-look-ahead-number "parser-generator")
(autoload 'parser-generator-set-grammar "parser-generator")
(autoload 'parser-generator-process-grammar "parser-generator")
@@ -58,17 +60,12 @@
(php-yacc-file
(expand-file-name "zend_language_parser.y")))
- ;; NOTE PHP 8.1 has a syntax error at 28032, missing semi-colon
-
;; Download YACC if not available
(unless (file-exists-p php-yacc-file)
(message
"Downloading PHP 8.1 YACC grammar.. since %S does not exists"
php-yacc-file)
- (url-copy-file
- php-yacc-url
- php-yacc-file
- t
- t)
+ (with-current-buffer (url-retrieve-synchronously php-yacc-url)
+ (write-file php-yacc-file))
(message
"Download of PHP 8.1 YACC grammar completed"))
