branch: externals/phps-mode
commit bfbcc03747cbef2562336981aaf26c58706e7bb1
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Added flag for allowing default conflict resolution
---
admin/phps-mode-automation.el | 5 +++++
phps-mode-automation-grammar.el | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/admin/phps-mode-automation.el b/admin/phps-mode-automation.el
index 33b14e2..b76528d 100644
--- a/admin/phps-mode-automation.el
+++ b/admin/phps-mode-automation.el
@@ -87,6 +87,11 @@
parser-generator-lr--global-precedence-attributes
phps-mode-automation-grammar--lr-global-precedence-attributes))
+ (when (boundp 'parser-generator-lr--allow-default-conflict-resolution)
+ (setq
+ parser-generator-lr--allow-default-conflict-resolution
+ phps-mode-automation-grammar--lr--allow-default-conflict-resolution))
+
(when (boundp 'parser-generator--context-sensitive-attributes)
(setq
parser-generator--context-sensitive-attributes
diff --git a/phps-mode-automation-grammar.el b/phps-mode-automation-grammar.el
index 1a431bc..5881e8f 100644
--- a/phps-mode-automation-grammar.el
+++ b/phps-mode-automation-grammar.el
@@ -47,6 +47,11 @@
"The LR-parser's list of global precedence attributes.")
(defconst
+ phps-mode-automation-grammar--lr--allow-default-conflict-resolution
+ t
+ "Allow shift resolution to shift/reduce conflicts were precedence is
missing.")
+
+(defconst
phps-mode-automation-grammar--global-declaration
'(
(%precedence T_THROW)
