=== modified file 'src/com/goldencode/p2j/uast/progress.g' --- src/com/goldencode/p2j/uast/progress.g 2017-08-06 14:01:55 +0000 +++ src/com/goldencode/p2j/uast/progress.g 2017-08-17 21:00:44 +0000 @@ -1679,11 +1679,11 @@ ** needed because the 2nd alternative will already match record_funcs. ** It was causing problems when the input function was used for ** attribute access (meaningless, but it works). -** GES 20170706 Refined the CARET in the IMPORT UNFORMATTED statement to make it a +** GES 20170706 Refined the CARET in the IMPORT UNFORMATTED statement to make it a ** more generic result, after testing different forms that are ** possible in the 4GL. Added some undocumented names to key_function. ** Added the MESSAGE-DIGEST() built-in function. -** GES 20170707 Added the FIRST-OBJECT attribute. Modified key_function to support +** GES 20170707 Added the FIRST-OBJECT attribute. Modified key_function to support ** an undocumented (but fully functional) STRING form. Changed ** incorrect usage of lvalue to expr in lob_spec. Added KW_BREAK to ** the open_query_stmt. Unified the list_items_clause and the @@ -1691,7 +1691,7 @@ ** matches the same syntax for both. The pairs version will generate ** a runtime warning 4041 when used but for definition purposes there ** is no checking. -** GES 20170708 The triggers phrase (used in widget and variable definitions or +** GES 20170708 The triggers phrase (used in widget and variable definitions or ** create statements) has an undocumented feature where it allows the ** embedded END statement (or END TRIGGERS) to be closed with etiher ** a DOT or a COLON. Other uses of the END statement seem to only @@ -1700,31 +1700,33 @@ ** This is tricky because the matching closes the containing language ** statement since this is just a phrase. This is referered to as the ** allowColon undocumented feature. -** GES 20170710 Added undocumented abbreviation for ICFPARAMETER. Added +** GES 20170710 Added undocumented abbreviation for ICFPARAMETER. Added ** XML-NODE-NAME as an attribute. -** CA 20170710 column_spec (used by DEFINE BROWSE ... DISPLAY ... statement) must +** CA 20170710 column_spec (used by DEFINE BROWSE ... DISPLAY ... statement) must ** check for isQualifiedFieldNameQuirk before deciding if LT is a ** record or not (as between the table, dot and field might be ** whitespace or comments). ** embedded_sql: a "CLOSE cursor" must be disambiguated from a ** "CLOSE()" function call. -** CA 20170711 Added parse for "STOP-AFTER expr" option at DO, FOR and REPEAT. +** CA 20170711 Added parse for "STOP-AFTER expr" option at DO, FOR and REPEAT. ** Added undocumented LABEL option at DEFINE TEMP-TABLE/WORK-TABLE. ** Fixed problems in pre_scan_class: non-method members were not ** included and also it was not differentiating properly the recursive ** calls. -** GES 20170719 Added ADD-PARENT-ID-RELATION and TOP-NAV-QUERY. -** HC 20170725 "COMPILE" statement must be disambiguated from a "COMPILE()" function +** GES 20170719 Added ADD-PARENT-ID-RELATION and TOP-NAV-QUERY. +** HC 20170725 "COMPILE" statement must be disambiguated from a "COMPILE()" function ** call. -** HC 20170726 Added number of errors counter. -** ECF 20170731 Fixed connect_stmt to make physical database name optional. -** GES 20170730 BUFFER-COMPARE is reserved and can be abbreviated. BUFFER-COPY is +** HC 20170726 Added number of errors counter. +** ECF 20170731 Fixed connect_stmt to make physical database name optional. +** GES 20170730 BUFFER-COMPARE is reserved and can be abbreviated. BUFFER-COPY is ** reserved. Both of these changes were undocumented. -** CA 20170804 IN SUPER or IN handle functions can be defined inside a class. -** HC 20170804 Added ROW-STATE built-in function handling to record_funcs to fix +** CA 20170804 IN SUPER or IN handle functions can be defined inside a class. +** HC 20170804 Added ROW-STATE built-in function handling to record_funcs to fix ** parsing of ROW-STATE function call. -** GES 20170806 Added undocumented string option X which can be present in any +** GES 20170806 Added undocumented string option X which can be present in any ** case where U would be present (but not together with U). +** 326 GES 20170817 Added the TERM reserved keyword and removed the abbreviation for +** TERMINAL (the 4GL docs are incorrect on this point). */ /* @@ -30858,7 +30860,8 @@ new Keyword("temp-directory" , 8, KW_TEMP_DIR, false), new Keyword("temp-table" , 0, KW_TEMP_TAB, false), new Keyword("temp-table-prepare" , 0, KW_TT_PREP , false), - new Keyword("terminal" , 4, KW_TERM , true ), + new Keyword("term" , 0, KW_TERM , true ), // non-abbreviated synonym for TERMINAL + new Keyword("terminal" , 0, KW_TERM , true ), // the keyword index incorrectly states that TERMINAL can be abbreviatated down to a minimum TERM, this is not correct, there is no abbreviation possible (just the synonym TERM) new Keyword("terminate" , 0, KW_TERMINAT, false), new Keyword("text" , 0, KW_TEXT , true ), new Keyword("text-cursor" , 0, KW_TXT_CURS, true ), @@ -30980,7 +30983,7 @@ new Keyword("virtual-width-pixels" , 15, KW_VIRT_WP , false), new Keyword("vms" , 0, KW_VMS , true ), // undocumented new Keyword("void" , 0, KW_VOID , false), - new Keyword("wait" , 0, KW_WAIT_FOR, false), + new Keyword("wait" , 0, KW_WAIT_FOR, false), // non-abbreviated synonym for WAIT-FOR new Keyword("wait-for" , 0, KW_WAIT_FOR, true ), new Keyword("warning" , 0, KW_WARN , false), new Keyword("web" , 0, KW_WEB , false), // missing in keyword index, found in WebSpeed reference