Skip to content

fix: remove argument from DBCONN and MQCONN #2686

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

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix: remove argument from DBCONN and MQCONN #2686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 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 @@ -317,9 +317,10 @@ cics_deq_cmds : (RESOURCE cics_data_area | LENGTH cics_data_value | MAXLIFETIME

/** DISCARD System Commands **/
cics_discard: DISCARD cics_discard_body;
cics_discard_body: cics_handle_response* (ATOMSERVICE | AUTINSTMODEL | BUNDLE | CONNECTION | DB2CONN | DB2ENTRY | DB2TRAN | DOCTEMPLATE |
ENQMODEL | FILE | IPCONN | JOURNALMODEL | JOURNALNAME | JVMSERVER | LIBRARY | MQCONN | MQMONITOR | PARTNER | PIPELINE |
PROCESSTYPE | PROFILE | PROGRAM | TCPIPSERVICE | TDQUEUE | TERMINAL | TRANCLASS | TRANSACTION | TSMODEL | URIMAP | WEBSERVICE) cics_data_value cics_handle_response*;
cics_discard_body: cics_handle_response* ((ATOMSERVICE | AUTINSTMODEL | BUNDLE | CONNECTION | DB2ENTRY | DB2TRAN | DOCTEMPLATE |
ENQMODEL | FILE | IPCONN | JOURNALMODEL | JOURNALNAME | JVMSERVER | LIBRARY | MQMONITOR | PARTNER | PIPELINE |
PROCESSTYPE | PROFILE | PROGRAM | TCPIPSERVICE | TDQUEUE | TERMINAL | TRANCLASS | TRANSACTION | TSMODEL | URIMAP | WEBSERVICE) cics_data_value |
DB2CONN | MQCONN) cics_handle_response*;

/** DOCUMENT CREATE / DELETE / INSERT / RETRIEVE / SET */
cics_document: DOCUMENT (cics_document_create | DELETE DOCTOKEN cics_data_area | cics_document_insert |
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/org/eclipse/lsp/cobol/implicitDialects/cics/utility/CICSDiscardOptionsUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class CICSDiscardOptionsUtility extends CICSOptionsCheckBaseUtility {
put(CICSLexer.AUTINSTMODEL, ErrorSeverity.ERROR);
put(CICSLexer.BUNDLE, ErrorSeverity.ERROR);
put(CICSLexer.CONNECTION, ErrorSeverity.ERROR);
put(CICSLexer.DB2CONN, ErrorSeverity.ERROR);
put(CICSLexer.DB2CONN, ErrorSeverity.WARNING);
put(CICSLexer.DB2ENTRY, ErrorSeverity.ERROR);
put(CICSLexer.DB2TRAN, ErrorSeverity.ERROR);
put(CICSLexer.DOCTEMPLATE, ErrorSeverity.ERROR);
Expand All @@ -49,7 +49,7 @@ public class CICSDiscardOptionsUtility extends CICSOptionsCheckBaseUtility {
put(CICSLexer.JOURNALNAME, ErrorSeverity.ERROR);
put(CICSLexer.JVMSERVER, ErrorSeverity.ERROR);
put(CICSLexer.LIBRARY, ErrorSeverity.ERROR);
put(CICSLexer.MQCONN, ErrorSeverity.ERROR);
put(CICSLexer.MQCONN, ErrorSeverity.WARNING);
put(CICSLexer.MQMONITOR, ErrorSeverity.ERROR);
put(CICSLexer.PARTNER, ErrorSeverity.ERROR);
put(CICSLexer.PIPELINE, ErrorSeverity.ERROR);
Expand Down
4 changes: 2 additions & 2 deletions server/engine/src/test/java/org/eclipse/lsp/cobol/usecases/TestCicsDiscard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class TestCicsDiscard {
private static final String DISCARD_AUTINSTMODEL_VALID = "DISCARD AUTINSTMODEL({$varFour}) RESP({$varOne})";
private static final String DISCARD_BUNDLE_VALID = "DISCARD BUNDLE({$varFour})";
private static final String DISCARD_CONNECTION_VALID = "DISCARD RESP({$varOne}) CONNECTION({$varFour})";
private static final String DISCARD_DB2CONN_VALID = "DISCARD DB2CONN({$varFour})";
private static final String DISCARD_DB2CONN_VALID = "DISCARD DB2CONN";
private static final String DISCARD_DB2ENTRY_VALID = "DISCARD DB2ENTRY({$varFour}) NOHANDLE";
private static final String DISCARD_DB2TRAN_VALID = "DISCARD DB2TRAN({$varFour})";
private static final String DISCARD_DOCTEMPLATE_VALID = "DISCARD NOHANDLE DOCTEMPLATE({$varFour}) RESP({$varOne})";
Expand All @@ -46,7 +46,7 @@ public class TestCicsDiscard {
private static final String DISCARD_JOURNALNAME_VALID = "DISCARD JOURNALNAME({$varFour})";
private static final String DISCARD_JVMSERVER_VALID = "DISCARD NOHANDLE JVMSERVER({$varFour})";
private static final String DISCARD_LIBRARY_VALID = "DISCARD LIBRARY({$varFour})";
private static final String DISCARD_MQCONN_VALID = "DISCARD MQCONN({$varFour}) RESP({$varOne})";
private static final String DISCARD_MQCONN_VALID = "DISCARD MQCONN RESP({$varOne})";
private static final String DISCARD_MQMONITOR_VALID = "DISCARD MQMONITOR({$varFour})";
private static final String DISCARD_PARTNER_VALID = "DISCARD PARTNER({$varFour})";
private static final String DISCARD_PIPELINE_VALID = "DISCARD RESP({$varOne}) PIPELINE({$varFour})";
Expand Down
Loading