Skip to content

Commit

Permalink
WEB rule checking and fixes
Browse files Browse the repository at this point in the history 
Added more WEB command rule verification, and fixes/consolidation of rules as well to correspond with the new checks.
  • Loading branch information
@mm-broadcom
mm-broadcom committed Sep 18, 2024
1 parent bb49101 commit a94c878
Show file tree
Hide file tree
Showing 2 changed files with 229 additions and 47 deletions.
23 changes: 9 additions & 14 deletions server/engine/src/main/antlr4/org/eclipse/lsp/cobol/implicitDialects/cics/CICSParser.g4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ cics_web: WEB (cics_web_close | cics_web_converse | cics_web_endbrowse | cics_we

cics_web_close: CLOSE SESSTOKEN cics_data_value;

cics_web_converse: CONVERSE (((SESSTOKEN | MEDIATYPE | MAXLENGTH) cics_data_value) | cics_web_path_urimap | cics_web_http_call_method | cics_web_querystring |
cics_web_converse: CONVERSE (((SESSTOKEN | MEDIATYPE | MAXLENGTH) cics_data_value) | cics_web_path | cics_web_urimap | cics_web_http_call_method | cics_web_querystring |
cics_web_body | cics_web_action_expect | cics_web_close_options | cics_web_converse_credentials | cics_web_into_set_tocontainer | (TOLENGTH | BODYCHARSET) cics_data_area | NOTRUNCATE |
cics_web_statuscode | cics_web_translation)+;

Expand All @@ -868,10 +868,7 @@ cics_web_open: OPEN (cics_web_urimap | cics_web_host_portnumber | (CERTIFICATE|C

cics_web_parse: PARSE ((URL|URLLENGTH|PORTNUMBER) cics_data_value | (SCHEMENAME cics_data_area) | cics_web_host_hosttype | cics_web_path | cics_web_querystring)+;

cics_web_read: READ (cics_web_read_formfield | cics_web_read_httpheader | cics_web_read_queryparm);
cics_web_read_formfield: FORMFIELD cics_data_area ((NAMELENGTH | CHARACTERSET | HOSTCODEPAGE) cics_data_value | (VALUE | VALUELENGTH) cics_data_area | SET ptr_ref)+;
cics_web_read_httpheader: HTTPHEADER cics_data_area ((SESSTOKEN | VALUE | VALUELENGTH) cics_data_area | NAMELENGTH cics_data_value)+;
cics_web_read_queryparm: QUERYPARM cics_data_value ((NAMELENGTH | HOSTCODEPAGE) cics_data_value | ((VALUE | VALUELENGTH) cics_data_area) | SET ptr_ref)+;
cics_web_read: READ ((FORMFIELD | HTTPHEADER) cics_data_area | QUERYPARM cics_data_value) ((NAMELENGTH | CHARACTERSET | HOSTCODEPAGE) cics_data_value | (SESSTOKEN | VALUE | VALUELENGTH) cics_data_area | SET ptr_ref)+;

cics_web_readnext: READNEXT (cics_web_readnext_formfield_queryparm | cics_web_readnext_httpheader);
cics_web_readnext_formfield_queryparm: (FORMFIELD|QUERYPARM) cics_data_area ((VALUE | VALUELENGTH) cics_data_area | NAMELENGTH cics_data_value)+;
Expand All @@ -880,7 +877,7 @@ cics_web_readnext_httpheader: HTTPHEADER cics_data_area ((VALUE|VALUELENGTH) cic
cics_web_receive: RECEIVE (cics_web_receive_server_buffer | cics_web_receive_server_container | cics_web_receive_client);
cics_web_receive_server_buffer: (cics_web_into_set | (LENGTH|BODYCHARSET) cics_data_area | ((MAXLENGTH|CHARACTERSET|HOSTCODEPAGE|MEDIATYPE) cics_data_value) | NOTRUNCATE | (TYPE cics_cvda) | cics_web_server_convert)+;
cics_web_receive_server_container: (((TOCONTAINER|TOCHANNEL|CHARACTERSET|MEDIATYPE) cics_data_value) | (TYPE cics_cvda) | (BODYCHARSET cics_data_area))+;
cics_web_receive_client: SESSTOKEN cics_data_value ((MEDIATYPE cics_data_value) | cics_web_statuscode | cics_web_receive_client_buffer | cics_web_receive_client_container)+;
cics_web_receive_client: (((SESSTOKEN|MEDIATYPE) cics_data_value) | cics_web_statuscode | cics_web_receive_client_buffer | cics_web_receive_client_container)+;
cics_web_receive_client_buffer: (cics_web_into_set | (LENGTH|BODYCHARSET) cics_data_area | (MAXLENGTH cics_data_value) | NOTRUNCATE | cics_web_client_convert)+;
cics_web_receive_client_container: (TOCONTAINER cics_data_value | (TOCHANNEL cics_data_value) | (BODYCHARSET cics_data_area))+;

Expand All @@ -889,18 +886,16 @@ cics_web_retrieve: RETRIEVE DOCTOKEN cics_data_area;
cics_web_send: SEND (cics_web_send_server | cics_web_send_client);
cics_web_send_server: (cics_web_send_server_body | ((MEDIATYPE|CHARACTERSET) cics_data_value) | cics_web_server_convert | cics_web_statuscode |
(IMMEDIATE | EVENTUAL | ACTION cics_cvda) | (NOCLOSE | CLOSE | CLOSESTATUS cics_cvda) )+;
cics_web_send_client: SESSTOKEN cics_data_value (cics_web_http_call_method | cics_web_path_urimap | cics_web_querystring | cics_web_send_client_body | cics_web_client_convert |
cics_web_send_client: SESSTOKEN cics_data_value (cics_web_http_call_method | cics_web_path | cics_web_urimap | cics_web_querystring | cics_web_send_client_body | cics_web_client_convert |
(CHARACTERSET cics_data_value) | EXPECT | NOCLOSE | CLOSE | ((ACTION | CLOSESTATUS) cics_cvda) | cics_web_server_client_credentials)+;

cics_web_startbrowse: STARTBROWSE (cics_web_startbrowse_formfield | cics_web_startbrowse_httpheader | cics_web_startbrowse_queryparm);
cics_web_startbrowse_formfield: FORMFIELD cics_data_area? ((NAMELENGTH cics_data_area) | (CHARACTERSET|HOSTCODEPAGE) cics_data_value)+;
cics_web_startbrowse: STARTBROWSE (cics_web_startbrowse_formfield_queryparm | cics_web_startbrowse_httpheader);
cics_web_startbrowse_formfield_queryparm: (((FORMFIELD|QUERYPARM) cics_data_area?) | (NAMELENGTH cics_data_area) | (CHARACTERSET|HOSTCODEPAGE) cics_data_value)+;
cics_web_startbrowse_httpheader: HTTPHEADER (SESSTOKEN cics_data_area)?;
cics_web_startbrowse_queryparm: QUERYPARM cics_data_area? ((NAMELENGTH cics_data_area) | (HOSTCODEPAGE cics_data_value))+;

cics_web_write: WRITE ((HTTPHEADER|NAMELENGTH|SESSTOKEN|VALUE|VALUELENGTH) cics_data_area)+;

// WEB Helpers
cics_web_path_urimap: (cics_web_path | cics_web_urimap);
cics_web_path: (PATH cics_data_area | PATHLENGTH cics_data_value)+;
cics_web_urimap: URIMAP cics_data_value;
cics_web_querystring: (QUERYSTRING cics_data_area | QUERYSTRLEN cics_data_value)+;
Expand All @@ -925,7 +920,7 @@ cics_web_host_hosttype: cics_web_host (HOSTTYPE cics_cvda)?;
cics_web_host_portnumber: cics_web_host PORTNUMBER cics_data_value SCHEME cics_cvda;
cics_web_httpmethod: ((HTTPMETHOD|METHODLENGTH) cics_data_area);
cics_web_httpversion: (HTTPVERSION|VERSIONLEN) cics_data_area;
cics_web_realm: REALM cics_data_area REALMLEN cics_data_area;
cics_web_realm: (REALM|REALMLEN) cics_data_area;
cics_web_open_deprecated: (CIPHERS|NUMCIPHERS) cics_data_value;

cics_web_into_set: (INTO cics_data_area | SET ptr_ref);
Expand All @@ -939,9 +934,9 @@ cics_web_auth_username_password: (cics_web_auth_username | cics_web_auth_passwor
cics_web_auth_username: (USERNAME|USERNAMELEN) cics_data_value;
cics_web_auth_password: (PASSWORD|PASSWORDLEN) cics_data_value;

cics_web_send_doctoken: DOCTOKEN cics_data_value (NODOCDELETE | DOCDELETE | DOCSTATUS cics_cvda)?;
cics_web_send_doctoken: (DOCTOKEN cics_data_value | (NODOCDELETE | DOCDELETE | DOCSTATUS cics_cvda));
cics_web_send_from_chunk: FROM cics_data_area | FROMLENGTH cics_data_value | (CHUNKNO | CHUNKYES | CHUNKEND | CHUNKING cics_cvda);
cics_web_send_container_subrule: CONTAINER cics_data_value (CHANNEL cics_data_value)?;
cics_web_send_container_subrule: (CONTAINER cics_data_value | CHANNEL cics_data_value)+;

cics_web_send_server_body: (cics_web_send_doctoken | cics_web_send_from_chunk | (HOSTCODEPAGE cics_data_value) | cics_web_send_container_subrule);
cics_web_send_client_body: (cics_web_send_doctoken | cics_web_send_from_chunk | cics_web_send_container_subrule)+;
Expand Down
Loading

0 comments on commit a94c878

Please sign in to comment.