Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cics issue #2475

Merged
merged 22 commits into from
Sep 23, 2024
Merged

Fix cics issue #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0603c76
update: fix cics allocate
chacebot Sep 9, 2024
be0752f
update: revert allocate antlr parser rule because it works
chacebot Sep 10, 2024
1b55968
chore: removed commented out lines
chacebot Aug 30, 2024
57db777
update: added order flexibility to sub command and removed string con…
chacebot Sep 10, 2024
8b76367
update: corrected antlr parser rules for new approach
chacebot Sep 4, 2024
1fbe548
update: started parser rule context checks
chacebot Sep 19, 2024
c94eb4f
update: added checking for issue add
chacebot Sep 5, 2024
99ba0d8
update: add context
chacebot Sep 5, 2024
69d3b71
update: added more rule context checking
chacebot Sep 5, 2024
fcf333b
update: added check for end option
chacebot Sep 5, 2024
6570407
update: added context rule logic for issue, removed wait from respons…
chacebot Sep 10, 2024
2b749ef
update: refactored cics issue to use new rule checks
chacebot Sep 10, 2024
b425a12
chore: remove typo add documentation and consolidate a logic flow path
chacebot Sep 11, 2024
9b66a5f
chore: removed unused import
chacebot Sep 11, 2024
862535c
update: created sub rule for common options
chacebot Sep 13, 2024
aae1db0
fix: error message in test
chacebot Sep 13, 2024
e75a313
update: refactor ISSUE context parsing to use mutualllyExclusive helper
chacebot Sep 19, 2024
0472ab6
fix: volume checking flow
chacebot Sep 19, 2024
2e05ef2
update: make ISSUE common parsing consistent
chacebot Sep 19, 2024
b30fb43
chore: remove unused import
chacebot Sep 19, 2024
bdfd993
update: remove untouchable logic for endfile endoutput
chacebot Sep 19, 2024
f4671fd
chore: clean up stream collectors from PR feedback
chacebot Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 31 additions & 35 deletions server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/cics/CICSParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,40 +492,36 @@ cics_invoke: INVOKE (SERVICE cics_data_value | CHANNEL cics_data_value | OPERATI
URIMAP cics_data_value | SCOPE cics_data_value | SCOPELEN cics_data_value | cics_handle_response)+;

