pike.git/ src/ language.yacc

2000-09-26

2000-09-26 00:17:48 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• ac8715e7f16ab29b24a79eab40686f01ef519ef1 (32 lines) (+20/-12) ^{[ Show | Annotate ]}
  Branch: 7.9

#pike 7.0 should now work

Rev: lib/7.0/modules/Calendar.pmod/Austrian.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/Gregorian.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/ISO.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/Julian.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/Orthodox.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/Stardate.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/Swedish.pmod:1.1
Rev: lib/7.0/modules/Calendar.pmod/module.pmod:1.1
Rev: lib/7.0/modules/Stdio.pmod/module.pmod:1.1
Rev: src/builtin_functions.c:1.312
Rev: src/compilation.h:1.21
Rev: src/cpp.c:1.76
Rev: src/language.yacc:1.213
Rev: src/lexer.h:1.21
Rev: src/preprocessor.h:1.34
Rev: src/program.c:1.273
Rev: src/program.h:1.111
Rev: src/testsuite.in:1.333

110:   /* This is the grammar definition of Pike. */      #include "global.h" - RCSID("$Id: language.yacc,v 1.212 2000/09/20 13:22:51 grubba Exp $"); + RCSID("$Id: language.yacc,v 1.213 2000/09/26 00:17:45 hubbe Exp $");   #ifdef HAVE_MEMORY_H   #include <memory.h>   #endif
2467:    | m_expr_list2 ',' error    ;    - assoc_pair: expr0 expected_colon expr1 { $$=mknode(F_ARG_LIST,$1,$3); } + assoc_pair: expr0 expected_colon expr0 { $$=mknode(F_ARG_LIST,$1,$3); }    | expr0 expected_colon error { free_node($1); $$=0; }    ;   
2866:    }    | TOK_PREDEF TOK_COLON_COLON TOK_IDENTIFIER    { -  struct svalue tmp; +     node *tmp2; -  tmp.type=T_MAPPING; - #ifdef __CHECKER__ -  tmp.subtype=0; - #endif /* __CHECKER__ */ +  extern dynamic_buffer used_modules; +     if(Pike_compiler->last_identifier) free_string(Pike_compiler->last_identifier);    copy_shared_string(Pike_compiler->last_identifier, $3->u.sval.u.string); -  tmp.u.mapping=get_builtin_constants(); -  tmp2=mkconstantsvaluenode(&tmp); +  +  tmp2=mkconstantsvaluenode((struct svalue *) used_modules.s.str );    $$=index_node(tmp2, "predef", $3->u.sval.u.string);    if(!$$->name)    add_ref( $$->name=$3->u.sval.u.string );
3016:    node *tmp;       /* FIXME: Why build the node at all? */ -  +  /* Because the optimizer cannot optimize the root node of the +  * tree properly -Hubbe +  */    tmp=mknode(F_COMMA_EXPR, $3, 0);       s=(tmp && CAR(tmp) && CAR(tmp)->type ? CAR(tmp)->type : mixed_type_string); -  +  if(TEST_COMPAT(7,0)) +  { +  s=describe_type(s); +  $$ = mkstrnode(s); +  free_string(s); +  }else{    $$ = mktypenode(s); -  +  }    free_node(tmp);    }    | TOK_TYPEOF '(' error ')' { $$=0; yyerrok; }
3311:    struct pike_string *type,    node *def)   { -  if (str->len) { +  +  if (str->len && !TEST_COMPAT(7,0)) {    int tmp=islocal(str);    if(tmp >= frame->last_block_level)    {