[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Ada-mode-users] Indenting incomplete code during editing
|
From: |
Stephen Leake |
|
Subject: |
Re: [Ada-mode-users] Indenting incomplete code during editing |
|
Date: |
Thu, 27 Oct 2016 15:18:36 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (windows-nt) |
Ludovic Brenta <address@hidden> writes:
> Could you send me the patch to the
> generated file resulting from your change in the grammar?
Attached.
Note that mtn won't generate this diff for you; it says
ada-grammar-wy.el is a manual-merge file (it has the mtn:manual-merge
attr). Which I set in an effort to not waste time reviewing changes to
it in Emacs during a commit. But it doesn't actually accomplish that, so
I'll delete the attr.
--
-- Stephe
--- ada-grammar-wy.el-original 2016-10-27 15:15:05.930323500 -0500
+++ ada-grammar-wy.el 2016-10-27 15:13:44.944952900 -0500
@@ -1250,6 +1250,7 @@
(())
((formal_part )))
(parameter_specification
+ (())
((identifier_list COLON aliased_opt mode_opt null_exclusion_opt name
COLON_EQUAL expression )
(wisi-face-action [6 font-lock-type-face]))
((identifier_list COLON aliased_opt mode_opt null_exclusion_opt name )
@@ -1908,7 +1909,7 @@
((default . error) (PACKAGE . (generic_formal_parameter_declaration .
4)) (PROCEDURE . (generic_formal_parameter_declaration . 4)) (FUNCTION .
(generic_formal_parameter_declaration . 4)) (IDENTIFIER .
(generic_formal_parameter_declaration . 4)) (WITH .
(generic_formal_parameter_declaration . 4)) (USE .
(generic_formal_parameter_declaration . 4)) (TYPE .
(generic_formal_parameter_declaration . 4)) (PRAGMA .
(generic_formal_parameter_declaration . 4)))
((default . error) (PACKAGE . (generic_formal_parameter_declaration .
5)) (PROCEDURE . (generic_formal_parameter_declaration . 5)) (FUNCTION .
(generic_formal_parameter_declaration . 5)) (IDENTIFIER .
(generic_formal_parameter_declaration . 5)) (WITH .
(generic_formal_parameter_declaration . 5)) (USE .
(generic_formal_parameter_declaration . 5)) (TYPE .
(generic_formal_parameter_declaration . 5)) (PRAGMA .
(generic_formal_parameter_declaration . 5)))
((default . error) (DOT . 90) (TICK . 91) (RETURN . 89) (LEFT_PAREN .
88))
- ((default . error) (FOR . 146) (CASE . 145) (IF . 147) (RIGHT_PAREN .
((expression_opt . 0) (association_opt . 0))) (COMMA . ((expression_opt . 0)
(association_opt . 0))) (EQUAL_GREATER . (discrete_choice_list . 0)) (BAR .
(discrete_choice_list . 0)) (CHARACTER_LITERAL . 183) (STRING_LITERAL . 49)
(IDENTIFIER . 235) (PLUS . 154) (MINUS . 153) (OTHERS . 182) (ABS . 144)
(NOT . 181) (RAISE . 152) (NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149)
(LEFT_PAREN . 148))
+ ((default . error) (SEMICOLON . (parameter_specification . 0)) (FOR .
146) (CASE . 145) (IF . 147) (RIGHT_PAREN . ((expression_opt . 0)
(parameter_specification . 0))) (COMMA . ((expression_opt . 0) (association_opt
. 0))) (EQUAL_GREATER . (discrete_choice_list . 0)) (BAR .
(discrete_choice_list . 0)) (CHARACTER_LITERAL . 183) (STRING_LITERAL . 49)
(IDENTIFIER . 235) (PLUS . 154) (MINUS . 153) (OTHERS . 182) (ABS . 144)
(NOT . 181) (RAISE . 152) (NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149)
(LEFT_PAREN . 148))
((default . error) (IDENTIFIER . (null_exclusion_opt . 0))
(STRING_LITERAL . (null_exclusion_opt . 0)) (CHARACTER_LITERAL .
(null_exclusion_opt . 0)) (DO . (null_exclusion_opt . 0)) (COLON_EQUAL .
(null_exclusion_opt . 0)) (RIGHT_PAREN . (null_exclusion_opt . 0)) (RENAMES .
(null_exclusion_opt . 0)) (IS . (null_exclusion_opt . 0)) (SEMICOLON .
(null_exclusion_opt . 0)) (WITH . (null_exclusion_opt . 0)) (ACCESS .
(null_exclusion_opt . 0)) (NOT . 232))
((default . error) (IDENTIFIER . 229) (CHARACTER_LITERAL . 231)
(STRING_LITERAL . 230) (ALL . 228))
((default . error) (LEFT_PAREN . 148) (ACCESS . 221) (DELTA . 222)
(DIGITS . 223) (MOD . 224) (IDENTIFIER . 48) (CHARACTER_LITERAL . 50)
(STRING_LITERAL . 49))
@@ -2060,7 +2061,7 @@
((default . error) (RIGHT_PAREN . (parameter_specification_list . 0))
(SEMICOLON . (parameter_specification_list . 0)))
((default . error) (SEMICOLON . 240) (RIGHT_PAREN . 239))
((default . error) (COLON_EQUAL . (formal_part . 0)) (RIGHT_PAREN .
(formal_part . 0)) (DO . (formal_part . 0)) (WHEN . (formal_part . 0)) (RENAMES
. (formal_part . 0)) (IS . (formal_part . 0)) (SEMICOLON . (formal_part . 0))
(WITH . (formal_part . 0)) (RETURN . (formal_part . 0)))
- ((default . error) (IDENTIFIER . 77))
+ ((default . error) (RIGHT_PAREN . (parameter_specification . 0))
(SEMICOLON . (parameter_specification . 0)) (IDENTIFIER . 77))
((default . error) (ACCESS . (aliased_opt . 0)) (NOT . (aliased_opt .
0)) (IN . (aliased_opt . 0)) (OUT . (aliased_opt . 0)) (IDENTIFIER .
(aliased_opt . 0)) (STRING_LITERAL . (aliased_opt . 0)) (CHARACTER_LITERAL .
(aliased_opt . 0)) (ALIASED . 531))
((default . error) (FUNCTION . (protected_opt . 0)) (PROCEDURE .
(protected_opt . 0)) (PROTECTED . 528) (IDENTIFIER .
(general_access_modifier_opt . 0)) (STRING_LITERAL .
(general_access_modifier_opt . 0)) (CHARACTER_LITERAL .
(general_access_modifier_opt . 0)) (ALL . 526) (CONSTANT . 527))
((default . error) (DOT . 90) (DO . (name_opt . 1)) (COLON_EQUAL .
(name_opt . 1)) (RIGHT_PAREN . (name_opt . 1)) (RENAMES . (name_opt . 1)) (IS .
(name_opt . 1)) (WITH . (name_opt . 1)) (SEMICOLON . (name_opt . 1)) (TICK .
91) (LEFT_PAREN . 107))
@@ -2354,7 +2355,7 @@
((default . error) (IN . (aliased_opt . 1)) (OUT . (aliased_opt . 1))
(ARRAY . (aliased_opt . 1)) (CONSTANT . (aliased_opt . 1)) (ACCESS .
(aliased_opt . 1)) (NOT . (aliased_opt . 1)) (IDENTIFIER . (aliased_opt . 1))
(STRING_LITERAL . (aliased_opt . 1)) (CHARACTER_LITERAL . (aliased_opt . 1)))
((default . error) (IDENTIFIER . (mode_opt . 0)) (STRING_LITERAL .
(mode_opt . 0)) (CHARACTER_LITERAL . (mode_opt . 0)) (IN . 217) (OUT . 218)
(ACCESS . (null_exclusion_opt . 0)) (NOT . ( 232 (mode_opt . 0))))
((default . error) (RIGHT_PAREN . (parameter_specification_list . 1))
(SEMICOLON . (parameter_specification_list . 1)))
- ((default . error) (COLON_EQUAL . 814) (RIGHT_PAREN .
(parameter_specification . 3)) (SEMICOLON . (parameter_specification . 3)))
+ ((default . error) (COLON_EQUAL . 814) (RIGHT_PAREN .
(parameter_specification . 4)) (SEMICOLON . (parameter_specification . 4)))
((default . error) (IDENTIFIER . (null_exclusion_opt . 0))
(STRING_LITERAL . (null_exclusion_opt . 0)) (CHARACTER_LITERAL .
(null_exclusion_opt . 0)) (NOT . 232))
((default . error) (RETURN . 89) (LEFT_PAREN . 810))
((default . error) (WITH . (parameter_profile_opt . 0)) (SEMICOLON .
(parameter_profile_opt . 0)) (IS . (parameter_profile_opt . 0)) (COLON_EQUAL .
(parameter_profile_opt . 0)) (RIGHT_PAREN . (parameter_profile_opt . 0))
(RENAMES . (parameter_profile_opt . 0)) (DO . (parameter_profile_opt . 0))
(LEFT_PAREN . 810))
@@ -2572,7 +2573,7 @@
((default . error) (COMMA . (pragma_argument_association . 3))
(RIGHT_PAREN . (pragma_argument_association . 3)))
((default . error) (SEMICOLON . 898))
((default . error) (END . 897))
- ((default . error) (IDENTIFIER . 235) (CHARACTER_LITERAL . 50)
(STRING_LITERAL . 49) (PLUS . 154) (MINUS . 153) (ABS . 144) (NOT . 736)
(NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149) (LEFT_PAREN . 148))
+ ((default . error) (SEMICOLON . (parameter_specification . 0))
(RIGHT_PAREN . (parameter_specification . 0)) (IDENTIFIER . 235)
(CHARACTER_LITERAL . 50) (STRING_LITERAL . 49) (PLUS . 154) (MINUS . 153)
(ABS . 144) (NOT . 736) (NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149)
(LEFT_PAREN . 148))
((default . error) (SEMICOLON . (aspect_specification_opt . 0)) (WITH .
109))
((default . error) (FOR . 146) (CASE . 145) (IF . 147) (RAISE . 152)
(PLUS . 154) (MINUS . 153) (ABS . 144) (NOT . 150) (NUMERIC_LITERAL . 155)
(NULL . 151) (NEW . 149) (IDENTIFIER . 48) (CHARACTER_LITERAL . 50)
(STRING_LITERAL . 49) (LEFT_PAREN . 148))
((default . error) (SEMICOLON . (aspect_specification_opt . 0)) (WITH .
109))
@@ -2630,13 +2631,13 @@
((default . error) (PACKAGE . (formal_object_declaration . 1))
(PROCEDURE . (formal_object_declaration . 1)) (FUNCTION .
(formal_object_declaration . 1)) (PRAGMA . (formal_object_declaration . 1))
(TYPE . (formal_object_declaration . 1)) (USE . (formal_object_declaration .
1)) (WITH . (formal_object_declaration . 1)) (IDENTIFIER .
(formal_object_declaration . 1)))
((default . error) (SEMICOLON . (aspect_specification_opt . 0)) (WITH .
109))
((default . error) (SEMICOLON . 817))
- ((default . error) (IDENTIFIER . 77))
+ ((default . error) (SEMICOLON . (parameter_specification . 0))
(RIGHT_PAREN . (parameter_specification . 0)) (IDENTIFIER . 77))
((default . error) (DO . (access_definition . 1)) (COLON_EQUAL .
(access_definition . 1)) (RIGHT_PAREN . (access_definition . 1)) (RENAMES .
(access_definition . 1)) (WITH . (access_definition . 1)) (SEMICOLON .
(access_definition . 1)) (IS . (access_definition . 1)))
((default . error) (DO . (access_definition . 2)) (COLON_EQUAL .
(access_definition . 2)) (RIGHT_PAREN . (access_definition . 2)) (RENAMES .
(access_definition . 2)) (WITH . (access_definition . 2)) (SEMICOLON .
(access_definition . 2)) (IS . (access_definition . 2)))
((default . error) (IDENTIFIER . 48) (CHARACTER_LITERAL . 50)
(STRING_LITERAL . 49))
((default . error) (RAISE . 152) (PLUS . 154) (MINUS . 153) (ABS .
144) (NOT . 150) (NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149)
(IDENTIFIER . 48) (CHARACTER_LITERAL . 50) (STRING_LITERAL . 49) (LEFT_PAREN
. 148))
- ((default . error) (RIGHT_PAREN . (parameter_specification . 2))
(SEMICOLON . (parameter_specification . 2)))
- ((default . error) (COLON_EQUAL . 1086) (DOT . 90) (TICK . 91)
(RIGHT_PAREN . (parameter_specification . 1)) (SEMICOLON .
(parameter_specification . 1)) (LEFT_PAREN . 107))
+ ((default . error) (RIGHT_PAREN . (parameter_specification . 3))
(SEMICOLON . (parameter_specification . 3)))
+ ((default . error) (COLON_EQUAL . 1086) (DOT . 90) (TICK . 91)
(RIGHT_PAREN . (parameter_specification . 2)) (SEMICOLON .
(parameter_specification . 2)) (LEFT_PAREN . 107))
((default . error) (IDENTIFIER . (formal_object_declaration . 2)) (WITH
. (formal_object_declaration . 2)) (USE . (formal_object_declaration . 2))
(TYPE . (formal_object_declaration . 2)) (PRAGMA . (formal_object_declaration .
2)) (FUNCTION . (formal_object_declaration . 2)) (PROCEDURE .
(formal_object_declaration . 2)) (PACKAGE . (formal_object_declaration . 2)))
((default . error) (SEMICOLON . 1085))
((default . error) (SEMICOLON . 1084))
@@ -2907,7 +2908,7 @@
((default . error) (PACKAGE . (formal_package_declaration . 0))
(PROCEDURE . (formal_package_declaration . 0)) (FUNCTION .
(formal_package_declaration . 0)) (PRAGMA . (formal_package_declaration . 0))
(TYPE . (formal_package_declaration . 0)) (USE . (formal_package_declaration .
0)) (WITH . (formal_package_declaration . 0)) (IDENTIFIER .
(formal_package_declaration . 0)))
((default . error) (PACKAGE . (formal_object_declaration . 0))
(PROCEDURE . (formal_object_declaration . 0)) (FUNCTION .
(formal_object_declaration . 0)) (PRAGMA . (formal_object_declaration . 0))
(TYPE . (formal_object_declaration . 0)) (USE . (formal_object_declaration .
0)) (WITH . (formal_object_declaration . 0)) (IDENTIFIER .
(formal_object_declaration . 0)))
((default . error) (RAISE . 152) (PLUS . 154) (MINUS . 153) (ABS .
144) (NOT . 150) (NUMERIC_LITERAL . 155) (NULL . 151) (NEW . 149)
(IDENTIFIER . 48) (CHARACTER_LITERAL . 50) (STRING_LITERAL . 49) (LEFT_PAREN
. 148))
- ((default . error) (RIGHT_PAREN . (parameter_specification . 0))
(SEMICOLON . (parameter_specification . 0)))
+ ((default . error) (RIGHT_PAREN . (parameter_specification . 1))
(SEMICOLON . (parameter_specification . 1)))
((default . error) (WITH . (formal_derived_type_definition . 0))
(SEMICOLON . (formal_derived_type_definition . 0)))
((default . error) (DOT . 90) (TICK . 91) (WITH . (interface_list .
1)) (SEMICOLON . (interface_list . 1)) (AND . (interface_list . 1)) (LEFT_PAREN
. 107))
((default . error) (LOOP . (index_constraint . 0)) (DO .
(index_constraint . 0)) (RIGHT_PAREN . (index_constraint . 0)) (COMMA .
(index_constraint . 0)) (EQUAL_GREATER . (index_constraint . 0)) (COLON_EQUAL .
(index_constraint . 0)) (WITH . (index_constraint . 0)) (SEMICOLON .
(index_constraint . 0)) (AND . (index_constraint . 0)) (OF . (index_constraint
. 0)))
@@ -3031,7 +3032,7 @@
((default . error) (SEMICOLON . 1271))
((default . error) (END . 1270))
((default . error) (END . 1269))
- ((default . error) (FOR . 1268) (IDENTIFIER . 77))
+ ((default . error) (FOR . 1268) (SEMICOLON . (parameter_specification .
0)) (RIGHT_PAREN . (parameter_specification . 0)) (IDENTIFIER . 77))
((default . error) (WHEN . 1267))
((default . error) (WHEN . (entry_body_formal_part . 1)))
((default . error) (SEMICOLON . 1266))