/** ISSUE (all of them) */
cics_issue: ISSUE (cics_issue_abend | cics_issue_abort | cics_issue_add | cics_issue_confirmation | cics_issue_copy |
cics_issue_disconnect | cics_issue_endfile | cics_issue_endoutput | EODS | cics_issue_erase |
cics_issue_eraseaup | cics_issue_load | cics_issue_note | cics_issue_pass | PRINT | cics_issue_query |
cics_issue_receive | cics_issue_replace | cics_issue_send | cics_issue_signal);
/** ISSUE ABEND, ISSUE ERROR and ISSUE PREPARE are combined into one as they have the same syntax */
cics_issue_abend: (ABEND | ERROR | PREPARE | CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
/** ISSUE ABORT, ISSUE END and ISSUE WAIT are combined into one as they have the same syntax */
cics_issue_abort: (ABORT | END | WAIT | cics_issue_destid | cics_issue_subaddr | cics_issue_volume | cics_handle_response)+;
cics_issue_destid: (DESTID cics_data_value | DESTIDLENG cics_data_value)+;
cics_issue_subaddr: (SUBADDR cics_data_value | CONSOLE | PRINT | CARD | WPMEDIA1 | WPMEDIA2 | WPMEDIA3 | WPMEDIA4)+;
cics_issue_volume: (VOLUME cics_data_value | VOLUMELENG cics_data_value)+;

cics_issue_add: ADD cics_issue_destid (cics_issue_volume | FROM cics_data_value | LENGTH cics_data_value |
NUMREC cics_data_value | DEFRESP | NOWAIT | RIDFLD cics_data_area | RRN | cics_handle_response)+;
cics_issue_confirmation: CONFIRMATION (CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_copy: COPY (TERMID cics_name | CTLCHAR cics_data_value | WAIT | cics_handle_response)+;
cics_issue_disconnect: DISCONNECT (SESSION cics_name | cics_handle_response)+;
cics_issue_endfile: (ENDFILE | ENDOUTPUT | cics_handle_response)+;
cics_issue_endoutput: (ENDOUTPUT | ENDFILE | cics_handle_response)+;
cics_issue_erase: ERASE (cics_issue_destid | cics_issue_volume | RIDFLD cics_data_area | KEYLENGTH cics_data_value |
KEYNUMBER cics_data_value | RRN | NUMREC cics_data_value | DEFRESP | NOWAIT | cics_handle_response)+;
cics_issue_eraseaup: (ERASEAUP | WAIT | cics_handle_response)+;
cics_issue_load: LOAD (PROGRAM cics_name | CONVERSE | cics_handle_response)+;
cics_issue_note: NOTE (cics_issue_destid | cics_issue_volume | RIDFLD cics_data_area | RRN | cics_handle_response)+;
cics_issue_pass: PASS (LUNAME cics_name | cics_issue_from | LOGMODE cics_data_value | LOGONLOGMODE | NOQUIESCE | cics_handle_response)+;
cics_issue_from: (FROM cics_data_area | LENGTH cics_data_value)+;
cics_issue_query: (QUERY cics_issue_destid | cics_issue_volume | cics_handle_response)+;
cics_issue_receive: (RECEIVE cics_into | LENGTH cics_data_area | cics_handle_response)+;
cics_issue_replace: (REPLACE cics_issue_destid | cics_issue_volume | FROM cics_data_area | LENGTH cics_data_value | RIDFLD
cics_data_area | KEYLENGTH cics_data_value | KEYNUMBER cics_data_value | RRN | DEFRESP | NOWAIT | cics_handle_response)+;
cics_issue_send: SEND (cics_issue_destid | cics_issue_subaddr | cics_issue_volume | FROM cics_data_area |
LENGTH cics_data_value | NOWAIT | DEFRESP | cics_handle_response)+;
cics_issue_signal: SIGNAL (cics_issue_convid | SESSION cics_name | STATE cics_cvda | cics_handle_response)?;
cics_issue_convid: (CONVID cics_name | STATE cics_cvda)+;
cics_issue:
ISSUE (cics_issue_print | cics_issue_eods | cics_issue_abend | cics_issue_abort | cics_issue_add | cics_issue_confirmation
| cics_issue_copy | cics_issue_disconnect | cics_issue_end | cics_issue_endfile_endoutput | cics_issue_erase | cics_issue_erase_aup | cics_issue_error
| cics_issue_load | cics_issue_note | cics_issue_pass | cics_issue_prepare | cics_issue_query | cics_issue_receive | cics_issue_replace | cics_issue_send
| cics_issue_signal | cics_issue_wait);

cics_issue_abend: (ABEND | CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_abort: (ABORT | cics_issue_common | cics_handle_response)+;
cics_issue_add: (ADD | (DESTID | DESTIDLENG | VOLUME | VOLUMELENG | LENGTH | NUMREC) cics_data_value | (FROM | RIDFLD) cics_data_area | DEFRESP | NOWAIT | RRN | cics_handle_response)+;
cics_issue_confirmation: (CONFIRMATION | CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_copy: (COPY | TERMID cics_name | CTLCHAR cics_data_value | WAIT | cics_handle_response)+;
cics_issue_disconnect: (DISCONNECT | SESSION cics_name | cics_handle_response)+;
cics_issue_end: (END | cics_issue_common | cics_handle_response)+;
cics_issue_endfile_endoutput: (ENDFILE | ENDOUTPUT | cics_handle_response)+;
cics_issue_erase: (ERASE | (DESTID | DESTIDLENG | VOLUME | VOLUMELENG | KEYLENGTH | KEYNUMBER | NUMREC) cics_data_value | RIDFLD cics_data_area | RRN | DEFRESP | NOWAIT | cics_handle_response)+;
cics_issue_erase_aup: (ERASEAUP | WAIT | cics_handle_response)+;
cics_issue_error: (ERROR | CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_load: (LOAD | PROGRAM cics_name | CONVERSE | cics_handle_response)+;
cics_issue_note: (NOTE | (DESTID | DESTIDLENG | VOLUME | VOLUMELENG) cics_data_value | RIDFLD cics_data_area | RRN | cics_handle_response)+;
cics_issue_pass: (PASS | LUNAME cics_name | FROM cics_data_area | (LENGTH | LOGMODE) cics_data_value | LOGONLOGMODE | NOQUIESCE | cics_handle_response)+;
cics_issue_prepare: (PREPARE | CONVID cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_query: (QUERY | (DESTID | DESTIDLENG | VOLUME | VOLUMELENG) cics_data_value | cics_handle_response)+;
cics_issue_receive: (RECEIVE | (INTO | LENGTH) cics_data_area | SET cics_ref | cics_handle_response)+;
cics_issue_replace: (REPLACE | (DESTID | DESTIDLENG | VOLUME | VOLUMELENG | LENGTH | NUMREC | KEYLENGTH | KEYNUMBER) cics_data_value | (FROM | RIDFLD) cics_data_area | RRN | DEFRESP | NOWAIT | cics_handle_response)+;
cics_issue_send: (SEND | LENGTH cics_data_value | FROM cics_data_area | cics_issue_common | NOWAIT | DEFRESP | cics_handle_response)+;
cics_issue_signal: (SIGNAL | (CONVID | SESSION) cics_name | STATE cics_cvda | cics_handle_response)+;
cics_issue_wait: (WAIT | cics_issue_common | cics_handle_response)+;
cics_issue_print: (PRINT | cics_handle_response)+;
cics_issue_eods: (EODS | cics_handle_response)+;
cics_issue_common: ((DESTID | DESTIDLENG | VOLUME | VOLUMELENG | SUBADDR) cics_data_value | CONSOLE | PRINT | CARD | WPMEDIA1 | WPMEDIA2 | WPMEDIA3 | WPMEDIA4)+;

/** LINK / LINK ACQPROCESS / LINK ACTIVITY: */
cics_link: LINK (cics_link_program | cics_link_acqprocess | cics_link_activity);
Expand Down Expand Up @@ -931,7 +927,7 @@ cics_file_name: (FILE | DATASET) cics_name;
/** RESP **/
cics_resp: (RESP | RESP2) cics_data_area;

cics_handle_response: cics_inline_handle_exception | WAIT;
cics_handle_response: cics_inline_handle_exception;
cics_inline_handle_exception: (cics_resp | NOHANDLE)+;

cics_data_area: LPARENCHAR data_area RPARENCHAR;
Expand Down
Loading
Loading