From 2ddce578a3abc3f4c4a8760dda129fd901ef9dd3 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 16 Apr 2013 16:36:36 +0200 Subject: [PATCH] Bug #1915: Add new parser files --- src/vm/vm_var_syntax.cc | 28 +++++++++++++++++----------- src/vm/vm_var_syntax.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/vm/vm_var_syntax.cc b/src/vm/vm_var_syntax.cc index b703398188..71ecb6c849 100644 --- a/src/vm/vm_var_syntax.cc +++ b/src/vm/vm_var_syntax.cc @@ -359,8 +359,14 @@ void insert_single(VirtualMachine * vm, { parsed << vm->get_gname(); } + else if (name == "NAME") + { + + parsed << vm->get_name(); + } else { + vm->get_template_attribute(name.c_str(),value); if (value.empty()) @@ -469,7 +475,7 @@ void insert_vector(VirtualMachine * vm, /* Line 371 of yacc.c */ -#line 473 "vm_var_syntax.cc" +#line 479 "vm_var_syntax.cc" # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -522,7 +528,7 @@ extern int vm_var__debug; typedef union YYSTYPE { /* Line 387 of yacc.c */ -#line 421 "vm_var_syntax.y" +#line 427 "vm_var_syntax.y" char * val_str; int val_int; @@ -530,7 +536,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 534 "vm_var_syntax.cc" +#line 540 "vm_var_syntax.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -570,7 +576,7 @@ int vm_var__parse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 574 "vm_var_syntax.cc" +#line 580 "vm_var_syntax.cc" #ifdef short # undef short @@ -861,7 +867,7 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 445, 445, 446, 449, 453, 466, 481 + 0, 451, 451, 452, 455, 459, 472, 487 }; #endif @@ -1905,7 +1911,7 @@ yyreduce: { case 4: /* Line 1792 of yacc.c */ -#line 450 "vm_var_syntax.y" +#line 456 "vm_var_syntax.y" { (*parsed) << (yyvsp[(1) - (1)].val_str); } @@ -1913,7 +1919,7 @@ yyreduce: case 5: /* Line 1792 of yacc.c */ -#line 454 "vm_var_syntax.y" +#line 460 "vm_var_syntax.y" { string name((yyvsp[(1) - (2)].val_str)); @@ -1930,7 +1936,7 @@ yyreduce: case 6: /* Line 1792 of yacc.c */ -#line 467 "vm_var_syntax.y" +#line 473 "vm_var_syntax.y" { string name((yyvsp[(1) - (5)].val_str)); string vname((yyvsp[(3) - (5)].val_str)); @@ -1949,7 +1955,7 @@ yyreduce: case 7: /* Line 1792 of yacc.c */ -#line 482 "vm_var_syntax.y" +#line 488 "vm_var_syntax.y" { string name((yyvsp[(1) - (9)].val_str)); string vname((yyvsp[(3) - (9)].val_str)); @@ -1971,7 +1977,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 1975 "vm_var_syntax.cc" +#line 1981 "vm_var_syntax.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2210,7 +2216,7 @@ yyreturn: /* Line 2055 of yacc.c */ -#line 500 "vm_var_syntax.y" +#line 506 "vm_var_syntax.y" extern "C" void vm_var__error( diff --git a/src/vm/vm_var_syntax.h b/src/vm/vm_var_syntax.h index 18e8236991..d41fdb34c1 100644 --- a/src/vm/vm_var_syntax.h +++ b/src/vm/vm_var_syntax.h @@ -63,7 +63,7 @@ extern int vm_var__debug; typedef union YYSTYPE { /* Line 2058 of yacc.c */ -#line 421 "vm_var_syntax.y" +#line 427 "vm_var_syntax.y" char * val_str; int val_int;