@@ -2709,7 +2709,7 @@ set_oo_class_attr(enum cb_oo_class_attribute attr, const char* attr_name)
27092709%token CLASS
27102710%token CLASS_ID " CLASS-ID"
27112711%token CLASSIFICATION
2712- %token CLASS_NAME " class-name "
2712+ %token CLASS_NAME
27132713%token CLEAR_SELECTION " CLEAR-SELECTION"
27142714%token CLINE
27152715%token CLINES /* remark: not used here */
@@ -3012,6 +3012,7 @@ set_oo_class_attr(enum cb_oo_class_attribute attr, const char* attr_name)
30123012%token INITIALIZE
30133013%token INITIALIZED
30143014%token INITIATE
3015+ %token INLINE_METHOD_INVOCATION_OP
30153016%token INPUT
30163017%token INPUT_OUTPUT " INPUT-OUTPUT"
30173018%token INQUIRE
@@ -3192,6 +3193,7 @@ set_oo_class_attr(enum cb_oo_class_attribute attr, const char* attr_name)
31923193%token ONLY
31933194%token ON_ESCAPE " ON ESCAPE"
31943195%token ON_EXCEPTION " ON EXCEPTION"
3196+ %token OO_CLASS_NAME " class-name"
31953197%token OPEN
31963198%token OPTIONAL
31973199%token OPTIONS
@@ -4172,7 +4174,7 @@ interface_id_header:
41724174;
41734175
41744176class_id_name :
4175- CLASS_NAME { $$ = $1 ; }
4177+ OO_CLASS_NAME { $$ = $1 ; }
41764178| LITERAL
41774179 {
41784180 cb_trim_program_id ($1 );
@@ -8847,7 +8849,7 @@ _object_reference_type:
88478849 /* empty */
88488850| WORD
88498851| _factory_of ACTIVE_CLASS
8850- | _factory_of CLASS_NAME _only
8852+ | _factory_of OO_CLASS_NAME _only
88518853;
88528854
88538855_factory_of:
@@ -12217,7 +12219,6 @@ statement:
1221712219| if_statement
1221812220| initialize_statement
1221912221| initiate_statement
12220- // | inline_method_invocation_statement
1222112222| inquire_statement
1222212223| inspect_statement
1222312224| invoke_statement
@@ -15509,11 +15510,9 @@ id_or_class_name:
1550915510| class_id_name
1551015511;
1551115512
15512- // inline_method_invocation_statement:
15513- // id_or_class_name "::" literal
15514- // | id_or_class_name "::" literal
15515- // TOK_OPEN_PAREN call_param_list TOK_CLOSE_PAREN
15516- // ;
15513+ inline_method_invocation:
15514+ id_or_class_name INLINE_METHOD_INVOCATION_OP literal func_args
15515+ ;
1551715516
1551815517/* INQUIRE statement */
1551915518
@@ -20637,6 +20636,7 @@ function:
2063720636 {
2063820637 $$ = cb_build_intrinsic ($1 , $2 , $3 , 1 );
2063920638 }
20639+ | inline_method_invocation
2064020640;
2064120641
2064220642func_no_parm:
0 commit comments