pike.git/ src/ language.yacc

1996-11-08

1996-11-08 04:57:40 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• d2c608fc1d502911105fec8e5b5091a06a762031 (153 lines) (+129/-24) ^{[ Show | Annotate ]}
  Branch: 7.9

object(foo), prog(), 'constant' and class foo {} implemented

Rev: src/ChangeLog:1.18
Rev: src/builtin_functions.c:1.9
Rev: src/builtin_functions.h:1.2
Rev: src/docode.c:1.3
Rev: src/interpret.c:1.8
Rev: src/language.yacc:1.6
Rev: src/lex.c:1.6
Rev: src/object.c:1.3
Rev: src/object.h:1.3
Rev: src/pike_types.c:1.5
Rev: src/program.c:1.4
Rev: src/program.h:1.2
Rev: src/testsuite.in:1.6

80:   %token F_CLASS   %token F_COLON_COLON   %token F_COMMA + %token F_CONSTANT   %token F_CONTINUE   %token F_DEFAULT   %token F_DIV_EQ
299:   %type <n> for_expr   %type <n> foreach   %type <n> gauge + %type <n> idents   %type <n> lambda   %type <n> local_name_list   %type <n> lvalue
342:    | { $$=0; }    ;    - inheritance: modifiers F_INHERIT string_constant optional_rename_inherit ';' + program_ref: string_constant    { -  simple_do_inherit($3,$1,$4); +  reference_shared_string($1); +  push_string($1); +  push_string($1); +  reference_shared_string(current_file); +  push_string(current_file); +  SAFE_APPLY_MASTER("handle_inherit", 2); +  +  if(sp[-1].type != T_PROGRAM) +  my_yyerror("Couldn't cast program to string (%s)",$1->str);    } -  +  | idents +  { +  push_string(make_shared_string("")); +  switch($1->token) +  { +  case F_CONSTANT: +  if($1->u.sval.type == T_PROGRAM) +  { +  push_svalue(& $1->u.sval); +  }else{ +  yyerror("Illegal program identifier"); +  push_int(0); +  } +  break; +  +  case F_IDENTIFIER: +  { +  struct identifier *i; +  setup_fake_program(); +  i=ID_FROM_INT(& fake_program, $1->u.number); +  +  if(IDENTIFIER_IS_CONSTANT(i->flags)) +  { +  push_svalue(PROG_FROM_INT(&fake_program, $1->u.number)->constants + +  i->func.offset); +  }else{ +  yyerror("Illegal program identifier"); +  push_int(0); +  } +  break; +  } +  } +  free_node($1); +  }    ;    -  + inheritance: modifiers F_INHERIT program_ref optional_rename_inherit ';' +  { +  struct pike_string *s; +  if(sp[-1].type == T_PROGRAM) +  { +  s=sp[-2].u.string; +  if($4) s=$4; +  do_inherit(sp[-1].u.program,$1,s); +  if($4) free_string($4); +  } +  pop_n_elems(2); +  } +  ; +  + constant_name: F_IDENTIFIER '=' expr0 +  { +  int tmp; +  /* This can be made more lenient in the future */ +  if(!is_const($3)) +  { +  struct svalue tmp; +  yyerror("Constant definition is not constant."); +  tmp.type=T_INT; +  tmp.u.integer=0; +  add_constant($1,&tmp, current_modifiers); +  } else { +  tmp=eval_low($3); +  if(tmp < 1) +  yyerror("Error in constant definition."); +  pop_n_elems(tmp-1); +  add_constant($1,sp-1,current_modifiers); +  free_string($1); +  pop_stack(); +  } +  } +  ; +  + constant_list: constant_name +  | constant_list ',' constant_name +  ; +  + constant: F_CONSTANT modifiers constant_list ';' +  ; +    block_or_semi: block    {    $$ = mknode(F_ARG_LIST,$1,mknode(F_RETURN,mkintnode(0),0));
458:    }    | modifiers type_or_error name_list ';' {}    | inheritance {} +  | constant {} +  | class {}    | error    {    reset_type_stack();
471:    ;      optional_identifier: F_IDENTIFIER -  | /* empty */ { $$=make_shared_string(""); } +  | /* empty */ { $$=0; }    ;      
484:    push_type(T_ARRAY);    varargs=1;    } +  if(!$3) $3=make_shared_string("");    if(islocal($3) >= 0)    my_yyerror("Variable '%s' appear twice in argument list.",    $3->str);
534:   type3: F_INT_ID { push_type(T_INT); }    | F_FLOAT_ID { push_type(T_FLOAT); }    | F_STRING_ID { push_type(T_STRING); } -  | F_OBJECT_ID { push_type(T_OBJECT); } +     | F_PROGRAM_ID { push_type(T_PROGRAM); }    | F_VOID_ID { push_type(T_VOID); }    | F_MIXED_ID { push_type(T_MIXED); } -  +  | F_OBJECT_ID opt_object_type { push_type(T_OBJECT); }    | F_MAPPING_ID opt_mapping_type { push_type(T_MAPPING); }    | F_ARRAY_ID opt_array_type { push_type(T_ARRAY); }    | F_MULTISET_ID opt_array_type { push_type(T_MULTISET); }    | F_FUNCTION_ID opt_function_type { push_type(T_FUNCTION); }    ;    -  + opt_object_type: /* Empty */ { push_type_int(0); } +  | '(' program_ref ')' +  { +  if(sp[-1].type == T_PROGRAM) +  push_type_int(sp[-1].u.program->id); +  pop_n_elems(2); +  } +  ; +    opt_function_type: '('    {    type_stack_mark();
786:    }    ;    - class: F_CLASS '{' + class: F_CLASS optional_identifier '{'    {    start_new_program();    }
803:    s.type=T_PROGRAM;    s.subtype=0;    } +  if($2) add_constant($2, &s, 0);    $$=mksvaluenode(&s);    free_svalue(&s);    }
1007:    | sscanf    | lambda    | class -  | F_IDENTIFIER +  | idents +  | expr4 '(' expr_list ')' { $$=mkapplynode($1,$3); } +  | expr4 '[' expr0 ']' { $$=mknode(F_INDEX,$1,$3); } +  | expr4 '[' comma_expr_or_zero F_DOT_DOT comma_expr_or_maxint ']'    { -  +  $$=mknode(F_RANGE,$1,mknode(F_ARG_LIST,$3,$5)); +  } +  | '(' comma_expr2 ')' { $$=$2; } +  | '(' '{' expr_list '}' ')' +  { $$=mkefuncallnode("aggregate",$3); } +  | '(' '[' m_expr_list ']' ')' +  { $$=mkefuncallnode("aggregate_mapping",$3); }; +  | F_MULTISET_START expr_list F_MULTISET_END +  { $$=mkefuncallnode("aggregate_multiset",$2); } +  | expr4 F_ARROW F_IDENTIFIER +  { +  $$=mknode(F_INDEX,$1,mkstrnode($3)); +  free_string($3); +  } +  ; +  + idents: F_IDENTIFIER +  {    int i;    struct efun *f;    if((i=islocal($1))>=0)
1037:    }    free_string($3);    } -  | expr4 '(' expr_list ')' { $$=mkapplynode($1,$3); } -  | expr4 '[' expr0 ']' { $$=mknode(F_INDEX,$1,$3); } -  | expr4 '[' comma_expr_or_zero F_DOT_DOT comma_expr_or_maxint ']' -  { -  $$=mknode(F_RANGE,$1,mknode(F_ARG_LIST,$3,$5)); -  } -  | '(' comma_expr2 ')' { $$=$2; } -  | '(' '{' expr_list '}' ')' -  { $$=mkefuncallnode("aggregate",$3); } -  | '(' '[' m_expr_list ']' ')' -  { $$=mkefuncallnode("aggregate_mapping",$3); }; -  | F_MULTISET_START expr_list F_MULTISET_END -  { $$=mkefuncallnode("aggregate_multiset",$2); } -  | expr4 F_ARROW F_IDENTIFIER -  { -  $$=mknode(F_INDEX,$1,mkstrnode($3)); -  free_string($3); -  } +     | F_IDENTIFIER F_COLON_COLON F_IDENTIFIER    {    int f;