pike.git/ src/ language.yacc

2013-11-08

2013-11-08 13:09:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• a83d12186a0db9d430365f0273fe448ee7c53a18 (67 lines) (+53/-14) ^{[ Show | Annotate ]}
  Branch: 7.9

Language: Extended syntax for names of inherit scopes.

Inherit scope names may now be strings and not just identifiers.

Example:

inherit "foo.pike";
inherit bar : "other/stuff";

void foo() { "foo.pike"::foo(); }
void bar() { "other/stuff"::bar(); }

Thanks to Ralph Ritoch <rritoch@gmail.com> for the suggestion.

282:   %type <n> simple_type   %type <n> simple_type2   %type <n> simple_identifier_type + %type <n> real_string_constant + %type <n> real_string_or_identifier   %type <n> string_constant -  + %type <n> string_or_identifier   %type <n> string_segment   %type <n> string   %type <n> TOK_STRING
387:    | /* empty */    ;    - string_constant: string -  | string_constant '+' string -  { -  struct pike_string *a,*b; -  copy_shared_string(a,$1->u.sval.u.string); -  copy_shared_string(b,$3->u.sval.u.string); -  free_node($1); -  free_node($3); -  a=add_and_free_shared_strings(a,b); -  $$=mkstrnode(a); -  free_string(a); -  } + real_string_or_identifier: TOK_IDENTIFIER +  | real_string_constant    ;    - optional_rename_inherit: ':' TOK_IDENTIFIER { $$=$2; } + optional_rename_inherit: ':' real_string_or_identifier { $$=$2; }    | ':' bad_identifier { $$=0; }    | ':' error { $$=0; }    | { $$=0; }
3880:    | idents '.' error {}    ;    - inherit_specifier: TOK_IDENTIFIER TOK_COLON_COLON + string_or_identifier: TOK_IDENTIFIER +  | string +  ; +  + inherit_specifier: string_or_identifier TOK_COLON_COLON    {    struct compilation *c = THIS_COMPILATION;    int e = -1;
4435:    }    ;    + string_constant: string +  | string_constant '+' string +  { +  struct pike_string *a,*b; +  copy_shared_string(a,$1->u.sval.u.string); +  copy_shared_string(b,$3->u.sval.u.string); +  free_node($1); +  free_node($3); +  a=add_and_free_shared_strings(a,b); +  $$=mkstrnode(a); +  free_string(a); +  } +  ; +  + /* Same as string_constant above, but without TOK_FUNCTION_NAME. */ + real_string_constant: TOK_STRING +  | real_string_constant TOK_STRING +  { +  struct pike_string *a,*b; +  copy_shared_string(a,$1->u.sval.u.string); +  copy_shared_string(b,$2->u.sval.u.string); +  free_node($1); +  free_node($2); +  a=add_and_free_shared_strings(a,b); +  $$=mkstrnode(a); +  free_string(a); +  } +  | real_string_constant '+' TOK_STRING +  { +  struct pike_string *a,*b; +  copy_shared_string(a,$1->u.sval.u.string); +  copy_shared_string(b,$3->u.sval.u.string); +  free_node($1); +  free_node($3); +  a=add_and_free_shared_strings(a,b); +  $$=mkstrnode(a); +  free_string(a); +  } +  ; +  +    /*    * Some error-handling    */