diff --git a/3rdParty/Makefile.all-in-one-icu b/3rdParty/Makefile.all-in-one-icu index 92a563fd58..e901ea4fd6 100644 --- a/3rdParty/Makefile.all-in-one-icu +++ b/3rdParty/Makefile.all-in-one-icu @@ -10,7 +10,6 @@ BUILT_SOURCES += @ICU_BUILT@ ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD -CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR) @ICU_LIBS@: @srcdir@/.icu-build-@TRI_BITS@ @@ -47,7 +46,7 @@ CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR) ### @brief additional files to remove ################################################################################ -CLEANUP += .icu-build-@TRI_BITS@ +CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR) ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/3rdParty/Makefile.all-in-one-libev b/3rdParty/Makefile.all-in-one-libev index aa2778d7f5..3241dcd186 100644 --- a/3rdParty/Makefile.all-in-one-libev +++ b/3rdParty/Makefile.all-in-one-libev @@ -9,7 +9,6 @@ ################################################################################ BUILT_SOURCES += @LIBEV_LIBS@ -CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD @LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@ @@ -36,7 +35,7 @@ CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD ### @brief additional files to remove ################################################################################ -CLEANUP += .libev-build-@TRI_BITS@ +CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/3rdParty/Makefile.all-in-one-mruby b/3rdParty/Makefile.all-in-one-mruby index 327b2053dc..a36b2fb9b9 100644 --- a/3rdParty/Makefile.all-in-one-mruby +++ b/3rdParty/Makefile.all-in-one-mruby @@ -9,7 +9,6 @@ ################################################################################ BUILT_SOURCES += @MRUBY_LIBS@ -CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@ @MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@ @@ -32,9 +31,15 @@ CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@ ################################################################################ ### @brief additional files to remove +### +### "clean" in mruby is broken ################################################################################ -CLEANUP += .mruby-build-@TRI_BITS@ +CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@ +CLEANUP_3RD += clean-mruby + +clean-mruby: + cd @top_srcdir@/3rdParty/MRUBY && ( $(MAKE) -k clean || true ) ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/3rdParty/Makefile.all-in-one-v8 b/3rdParty/Makefile.all-in-one-v8 index f927063f50..864f1ed931 100644 --- a/3rdParty/Makefile.all-in-one-v8 +++ b/3rdParty/Makefile.all-in-one-v8 @@ -9,7 +9,6 @@ ################################################################################ BUILT_SOURCES += @V8_LIBS@ -CLEANUP += @srcdir@/.v8-build-@TRI_BITS@ @V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@ @@ -34,7 +33,15 @@ CLEANUP += @srcdir@/.v8-build-@TRI_BITS@ ### @brief additional files to remove ################################################################################ -CLEANUP += .v8-build-@TRI_BITS@ +CLEANUP += @srcdir@/.v8-build-@TRI_BITS@ +CLEANUP_3RD += clean-v8 + +clean-v8: + cd @top_srcdir@/3rdParty/V8 && ( $(MAKE) clean || true ) + rm -rf @top_srcdir@/3rdParty/V8/out + rm -rf @top_srcdir@/3rdParty/V8/tools/*.pyc + rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*.pyc + rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*/*.pyc ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/3rdParty/mruby/src/y.tab.c b/3rdParty/mruby/src/y.tab.c index d594db8a85..209300ce90 100644 --- a/3rdParty/mruby/src/y.tab.c +++ b/3rdParty/mruby/src/y.tab.c @@ -1050,7 +1050,7 @@ var_reference(parser_state *p, node *lhs) typedef union YYSTYPE { -/* Line 293 of yacc.c */ +/* Line 301 of yacc.c */ #line 841 "./parse.y" node *nd; @@ -1061,7 +1061,7 @@ typedef union YYSTYPE -/* Line 293 of yacc.c */ +/* Line 301 of yacc.c */ #line 1066 "./y.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 @@ -5091,7 +5091,7 @@ yyreduce: { case 2: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 996 "./parse.y" { p->lstate = EXPR_BEG; @@ -5101,7 +5101,7 @@ yyreduce: case 3: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1001 "./parse.y" { p->tree = new_scope(p, (yyvsp[(2) - (2)].nd)); @@ -5110,7 +5110,7 @@ yyreduce: case 4: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1007 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (2)].nd); @@ -5119,7 +5119,7 @@ yyreduce: case 5: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1013 "./parse.y" { (yyval.nd) = new_begin(p, 0); @@ -5128,7 +5128,7 @@ yyreduce: case 6: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1017 "./parse.y" { (yyval.nd) = new_begin(p, (yyvsp[(1) - (1)].nd)); @@ -5137,7 +5137,7 @@ yyreduce: case 7: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1021 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), newline_node((yyvsp[(3) - (3)].nd))); @@ -5146,7 +5146,7 @@ yyreduce: case 8: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1025 "./parse.y" { (yyval.nd) = new_begin(p, 0); @@ -5155,7 +5155,7 @@ yyreduce: case 10: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1032 "./parse.y" { (yyval.nd) = local_switch(p); @@ -5164,7 +5164,7 @@ yyreduce: case 11: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1036 "./parse.y" { yyerror(p, "BEGIN not supported"); @@ -5175,7 +5175,7 @@ yyreduce: case 12: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1047 "./parse.y" { if ((yyvsp[(2) - (4)].nd)) { @@ -5201,7 +5201,7 @@ yyreduce: case 13: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1070 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (2)].nd); @@ -5210,7 +5210,7 @@ yyreduce: case 14: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1076 "./parse.y" { (yyval.nd) = new_begin(p, 0); @@ -5219,7 +5219,7 @@ yyreduce: case 15: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1080 "./parse.y" { (yyval.nd) = new_begin(p, (yyvsp[(1) - (1)].nd)); @@ -5228,7 +5228,7 @@ yyreduce: case 16: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1084 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), newline_node((yyvsp[(3) - (3)].nd))); @@ -5237,7 +5237,7 @@ yyreduce: case 17: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1088 "./parse.y" { (yyval.nd) = new_begin(p, (yyvsp[(2) - (2)].nd)); @@ -5246,14 +5246,14 @@ yyreduce: case 18: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1093 "./parse.y" {p->lstate = EXPR_FNAME;} break; case 19: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1094 "./parse.y" { (yyval.nd) = new_alias(p, (yyvsp[(2) - (4)].id), (yyvsp[(4) - (4)].id)); @@ -5262,7 +5262,7 @@ yyreduce: case 20: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1098 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -5271,7 +5271,7 @@ yyreduce: case 21: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1102 "./parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[(3) - (3)].nd)), (yyvsp[(1) - (3)].nd), 0); @@ -5280,7 +5280,7 @@ yyreduce: case 22: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1106 "./parse.y" { (yyval.nd) = new_unless(p, cond((yyvsp[(3) - (3)].nd)), (yyvsp[(1) - (3)].nd), 0); @@ -5289,7 +5289,7 @@ yyreduce: case 23: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1110 "./parse.y" { (yyval.nd) = new_while(p, cond((yyvsp[(3) - (3)].nd)), (yyvsp[(1) - (3)].nd)); @@ -5298,7 +5298,7 @@ yyreduce: case 24: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1114 "./parse.y" { (yyval.nd) = new_until(p, cond((yyvsp[(3) - (3)].nd)), (yyvsp[(1) - (3)].nd)); @@ -5307,7 +5307,7 @@ yyreduce: case 25: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1118 "./parse.y" { (yyval.nd) = new_rescue(p, (yyvsp[(1) - (3)].nd), list1(list3(0, 0, (yyvsp[(3) - (3)].nd))), 0); @@ -5316,7 +5316,7 @@ yyreduce: case 26: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1122 "./parse.y" { yyerror(p, "END not suported"); @@ -5326,7 +5326,7 @@ yyreduce: case 28: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1128 "./parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[(1) - (3)].nd), list1((yyvsp[(3) - (3)].nd))); @@ -5335,7 +5335,7 @@ yyreduce: case 29: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1132 "./parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(2) - (3)].id), (yyvsp[(3) - (3)].nd)); @@ -5344,7 +5344,7 @@ yyreduce: case 30: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1136 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (6)].nd), intern("[]"), (yyvsp[(3) - (6)].nd)), (yyvsp[(5) - (6)].id), (yyvsp[(6) - (6)].nd)); @@ -5353,7 +5353,7 @@ yyreduce: case 31: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1140 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -5362,7 +5362,7 @@ yyreduce: case 32: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1144 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -5371,7 +5371,7 @@ yyreduce: case 33: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1148 "./parse.y" { yyerror(p, "constant re-assignment"); @@ -5381,7 +5381,7 @@ yyreduce: case 34: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1153 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -5390,7 +5390,7 @@ yyreduce: case 35: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1157 "./parse.y" { backref_error(p, (yyvsp[(1) - (3)].nd)); @@ -5400,7 +5400,7 @@ yyreduce: case 36: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1162 "./parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[(1) - (3)].nd), new_array(p, (yyvsp[(3) - (3)].nd))); @@ -5409,7 +5409,7 @@ yyreduce: case 37: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1166 "./parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5418,7 +5418,7 @@ yyreduce: case 38: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1170 "./parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[(1) - (3)].nd), new_array(p, (yyvsp[(3) - (3)].nd))); @@ -5427,7 +5427,7 @@ yyreduce: case 40: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1177 "./parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5436,7 +5436,7 @@ yyreduce: case 41: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1181 "./parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5445,7 +5445,7 @@ yyreduce: case 43: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1189 "./parse.y" { (yyval.nd) = new_and(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5454,7 +5454,7 @@ yyreduce: case 44: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1193 "./parse.y" { (yyval.nd) = new_or(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5463,7 +5463,7 @@ yyreduce: case 45: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1197 "./parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[(3) - (3)].nd)), "!"); @@ -5472,7 +5472,7 @@ yyreduce: case 46: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1201 "./parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[(2) - (2)].nd)), "!"); @@ -5481,7 +5481,7 @@ yyreduce: case 48: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1208 "./parse.y" { if (!(yyvsp[(1) - (1)].nd)) (yyval.nd) = new_nil(p); @@ -5491,7 +5491,7 @@ yyreduce: case 53: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1223 "./parse.y" { local_nest(p); @@ -5500,7 +5500,7 @@ yyreduce: case 54: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1229 "./parse.y" { (yyval.nd) = new_block(p, (yyvsp[(3) - (5)].nd), (yyvsp[(4) - (5)].nd)); @@ -5510,7 +5510,7 @@ yyreduce: case 55: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1236 "./parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].nd)); @@ -5519,7 +5519,7 @@ yyreduce: case 56: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1240 "./parse.y" { args_with_block(p, (yyvsp[(2) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5529,7 +5529,7 @@ yyreduce: case 57: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1245 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].nd)); @@ -5538,7 +5538,7 @@ yyreduce: case 58: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1249 "./parse.y" { args_with_block(p, (yyvsp[(4) - (5)].nd), (yyvsp[(5) - (5)].nd)); @@ -5548,7 +5548,7 @@ yyreduce: case 59: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1254 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].nd)); @@ -5557,7 +5557,7 @@ yyreduce: case 60: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1258 "./parse.y" { args_with_block(p, (yyvsp[(4) - (5)].nd), (yyvsp[(5) - (5)].nd)); @@ -5567,7 +5567,7 @@ yyreduce: case 61: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1263 "./parse.y" { (yyval.nd) = new_super(p, (yyvsp[(2) - (2)].nd)); @@ -5576,7 +5576,7 @@ yyreduce: case 62: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1267 "./parse.y" { (yyval.nd) = new_yield(p, (yyvsp[(2) - (2)].nd)); @@ -5585,7 +5585,7 @@ yyreduce: case 63: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1271 "./parse.y" { (yyval.nd) = new_return(p, ret_args(p, (yyvsp[(2) - (2)].nd))); @@ -5594,7 +5594,7 @@ yyreduce: case 64: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1275 "./parse.y" { (yyval.nd) = new_break(p, ret_args(p, (yyvsp[(2) - (2)].nd))); @@ -5603,7 +5603,7 @@ yyreduce: case 65: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1279 "./parse.y" { (yyval.nd) = new_next(p, ret_args(p, (yyvsp[(2) - (2)].nd))); @@ -5612,7 +5612,7 @@ yyreduce: case 66: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1285 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -5621,7 +5621,7 @@ yyreduce: case 67: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1289 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -5630,7 +5630,7 @@ yyreduce: case 69: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1296 "./parse.y" { (yyval.nd) = list1((yyvsp[(2) - (3)].nd)); @@ -5639,7 +5639,7 @@ yyreduce: case 70: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1302 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -5648,7 +5648,7 @@ yyreduce: case 71: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1306 "./parse.y" { (yyval.nd) = list1(push((yyvsp[(1) - (2)].nd),(yyvsp[(2) - (2)].nd))); @@ -5657,7 +5657,7 @@ yyreduce: case 72: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1310 "./parse.y" { (yyval.nd) = list2((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -5666,7 +5666,7 @@ yyreduce: case 73: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1314 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].nd), (yyvsp[(5) - (5)].nd)); @@ -5675,7 +5675,7 @@ yyreduce: case 74: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1318 "./parse.y" { (yyval.nd) = list2((yyvsp[(1) - (2)].nd), new_nil(p)); @@ -5684,7 +5684,7 @@ yyreduce: case 75: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1322 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (4)].nd), new_nil(p), (yyvsp[(4) - (4)].nd)); @@ -5693,7 +5693,7 @@ yyreduce: case 76: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1326 "./parse.y" { (yyval.nd) = list2(0, (yyvsp[(2) - (2)].nd)); @@ -5702,7 +5702,7 @@ yyreduce: case 77: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1330 "./parse.y" { (yyval.nd) = list3(0, (yyvsp[(2) - (4)].nd), (yyvsp[(4) - (4)].nd)); @@ -5711,7 +5711,7 @@ yyreduce: case 78: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1334 "./parse.y" { (yyval.nd) = list2(0, new_nil(p)); @@ -5720,7 +5720,7 @@ yyreduce: case 79: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1338 "./parse.y" { (yyval.nd) = list3(0, new_nil(p), (yyvsp[(3) - (3)].nd)); @@ -5729,7 +5729,7 @@ yyreduce: case 81: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1345 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -5738,7 +5738,7 @@ yyreduce: case 82: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1351 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (2)].nd)); @@ -5747,7 +5747,7 @@ yyreduce: case 83: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1355 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(2) - (3)].nd)); @@ -5756,7 +5756,7 @@ yyreduce: case 84: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1361 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -5765,7 +5765,7 @@ yyreduce: case 85: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1365 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (2)].nd), (yyvsp[(2) - (2)].nd)); @@ -5774,7 +5774,7 @@ yyreduce: case 86: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1371 "./parse.y" { assignable(p, (yyvsp[(1) - (1)].nd)); @@ -5783,7 +5783,7 @@ yyreduce: case 87: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1375 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), intern("[]"), (yyvsp[(3) - (4)].nd)); @@ -5792,7 +5792,7 @@ yyreduce: case 88: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1379 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5801,7 +5801,7 @@ yyreduce: case 89: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1383 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5810,7 +5810,7 @@ yyreduce: case 90: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1387 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5819,7 +5819,7 @@ yyreduce: case 91: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1391 "./parse.y" { if (p->in_def || p->in_single) @@ -5830,7 +5830,7 @@ yyreduce: case 92: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1397 "./parse.y" { if (p->in_def || p->in_single) @@ -5841,7 +5841,7 @@ yyreduce: case 93: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1403 "./parse.y" { backref_error(p, (yyvsp[(1) - (1)].nd)); @@ -5851,7 +5851,7 @@ yyreduce: case 94: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1410 "./parse.y" { assignable(p, (yyvsp[(1) - (1)].nd)); @@ -5860,7 +5860,7 @@ yyreduce: case 95: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1414 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), intern("[]"), (yyvsp[(3) - (4)].nd)); @@ -5869,7 +5869,7 @@ yyreduce: case 96: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1418 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5878,7 +5878,7 @@ yyreduce: case 97: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1422 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5887,7 +5887,7 @@ yyreduce: case 98: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1426 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -5896,7 +5896,7 @@ yyreduce: case 99: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1430 "./parse.y" { if (p->in_def || p->in_single) @@ -5907,7 +5907,7 @@ yyreduce: case 100: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1436 "./parse.y" { if (p->in_def || p->in_single) @@ -5918,7 +5918,7 @@ yyreduce: case 101: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1442 "./parse.y" { backref_error(p, (yyvsp[(1) - (1)].nd)); @@ -5928,7 +5928,7 @@ yyreduce: case 102: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1449 "./parse.y" { yyerror(p, "class/module name must be CONSTANT"); @@ -5937,7 +5937,7 @@ yyreduce: case 104: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1456 "./parse.y" { (yyval.nd) = cons((node*)1, nsym((yyvsp[(2) - (2)].id))); @@ -5946,7 +5946,7 @@ yyreduce: case 105: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1460 "./parse.y" { (yyval.nd) = cons((node*)0, nsym((yyvsp[(1) - (1)].id))); @@ -5955,7 +5955,7 @@ yyreduce: case 106: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1464 "./parse.y" { (yyval.nd) = cons((yyvsp[(1) - (3)].nd), nsym((yyvsp[(3) - (3)].id))); @@ -5964,7 +5964,7 @@ yyreduce: case 110: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1473 "./parse.y" { p->lstate = EXPR_ENDFN; @@ -5974,7 +5974,7 @@ yyreduce: case 111: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1478 "./parse.y" { p->lstate = EXPR_ENDFN; @@ -5984,7 +5984,7 @@ yyreduce: case 114: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1489 "./parse.y" { (yyval.nd) = new_sym(p, (yyvsp[(1) - (1)].id)); @@ -5993,7 +5993,7 @@ yyreduce: case 115: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1495 "./parse.y" { (yyval.nd) = new_undef(p, (yyvsp[(1) - (1)].id)); @@ -6002,14 +6002,14 @@ yyreduce: case 116: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1498 "./parse.y" {p->lstate = EXPR_FNAME;} break; case 117: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1499 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (4)].nd), (node*)(yyvsp[(4) - (4)].nd)); @@ -6018,203 +6018,203 @@ yyreduce: case 118: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1504 "./parse.y" { (yyval.id) = intern("|"); } break; case 119: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1505 "./parse.y" { (yyval.id) = intern("^"); } break; case 120: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1506 "./parse.y" { (yyval.id) = intern("&"); } break; case 121: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1507 "./parse.y" { (yyval.id) = intern("<=>"); } break; case 122: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1508 "./parse.y" { (yyval.id) = intern("=="); } break; case 123: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1509 "./parse.y" { (yyval.id) = intern("==="); } break; case 124: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1510 "./parse.y" { (yyval.id) = intern("=~"); } break; case 125: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1511 "./parse.y" { (yyval.id) = intern("!~"); } break; case 126: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1512 "./parse.y" { (yyval.id) = intern(">"); } break; case 127: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1513 "./parse.y" { (yyval.id) = intern(">="); } break; case 128: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1514 "./parse.y" { (yyval.id) = intern("<"); } break; case 129: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1515 "./parse.y" { (yyval.id) = intern("<="); } break; case 130: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1516 "./parse.y" { (yyval.id) = intern("!="); } break; case 131: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1517 "./parse.y" { (yyval.id) = intern("<<"); } break; case 132: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1518 "./parse.y" { (yyval.id) = intern(">>"); } break; case 133: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1519 "./parse.y" { (yyval.id) = intern("+"); } break; case 134: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1520 "./parse.y" { (yyval.id) = intern("-"); } break; case 135: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1521 "./parse.y" { (yyval.id) = intern("*"); } break; case 136: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1522 "./parse.y" { (yyval.id) = intern("*"); } break; case 137: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1523 "./parse.y" { (yyval.id) = intern("/"); } break; case 138: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1524 "./parse.y" { (yyval.id) = intern("%"); } break; case 139: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1525 "./parse.y" { (yyval.id) = intern("**"); } break; case 140: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1526 "./parse.y" { (yyval.id) = intern("!"); } break; case 141: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1527 "./parse.y" { (yyval.id) = intern("~"); } break; case 142: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1528 "./parse.y" { (yyval.id) = intern("+@"); } break; case 143: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1529 "./parse.y" { (yyval.id) = intern("-@"); } break; case 144: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1530 "./parse.y" { (yyval.id) = intern("[]"); } break; case 145: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1531 "./parse.y" { (yyval.id) = intern("[]="); } break; case 186: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1549 "./parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6223,7 +6223,7 @@ yyreduce: case 187: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1553 "./parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[(1) - (5)].nd), new_rescue(p, (yyvsp[(3) - (5)].nd), list1(list3(0, 0, (yyvsp[(5) - (5)].nd))), 0)); @@ -6232,7 +6232,7 @@ yyreduce: case 188: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1557 "./parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[(1) - (3)].nd), (yyvsp[(2) - (3)].id), (yyvsp[(3) - (3)].nd)); @@ -6241,7 +6241,7 @@ yyreduce: case 189: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1561 "./parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[(1) - (5)].nd), (yyvsp[(2) - (5)].id), new_rescue(p, (yyvsp[(3) - (5)].nd), list1(list3(0, 0, (yyvsp[(5) - (5)].nd))), 0)); @@ -6250,7 +6250,7 @@ yyreduce: case 190: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1565 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (6)].nd), intern("[]"), (yyvsp[(3) - (6)].nd)), (yyvsp[(5) - (6)].id), (yyvsp[(6) - (6)].nd)); @@ -6259,7 +6259,7 @@ yyreduce: case 191: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1569 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -6268,7 +6268,7 @@ yyreduce: case 192: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1573 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -6277,7 +6277,7 @@ yyreduce: case 193: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1577 "./parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), 0), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].nd)); @@ -6286,7 +6286,7 @@ yyreduce: case 194: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1581 "./parse.y" { yyerror(p, "constant re-assignment"); @@ -6296,7 +6296,7 @@ yyreduce: case 195: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1586 "./parse.y" { yyerror(p, "constant re-assignment"); @@ -6306,7 +6306,7 @@ yyreduce: case 196: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1591 "./parse.y" { backref_error(p, (yyvsp[(1) - (3)].nd)); @@ -6316,7 +6316,7 @@ yyreduce: case 197: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1596 "./parse.y" { (yyval.nd) = new_dot2(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6325,7 +6325,7 @@ yyreduce: case 198: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1600 "./parse.y" { (yyval.nd) = new_dot3(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6334,7 +6334,7 @@ yyreduce: case 199: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1604 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "+", (yyvsp[(3) - (3)].nd)); @@ -6343,7 +6343,7 @@ yyreduce: case 200: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1608 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "-", (yyvsp[(3) - (3)].nd)); @@ -6352,7 +6352,7 @@ yyreduce: case 201: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1612 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "*", (yyvsp[(3) - (3)].nd)); @@ -6361,7 +6361,7 @@ yyreduce: case 202: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1616 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "/", (yyvsp[(3) - (3)].nd)); @@ -6370,7 +6370,7 @@ yyreduce: case 203: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1620 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "%", (yyvsp[(3) - (3)].nd)); @@ -6379,7 +6379,7 @@ yyreduce: case 204: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1624 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "**", (yyvsp[(3) - (3)].nd)); @@ -6388,7 +6388,7 @@ yyreduce: case 205: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1628 "./parse.y" { (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp[(2) - (4)].nd), "**", (yyvsp[(4) - (4)].nd)), "-@"); @@ -6397,7 +6397,7 @@ yyreduce: case 206: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1632 "./parse.y" { (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp[(2) - (4)].nd), "**", (yyvsp[(4) - (4)].nd)), "-@"); @@ -6406,7 +6406,7 @@ yyreduce: case 207: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1636 "./parse.y" { (yyval.nd) = call_uni_op(p, (yyvsp[(2) - (2)].nd), "+@"); @@ -6415,7 +6415,7 @@ yyreduce: case 208: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1640 "./parse.y" { (yyval.nd) = call_uni_op(p, (yyvsp[(2) - (2)].nd), "-@"); @@ -6424,7 +6424,7 @@ yyreduce: case 209: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1644 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "|", (yyvsp[(3) - (3)].nd)); @@ -6433,7 +6433,7 @@ yyreduce: case 210: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1648 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "^", (yyvsp[(3) - (3)].nd)); @@ -6442,7 +6442,7 @@ yyreduce: case 211: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1652 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "&", (yyvsp[(3) - (3)].nd)); @@ -6451,7 +6451,7 @@ yyreduce: case 212: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1656 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "<=>", (yyvsp[(3) - (3)].nd)); @@ -6460,7 +6460,7 @@ yyreduce: case 213: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1660 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), ">", (yyvsp[(3) - (3)].nd)); @@ -6469,7 +6469,7 @@ yyreduce: case 214: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1664 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), ">=", (yyvsp[(3) - (3)].nd)); @@ -6478,7 +6478,7 @@ yyreduce: case 215: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1668 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "<", (yyvsp[(3) - (3)].nd)); @@ -6487,7 +6487,7 @@ yyreduce: case 216: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1672 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "<=", (yyvsp[(3) - (3)].nd)); @@ -6496,7 +6496,7 @@ yyreduce: case 217: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1676 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "==", (yyvsp[(3) - (3)].nd)); @@ -6505,7 +6505,7 @@ yyreduce: case 218: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1680 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "===", (yyvsp[(3) - (3)].nd)); @@ -6514,7 +6514,7 @@ yyreduce: case 219: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1684 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "!=", (yyvsp[(3) - (3)].nd)); @@ -6523,7 +6523,7 @@ yyreduce: case 220: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1688 "./parse.y" { (yyval.nd) = match_op(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6537,7 +6537,7 @@ yyreduce: case 221: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1697 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "!~", (yyvsp[(3) - (3)].nd)); @@ -6546,7 +6546,7 @@ yyreduce: case 222: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1701 "./parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[(2) - (2)].nd)), "!"); @@ -6555,7 +6555,7 @@ yyreduce: case 223: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1705 "./parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[(2) - (2)].nd)), "~"); @@ -6564,7 +6564,7 @@ yyreduce: case 224: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1709 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), "<<", (yyvsp[(3) - (3)].nd)); @@ -6573,7 +6573,7 @@ yyreduce: case 225: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1713 "./parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[(1) - (3)].nd), ">>", (yyvsp[(3) - (3)].nd)); @@ -6582,7 +6582,7 @@ yyreduce: case 226: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1717 "./parse.y" { (yyval.nd) = new_and(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6591,7 +6591,7 @@ yyreduce: case 227: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1721 "./parse.y" { (yyval.nd) = new_or(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6600,7 +6600,7 @@ yyreduce: case 228: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1725 "./parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[(1) - (6)].nd)), (yyvsp[(3) - (6)].nd), (yyvsp[(6) - (6)].nd)); @@ -6609,7 +6609,7 @@ yyreduce: case 229: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1729 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -6618,7 +6618,7 @@ yyreduce: case 230: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1735 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -6628,7 +6628,7 @@ yyreduce: case 232: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1743 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (2)].nd); @@ -6637,7 +6637,7 @@ yyreduce: case 233: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1747 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (4)].nd), new_hash(p, (yyvsp[(3) - (4)].nd))); @@ -6646,7 +6646,7 @@ yyreduce: case 234: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1751 "./parse.y" { (yyval.nd) = new_hash(p, (yyvsp[(1) - (2)].nd)); @@ -6655,7 +6655,7 @@ yyreduce: case 235: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1757 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -6664,7 +6664,7 @@ yyreduce: case 240: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1769 "./parse.y" { (yyval.nd) = cons((yyvsp[(1) - (2)].nd),0); @@ -6673,7 +6673,7 @@ yyreduce: case 241: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1773 "./parse.y" { (yyval.nd) = cons(push((yyvsp[(1) - (4)].nd), new_hash(p, (yyvsp[(3) - (4)].nd))), 0); @@ -6682,7 +6682,7 @@ yyreduce: case 242: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1777 "./parse.y" { (yyval.nd) = cons(list1(new_hash(p, (yyvsp[(1) - (2)].nd))), 0); @@ -6691,7 +6691,7 @@ yyreduce: case 243: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1783 "./parse.y" { (yyval.nd) = cons(list1((yyvsp[(1) - (1)].nd)), 0); @@ -6700,7 +6700,7 @@ yyreduce: case 244: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1787 "./parse.y" { (yyval.nd) = cons((yyvsp[(1) - (2)].nd), (yyvsp[(2) - (2)].nd)); @@ -6709,7 +6709,7 @@ yyreduce: case 245: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1791 "./parse.y" { (yyval.nd) = cons(list1(new_hash(p, (yyvsp[(1) - (2)].nd))), (yyvsp[(2) - (2)].nd)); @@ -6718,7 +6718,7 @@ yyreduce: case 246: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1795 "./parse.y" { (yyval.nd) = cons(push((yyvsp[(1) - (4)].nd), new_hash(p, (yyvsp[(3) - (4)].nd))), (yyvsp[(4) - (4)].nd)); @@ -6727,7 +6727,7 @@ yyreduce: case 247: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1799 "./parse.y" { (yyval.nd) = cons(0, (yyvsp[(1) - (1)].nd)); @@ -6736,7 +6736,7 @@ yyreduce: case 248: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1804 "./parse.y" { (yyval.stack) = p->cmdarg_stack; @@ -6746,7 +6746,7 @@ yyreduce: case 249: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1809 "./parse.y" { p->cmdarg_stack = (yyvsp[(1) - (2)].stack); @@ -6756,7 +6756,7 @@ yyreduce: case 250: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1816 "./parse.y" { (yyval.nd) = new_block_arg(p, (yyvsp[(2) - (2)].nd)); @@ -6765,7 +6765,7 @@ yyreduce: case 251: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1822 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -6774,7 +6774,7 @@ yyreduce: case 252: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1826 "./parse.y" { (yyval.nd) = 0; @@ -6783,7 +6783,7 @@ yyreduce: case 253: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1832 "./parse.y" { (yyval.nd) = cons((yyvsp[(1) - (1)].nd), 0); @@ -6792,7 +6792,7 @@ yyreduce: case 254: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1836 "./parse.y" { (yyval.nd) = cons(new_splat(p, (yyvsp[(2) - (2)].nd)), 0); @@ -6801,7 +6801,7 @@ yyreduce: case 255: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1840 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6810,7 +6810,7 @@ yyreduce: case 256: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1844 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (4)].nd), new_splat(p, (yyvsp[(4) - (4)].nd))); @@ -6819,7 +6819,7 @@ yyreduce: case 257: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1850 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -6828,7 +6828,7 @@ yyreduce: case 258: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1854 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (4)].nd), new_splat(p, (yyvsp[(4) - (4)].nd))); @@ -6837,7 +6837,7 @@ yyreduce: case 259: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1858 "./parse.y" { (yyval.nd) = list1(new_splat(p, (yyvsp[(2) - (2)].nd))); @@ -6846,7 +6846,7 @@ yyreduce: case 265: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1869 "./parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[(1) - (1)].id), 0); @@ -6855,7 +6855,7 @@ yyreduce: case 266: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1873 "./parse.y" { (yyvsp[(1) - (1)].stack) = p->cmdarg_stack; @@ -6865,7 +6865,7 @@ yyreduce: case 267: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1879 "./parse.y" { p->cmdarg_stack = (yyvsp[(1) - (4)].stack); @@ -6875,14 +6875,14 @@ yyreduce: case 268: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1883 "./parse.y" {p->lstate = EXPR_ENDARG;} break; case 269: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1884 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (4)].nd); @@ -6891,14 +6891,14 @@ yyreduce: case 270: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1887 "./parse.y" {p->lstate = EXPR_ENDARG;} break; case 271: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1888 "./parse.y" { (yyval.nd) = 0; @@ -6907,7 +6907,7 @@ yyreduce: case 272: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1892 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -6916,7 +6916,7 @@ yyreduce: case 273: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1896 "./parse.y" { (yyval.nd) = new_colon2(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id)); @@ -6925,7 +6925,7 @@ yyreduce: case 274: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1900 "./parse.y" { (yyval.nd) = new_colon3(p, (yyvsp[(2) - (2)].id)); @@ -6934,7 +6934,7 @@ yyreduce: case 275: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1904 "./parse.y" { (yyval.nd) = new_array(p, (yyvsp[(2) - (3)].nd)); @@ -6943,7 +6943,7 @@ yyreduce: case 276: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1908 "./parse.y" { (yyval.nd) = new_hash(p, (yyvsp[(2) - (3)].nd)); @@ -6952,7 +6952,7 @@ yyreduce: case 277: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1912 "./parse.y" { (yyval.nd) = new_return(p, 0); @@ -6961,7 +6961,7 @@ yyreduce: case 278: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1916 "./parse.y" { (yyval.nd) = new_yield(p, (yyvsp[(3) - (4)].nd)); @@ -6970,7 +6970,7 @@ yyreduce: case 279: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1920 "./parse.y" { (yyval.nd) = new_yield(p, 0); @@ -6979,7 +6979,7 @@ yyreduce: case 280: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1924 "./parse.y" { (yyval.nd) = new_yield(p, 0); @@ -6988,7 +6988,7 @@ yyreduce: case 281: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1928 "./parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[(3) - (4)].nd)), "!"); @@ -6997,7 +6997,7 @@ yyreduce: case 282: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1932 "./parse.y" { (yyval.nd) = call_uni_op(p, new_nil(p), "!"); @@ -7006,7 +7006,7 @@ yyreduce: case 283: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1936 "./parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[(1) - (2)].id), cons(0, (yyvsp[(2) - (2)].nd))); @@ -7015,7 +7015,7 @@ yyreduce: case 285: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1941 "./parse.y" { call_with_block(p, (yyvsp[(1) - (2)].nd), (yyvsp[(2) - (2)].nd)); @@ -7025,7 +7025,7 @@ yyreduce: case 286: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1946 "./parse.y" { local_nest(p); @@ -7036,7 +7036,7 @@ yyreduce: case 287: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1953 "./parse.y" { p->lpar_beg = (yyvsp[(2) - (4)].num); @@ -7047,7 +7047,7 @@ yyreduce: case 288: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1962 "./parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[(2) - (6)].nd)), (yyvsp[(4) - (6)].nd), (yyvsp[(5) - (6)].nd)); @@ -7056,7 +7056,7 @@ yyreduce: case 289: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1969 "./parse.y" { (yyval.nd) = new_unless(p, cond((yyvsp[(2) - (6)].nd)), (yyvsp[(4) - (6)].nd), (yyvsp[(5) - (6)].nd)); @@ -7065,21 +7065,21 @@ yyreduce: case 290: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1972 "./parse.y" {COND_PUSH(1);} break; case 291: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1972 "./parse.y" {COND_POP();} break; case 292: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1975 "./parse.y" { (yyval.nd) = new_while(p, cond((yyvsp[(3) - (7)].nd)), (yyvsp[(6) - (7)].nd)); @@ -7088,21 +7088,21 @@ yyreduce: case 293: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1978 "./parse.y" {COND_PUSH(1);} break; case 294: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1978 "./parse.y" {COND_POP();} break; case 295: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1981 "./parse.y" { (yyval.nd) = new_until(p, cond((yyvsp[(3) - (7)].nd)), (yyvsp[(6) - (7)].nd)); @@ -7111,7 +7111,7 @@ yyreduce: case 296: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1987 "./parse.y" { (yyval.nd) = new_case(p, (yyvsp[(2) - (5)].nd), (yyvsp[(4) - (5)].nd)); @@ -7120,7 +7120,7 @@ yyreduce: case 297: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1991 "./parse.y" { (yyval.nd) = new_case(p, 0, (yyvsp[(3) - (4)].nd)); @@ -7129,21 +7129,21 @@ yyreduce: case 298: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1995 "./parse.y" {COND_PUSH(1);} break; case 299: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 1997 "./parse.y" {COND_POP();} break; case 300: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2000 "./parse.y" { (yyval.nd) = new_for(p, (yyvsp[(2) - (9)].nd), (yyvsp[(5) - (9)].nd), (yyvsp[(8) - (9)].nd)); @@ -7152,7 +7152,7 @@ yyreduce: case 301: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2004 "./parse.y" { if (p->in_def || p->in_single) @@ -7163,7 +7163,7 @@ yyreduce: case 302: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2011 "./parse.y" { (yyval.nd) = new_class(p, (yyvsp[(2) - (6)].nd), (yyvsp[(3) - (6)].nd), (yyvsp[(5) - (6)].nd)); @@ -7173,7 +7173,7 @@ yyreduce: case 303: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2016 "./parse.y" { (yyval.num) = p->in_def; @@ -7183,7 +7183,7 @@ yyreduce: case 304: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2021 "./parse.y" { (yyval.nd) = cons(local_switch(p), (node*)(intptr_t)p->in_single); @@ -7193,7 +7193,7 @@ yyreduce: case 305: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2027 "./parse.y" { (yyval.nd) = new_sclass(p, (yyvsp[(3) - (8)].nd), (yyvsp[(7) - (8)].nd)); @@ -7205,7 +7205,7 @@ yyreduce: case 306: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2034 "./parse.y" { if (p->in_def || p->in_single) @@ -7216,7 +7216,7 @@ yyreduce: case 307: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2041 "./parse.y" { (yyval.nd) = new_module(p, (yyvsp[(2) - (5)].nd), (yyvsp[(4) - (5)].nd)); @@ -7226,7 +7226,7 @@ yyreduce: case 308: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2046 "./parse.y" { p->in_def++; @@ -7236,7 +7236,7 @@ yyreduce: case 309: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2053 "./parse.y" { (yyval.nd) = new_def(p, (yyvsp[(2) - (6)].id), (yyvsp[(4) - (6)].nd), (yyvsp[(5) - (6)].nd)); @@ -7247,14 +7247,14 @@ yyreduce: case 310: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2058 "./parse.y" {p->lstate = EXPR_FNAME;} break; case 311: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2059 "./parse.y" { p->in_single++; @@ -7265,7 +7265,7 @@ yyreduce: case 312: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2067 "./parse.y" { (yyval.nd) = new_sdef(p, (yyvsp[(2) - (9)].nd), (yyvsp[(5) - (9)].id), (yyvsp[(7) - (9)].nd), (yyvsp[(8) - (9)].nd)); @@ -7276,7 +7276,7 @@ yyreduce: case 313: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2073 "./parse.y" { (yyval.nd) = new_break(p, 0); @@ -7285,7 +7285,7 @@ yyreduce: case 314: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2077 "./parse.y" { (yyval.nd) = new_next(p, 0); @@ -7294,7 +7294,7 @@ yyreduce: case 315: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2081 "./parse.y" { (yyval.nd) = new_redo(p); @@ -7303,7 +7303,7 @@ yyreduce: case 316: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2085 "./parse.y" { (yyval.nd) = new_retry(p); @@ -7312,7 +7312,7 @@ yyreduce: case 317: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2091 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -7322,7 +7322,7 @@ yyreduce: case 324: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2110 "./parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[(2) - (5)].nd)), (yyvsp[(4) - (5)].nd), (yyvsp[(5) - (5)].nd)); @@ -7331,7 +7331,7 @@ yyreduce: case 326: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2117 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -7340,7 +7340,7 @@ yyreduce: case 327: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2123 "./parse.y" { (yyval.nd) = list1(list1((yyvsp[(1) - (1)].nd))); @@ -7349,7 +7349,7 @@ yyreduce: case 329: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2130 "./parse.y" { (yyval.nd) = new_arg(p, (yyvsp[(1) - (1)].id)); @@ -7358,7 +7358,7 @@ yyreduce: case 330: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2134 "./parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[(2) - (3)].nd), 0); @@ -7367,7 +7367,7 @@ yyreduce: case 331: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2140 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -7376,7 +7376,7 @@ yyreduce: case 332: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2144 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -7385,7 +7385,7 @@ yyreduce: case 333: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2150 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (1)].nd),0,0); @@ -7394,7 +7394,7 @@ yyreduce: case 334: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2154 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (4)].nd), new_arg(p, (yyvsp[(4) - (4)].id)), 0); @@ -7403,7 +7403,7 @@ yyreduce: case 335: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2158 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (6)].nd), new_arg(p, (yyvsp[(4) - (6)].id)), (yyvsp[(6) - (6)].nd)); @@ -7412,7 +7412,7 @@ yyreduce: case 336: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2162 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (3)].nd), (node*)-1, 0); @@ -7421,7 +7421,7 @@ yyreduce: case 337: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2166 "./parse.y" { (yyval.nd) = list3((yyvsp[(1) - (5)].nd), (node*)-1, (yyvsp[(5) - (5)].nd)); @@ -7430,7 +7430,7 @@ yyreduce: case 338: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2170 "./parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[(2) - (2)].id)), 0); @@ -7439,7 +7439,7 @@ yyreduce: case 339: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2174 "./parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[(2) - (4)].id)), (yyvsp[(4) - (4)].nd)); @@ -7448,7 +7448,7 @@ yyreduce: case 340: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2178 "./parse.y" { (yyval.nd) = list3(0, (node*)-1, 0); @@ -7457,7 +7457,7 @@ yyreduce: case 341: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2182 "./parse.y" { (yyval.nd) = list3(0, (node*)-1, (yyvsp[(3) - (3)].nd)); @@ -7466,7 +7466,7 @@ yyreduce: case 342: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2188 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].nd), (yyvsp[(5) - (6)].id), 0, (yyvsp[(6) - (6)].id)); @@ -7475,7 +7475,7 @@ yyreduce: case 343: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2192 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (8)].nd), (yyvsp[(3) - (8)].nd), (yyvsp[(5) - (8)].id), (yyvsp[(7) - (8)].nd), (yyvsp[(8) - (8)].id)); @@ -7484,7 +7484,7 @@ yyreduce: case 344: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2196 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].nd), 0, 0, (yyvsp[(4) - (4)].id)); @@ -7493,7 +7493,7 @@ yyreduce: case 345: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2200 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].nd), 0, (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -7502,7 +7502,7 @@ yyreduce: case 346: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2204 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (4)].nd), 0, (yyvsp[(3) - (4)].id), 0, (yyvsp[(4) - (4)].id)); @@ -7511,7 +7511,7 @@ yyreduce: case 347: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2208 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (2)].nd), 0, 1, 0, 0); @@ -7520,7 +7520,7 @@ yyreduce: case 348: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2212 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), 0, (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -7529,7 +7529,7 @@ yyreduce: case 349: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2216 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (2)].nd), 0, 0, 0, (yyvsp[(2) - (2)].id)); @@ -7538,7 +7538,7 @@ yyreduce: case 350: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2220 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), 0, (yyvsp[(4) - (4)].id)); @@ -7547,7 +7547,7 @@ yyreduce: case 351: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2224 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -7556,7 +7556,7 @@ yyreduce: case 352: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2228 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (2)].nd), 0, 0, (yyvsp[(2) - (2)].id)); @@ -7565,7 +7565,7 @@ yyreduce: case 353: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2232 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (4)].nd), 0, (yyvsp[(3) - (4)].nd), (yyvsp[(4) - (4)].id)); @@ -7574,7 +7574,7 @@ yyreduce: case 354: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2236 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[(1) - (2)].id), 0, (yyvsp[(2) - (2)].id)); @@ -7583,7 +7583,7 @@ yyreduce: case 355: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2240 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[(1) - (4)].id), (yyvsp[(3) - (4)].nd), (yyvsp[(4) - (4)].id)); @@ -7592,7 +7592,7 @@ yyreduce: case 356: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2244 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[(1) - (1)].id)); @@ -7601,7 +7601,7 @@ yyreduce: case 358: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2251 "./parse.y" { p->cmd_start = TRUE; @@ -7611,7 +7611,7 @@ yyreduce: case 359: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2258 "./parse.y" { local_add_f(p, 0); @@ -7621,7 +7621,7 @@ yyreduce: case 360: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2263 "./parse.y" { local_add_f(p, 0); @@ -7631,7 +7631,7 @@ yyreduce: case 361: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2268 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (4)].nd); @@ -7640,7 +7640,7 @@ yyreduce: case 362: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2275 "./parse.y" { (yyval.nd) = 0; @@ -7649,7 +7649,7 @@ yyreduce: case 363: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2279 "./parse.y" { (yyval.nd) = 0; @@ -7658,7 +7658,7 @@ yyreduce: case 366: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2289 "./parse.y" { local_add_f(p, (yyvsp[(1) - (1)].id)); @@ -7668,7 +7668,7 @@ yyreduce: case 368: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2297 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (4)].nd); @@ -7677,7 +7677,7 @@ yyreduce: case 369: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2301 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -7686,7 +7686,7 @@ yyreduce: case 370: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2307 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -7695,7 +7695,7 @@ yyreduce: case 371: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2311 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -7704,7 +7704,7 @@ yyreduce: case 372: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2317 "./parse.y" { local_nest(p); @@ -7713,7 +7713,7 @@ yyreduce: case 373: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2323 "./parse.y" { (yyval.nd) = new_block(p,(yyvsp[(3) - (5)].nd),(yyvsp[(4) - (5)].nd)); @@ -7723,7 +7723,7 @@ yyreduce: case 374: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2330 "./parse.y" { if ((yyvsp[(1) - (2)].nd)->car == (node*)NODE_YIELD) { @@ -7738,7 +7738,7 @@ yyreduce: case 375: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2340 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].nd)); @@ -7747,7 +7747,7 @@ yyreduce: case 376: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2344 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].nd)); @@ -7757,7 +7757,7 @@ yyreduce: case 377: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2349 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (5)].nd), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].nd)); @@ -7767,7 +7767,7 @@ yyreduce: case 378: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2356 "./parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].nd)); @@ -7776,7 +7776,7 @@ yyreduce: case 379: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2360 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].nd)); @@ -7785,7 +7785,7 @@ yyreduce: case 380: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2364 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].nd)); @@ -7794,7 +7794,7 @@ yyreduce: case 381: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2368 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].id), 0); @@ -7803,7 +7803,7 @@ yyreduce: case 382: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2372 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), intern("call"), (yyvsp[(3) - (3)].nd)); @@ -7812,7 +7812,7 @@ yyreduce: case 383: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2376 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (3)].nd), intern("call"), (yyvsp[(3) - (3)].nd)); @@ -7821,7 +7821,7 @@ yyreduce: case 384: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2380 "./parse.y" { (yyval.nd) = new_super(p, (yyvsp[(2) - (2)].nd)); @@ -7830,7 +7830,7 @@ yyreduce: case 385: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2384 "./parse.y" { (yyval.nd) = new_zsuper(p); @@ -7839,7 +7839,7 @@ yyreduce: case 386: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2388 "./parse.y" { (yyval.nd) = new_call(p, (yyvsp[(1) - (4)].nd), intern("[]"), (yyvsp[(3) - (4)].nd)); @@ -7848,7 +7848,7 @@ yyreduce: case 387: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2394 "./parse.y" { local_nest(p); @@ -7857,7 +7857,7 @@ yyreduce: case 388: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2399 "./parse.y" { (yyval.nd) = new_block(p,(yyvsp[(3) - (5)].nd),(yyvsp[(4) - (5)].nd)); @@ -7867,7 +7867,7 @@ yyreduce: case 389: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2404 "./parse.y" { local_nest(p); @@ -7876,7 +7876,7 @@ yyreduce: case 390: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2409 "./parse.y" { (yyval.nd) = new_block(p,(yyvsp[(3) - (5)].nd),(yyvsp[(4) - (5)].nd)); @@ -7886,7 +7886,7 @@ yyreduce: case 391: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2418 "./parse.y" { (yyval.nd) = cons(cons((yyvsp[(2) - (5)].nd), (yyvsp[(4) - (5)].nd)), (yyvsp[(5) - (5)].nd)); @@ -7895,7 +7895,7 @@ yyreduce: case 392: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2424 "./parse.y" { if ((yyvsp[(1) - (1)].nd)) { @@ -7909,7 +7909,7 @@ yyreduce: case 394: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2438 "./parse.y" { (yyval.nd) = list1(list3((yyvsp[(2) - (6)].nd), (yyvsp[(3) - (6)].nd), (yyvsp[(5) - (6)].nd))); @@ -7919,7 +7919,7 @@ yyreduce: case 396: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2446 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -7928,7 +7928,7 @@ yyreduce: case 399: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2454 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -7937,7 +7937,7 @@ yyreduce: case 401: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2461 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -7946,7 +7946,7 @@ yyreduce: case 407: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2474 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (2)].nd); @@ -7955,7 +7955,7 @@ yyreduce: case 408: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2478 "./parse.y" { (yyval.nd) = new_dstr(p, push((yyvsp[(2) - (3)].nd), (yyvsp[(3) - (3)].nd))); @@ -7964,7 +7964,7 @@ yyreduce: case 409: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2484 "./parse.y" { (yyval.num) = p->sterm; @@ -7974,7 +7974,7 @@ yyreduce: case 410: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2490 "./parse.y" { p->sterm = (yyvsp[(2) - (4)].num); @@ -7984,7 +7984,7 @@ yyreduce: case 411: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2496 "./parse.y" { (yyval.num) = p->sterm; @@ -7994,7 +7994,7 @@ yyreduce: case 412: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2502 "./parse.y" { p->sterm = (yyvsp[(3) - (5)].num); @@ -8004,7 +8004,7 @@ yyreduce: case 414: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2512 "./parse.y" { (yyval.nd) = new_sym(p, (yyvsp[(1) - (1)].id)); @@ -8013,7 +8013,7 @@ yyreduce: case 415: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2516 "./parse.y" { p->lstate = EXPR_END; @@ -8023,7 +8023,7 @@ yyreduce: case 416: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2523 "./parse.y" { p->lstate = EXPR_END; @@ -8033,7 +8033,7 @@ yyreduce: case 421: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2534 "./parse.y" { (yyval.id) = new_strsym(p, (yyvsp[(1) - (1)].nd)); @@ -8042,7 +8042,7 @@ yyreduce: case 422: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2538 "./parse.y" { (yyval.id) = new_strsym(p, (yyvsp[(2) - (2)].nd)); @@ -8051,7 +8051,7 @@ yyreduce: case 425: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2546 "./parse.y" { (yyval.nd) = negate_lit(p, (yyvsp[(2) - (2)].nd)); @@ -8060,7 +8060,7 @@ yyreduce: case 426: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2550 "./parse.y" { (yyval.nd) = negate_lit(p, (yyvsp[(2) - (2)].nd)); @@ -8069,7 +8069,7 @@ yyreduce: case 427: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2556 "./parse.y" { (yyval.nd) = new_lvar(p, (yyvsp[(1) - (1)].id)); @@ -8078,7 +8078,7 @@ yyreduce: case 428: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2560 "./parse.y" { (yyval.nd) = new_ivar(p, (yyvsp[(1) - (1)].id)); @@ -8087,7 +8087,7 @@ yyreduce: case 429: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2564 "./parse.y" { (yyval.nd) = new_gvar(p, (yyvsp[(1) - (1)].id)); @@ -8096,7 +8096,7 @@ yyreduce: case 430: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2568 "./parse.y" { (yyval.nd) = new_cvar(p, (yyvsp[(1) - (1)].id)); @@ -8105,7 +8105,7 @@ yyreduce: case 431: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2572 "./parse.y" { (yyval.nd) = new_const(p, (yyvsp[(1) - (1)].id)); @@ -8114,7 +8114,7 @@ yyreduce: case 432: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2578 "./parse.y" { assignable(p, (yyvsp[(1) - (1)].nd)); @@ -8123,7 +8123,7 @@ yyreduce: case 433: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2584 "./parse.y" { (yyval.nd) = var_reference(p, (yyvsp[(1) - (1)].nd)); @@ -8132,7 +8132,7 @@ yyreduce: case 434: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2588 "./parse.y" { (yyval.nd) = new_nil(p); @@ -8141,7 +8141,7 @@ yyreduce: case 435: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2592 "./parse.y" { (yyval.nd) = new_self(p); @@ -8150,7 +8150,7 @@ yyreduce: case 436: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2596 "./parse.y" { (yyval.nd) = new_true(p); @@ -8159,7 +8159,7 @@ yyreduce: case 437: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2600 "./parse.y" { (yyval.nd) = new_false(p); @@ -8168,7 +8168,7 @@ yyreduce: case 438: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2604 "./parse.y" { if (!p->filename) { @@ -8180,7 +8180,7 @@ yyreduce: case 439: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2611 "./parse.y" { char buf[16]; @@ -8192,7 +8192,7 @@ yyreduce: case 442: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2624 "./parse.y" { (yyval.nd) = 0; @@ -8201,7 +8201,7 @@ yyreduce: case 443: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2628 "./parse.y" { p->lstate = EXPR_BEG; @@ -8211,7 +8211,7 @@ yyreduce: case 444: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2633 "./parse.y" { (yyval.nd) = (yyvsp[(3) - (4)].nd); @@ -8220,7 +8220,7 @@ yyreduce: case 445: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2637 "./parse.y" { yyerrok; @@ -8230,7 +8230,7 @@ yyreduce: case 446: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2644 "./parse.y" { (yyval.nd) = (yyvsp[(2) - (3)].nd); @@ -8241,7 +8241,7 @@ yyreduce: case 447: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2650 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (2)].nd); @@ -8250,7 +8250,7 @@ yyreduce: case 448: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2656 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].nd), (yyvsp[(5) - (6)].id), 0, (yyvsp[(6) - (6)].id)); @@ -8259,7 +8259,7 @@ yyreduce: case 449: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2660 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (8)].nd), (yyvsp[(3) - (8)].nd), (yyvsp[(5) - (8)].id), (yyvsp[(7) - (8)].nd), (yyvsp[(8) - (8)].id)); @@ -8268,7 +8268,7 @@ yyreduce: case 450: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2664 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].nd), 0, 0, (yyvsp[(4) - (4)].id)); @@ -8277,7 +8277,7 @@ yyreduce: case 451: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2668 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].nd), 0, (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -8286,7 +8286,7 @@ yyreduce: case 452: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2672 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (4)].nd), 0, (yyvsp[(3) - (4)].id), 0, (yyvsp[(4) - (4)].id)); @@ -8295,7 +8295,7 @@ yyreduce: case 453: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2676 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (6)].nd), 0, (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -8304,7 +8304,7 @@ yyreduce: case 454: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2680 "./parse.y" { (yyval.nd) = new_args(p, (yyvsp[(1) - (2)].nd), 0, 0, 0, (yyvsp[(2) - (2)].id)); @@ -8313,7 +8313,7 @@ yyreduce: case 455: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2684 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (4)].nd), (yyvsp[(3) - (4)].id), 0, (yyvsp[(4) - (4)].id)); @@ -8322,7 +8322,7 @@ yyreduce: case 456: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2688 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (6)].nd), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].nd), (yyvsp[(6) - (6)].id)); @@ -8331,7 +8331,7 @@ yyreduce: case 457: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2692 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (2)].nd), 0, 0, (yyvsp[(2) - (2)].id)); @@ -8340,7 +8340,7 @@ yyreduce: case 458: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2696 "./parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[(1) - (4)].nd), 0, (yyvsp[(3) - (4)].nd), (yyvsp[(4) - (4)].id)); @@ -8349,7 +8349,7 @@ yyreduce: case 459: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2700 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[(1) - (2)].id), 0, (yyvsp[(2) - (2)].id)); @@ -8358,7 +8358,7 @@ yyreduce: case 460: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2704 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[(1) - (4)].id), (yyvsp[(3) - (4)].nd), (yyvsp[(4) - (4)].id)); @@ -8367,7 +8367,7 @@ yyreduce: case 461: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2708 "./parse.y" { (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[(1) - (1)].id)); @@ -8376,7 +8376,7 @@ yyreduce: case 462: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2712 "./parse.y" { local_add_f(p, 0); @@ -8386,7 +8386,7 @@ yyreduce: case 463: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2719 "./parse.y" { yyerror(p, "formal argument cannot be a constant"); @@ -8396,7 +8396,7 @@ yyreduce: case 464: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2724 "./parse.y" { yyerror(p, "formal argument cannot be an instance variable"); @@ -8406,7 +8406,7 @@ yyreduce: case 465: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2729 "./parse.y" { yyerror(p, "formal argument cannot be a global variable"); @@ -8416,7 +8416,7 @@ yyreduce: case 466: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2734 "./parse.y" { yyerror(p, "formal argument cannot be a class variable"); @@ -8426,7 +8426,7 @@ yyreduce: case 467: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2741 "./parse.y" { (yyval.id) = 0; @@ -8435,7 +8435,7 @@ yyreduce: case 468: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2745 "./parse.y" { local_add_f(p, (yyvsp[(1) - (1)].id)); @@ -8445,7 +8445,7 @@ yyreduce: case 469: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2752 "./parse.y" { (yyval.nd) = new_arg(p, (yyvsp[(1) - (1)].id)); @@ -8454,7 +8454,7 @@ yyreduce: case 470: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2756 "./parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[(2) - (3)].nd), 0); @@ -8463,7 +8463,7 @@ yyreduce: case 471: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2762 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -8472,7 +8472,7 @@ yyreduce: case 472: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2766 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -8481,7 +8481,7 @@ yyreduce: case 473: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2772 "./parse.y" { local_add_f(p, (yyvsp[(1) - (3)].id)); @@ -8491,7 +8491,7 @@ yyreduce: case 474: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2779 "./parse.y" { local_add_f(p, (yyvsp[(1) - (3)].id)); @@ -8501,7 +8501,7 @@ yyreduce: case 475: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2786 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -8510,7 +8510,7 @@ yyreduce: case 476: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2790 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -8519,7 +8519,7 @@ yyreduce: case 477: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2796 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -8528,7 +8528,7 @@ yyreduce: case 478: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2800 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -8537,7 +8537,7 @@ yyreduce: case 481: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2810 "./parse.y" { local_add_f(p, (yyvsp[(2) - (2)].id)); @@ -8547,7 +8547,7 @@ yyreduce: case 482: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2815 "./parse.y" { local_add_f(p, 0); @@ -8557,7 +8557,7 @@ yyreduce: case 485: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2826 "./parse.y" { local_add_f(p, (yyvsp[(2) - (2)].id)); @@ -8567,7 +8567,7 @@ yyreduce: case 486: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2833 "./parse.y" { (yyval.id) = (yyvsp[(2) - (2)].id); @@ -8576,7 +8576,7 @@ yyreduce: case 487: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2837 "./parse.y" { local_add_f(p, 0); @@ -8586,7 +8586,7 @@ yyreduce: case 488: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2844 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (1)].nd); @@ -8596,14 +8596,14 @@ yyreduce: case 489: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2848 "./parse.y" {p->lstate = EXPR_BEG;} break; case 490: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2849 "./parse.y" { if ((yyvsp[(3) - (4)].nd) == 0) { @@ -8628,7 +8628,7 @@ yyreduce: case 492: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2872 "./parse.y" { (yyval.nd) = (yyvsp[(1) - (2)].nd); @@ -8637,7 +8637,7 @@ yyreduce: case 493: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2878 "./parse.y" { (yyval.nd) = list1((yyvsp[(1) - (1)].nd)); @@ -8646,7 +8646,7 @@ yyreduce: case 494: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2882 "./parse.y" { (yyval.nd) = push((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -8655,7 +8655,7 @@ yyreduce: case 495: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2888 "./parse.y" { (yyval.nd) = cons((yyvsp[(1) - (3)].nd), (yyvsp[(3) - (3)].nd)); @@ -8664,7 +8664,7 @@ yyreduce: case 496: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2892 "./parse.y" { (yyval.nd) = cons(new_sym(p, (yyvsp[(1) - (2)].id)), (yyvsp[(2) - (2)].nd)); @@ -8673,14 +8673,14 @@ yyreduce: case 518: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2936 "./parse.y" {yyerrok;} break; case 520: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2941 "./parse.y" { p->lineno++; @@ -8690,14 +8690,14 @@ yyreduce: case 522: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2947 "./parse.y" {yyerrok;} break; case 523: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 2951 "./parse.y" { (yyval.nd) = 0; @@ -8706,7 +8706,7 @@ yyreduce: -/* Line 1806 of yacc.c */ +/* Line 1821 of yacc.c */ #line 8711 "./y.tab.c" default: break; } diff --git a/CHANGELOG b/CHANGELOG index 39aad68486..dbaa4d00ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,14 +13,14 @@ v1.2.alpha (XXXX-XX-XX) * the key must be at most 256 bytes long * it must consist of valid UTF-8 characters only * the key must not contain the forward slash (/) - * the key must not begin or end with a space, tab, newline, carriage return or + * the key must not begin or end with a space, tab, newline, carriage return or form feed character Specifiying a document key is optional when creating new documents. If no document key is specified, ArangoDB will create a document key itself. There are no guarantees about the format and pattern of auto-generated document keys other than the above restrictions. - Clients should therefore treat auto-generated document keys as opaque values. + Clients should therefore treat auto-generated document keys as opaque values. * allow collection names everywhere where a collection id can be used This change allows using a collection name in place of a collection id at all places @@ -31,23 +31,27 @@ v1.2.alpha (XXXX-XX-XX) * collection names can also be used instead of collection ids in REST API calls * edges in edge collections can optionally be undirected - Edges now have a @LIT{_bidirectional} attribute that determines whether the edge is to be + Edges now have a `_bidirectional` attribute that determines whether the edge is to be treated as directed (unidirectional) or undirected (bidirectional). The attribute can be set when an edge is created. If ommitted, the default is to create unidirectional - edges (i.e. @LIT{_bidirectional: false}). + edges (i.e. `_bidirectional: false`). Unidirectional edges are handled as in previous versions of ArangoDB, that is they - have a @LIT{_from} and @LIT{_to} attribute that indicate the source and target vertices - of the edge. Additionally, they now return the @LIT{_bidirectional} attribute with a - value of @LIT{false}. + have a `_from` and `_to` attribute that indicate the source and target vertices + of the edge. Additionally, they now return the `_bidirectional` attribute with a + value of `false`. Bidirectional edges do not have unambigious sources and targets (the roles of the connected - vertices are unclear), so they return the connected vertices in a @LIT{_vertices} list. + vertices are unclear), so they return the connected vertices in a `_vertices` list. This list contains the two vertices that the edge connects. It is up to the user to - figure out these edges' roles. Additionally, bidirectional edges return the - @LIT{_bidirectional} attribute with a value of @LIT{true}. + figure out these edges' roles. Additionally, bidirectional edges return the + `_bidirectional` attribute with a value of `true`. -v1.1.beta3 (XXXX-XX-XX) ------------------------ +v1.1.0 (XXXX-XX-XX) +------------------- + +# fixed issue #269: fix make distclean & clean + +* fixed issue #296: system collections not usable from AQL * added collection type label to web interface @@ -66,14 +70,15 @@ v1.1.beta3 (XXXX-XX-XX) * changed misleading AQL function name NOT_LIST() to FIRST_LIST() and slightly changed the behavior. The function will now return its first argument that is a list, or null if none of the arguments are lists. - This is mostly downwards-compatible. The only change to 1.1 will happen if two - arguments were passed and the 1st and 2nd arguments were no lists. In 1.1, previously - the 2nd arguments was returned as is, but now null will be returned. + This is mostly downwards-compatible. The only change to the previous implementation in + 1.1-beta will happen if two arguments were passed and the 1st and 2nd arguments were + both no lists. In previous 1.1, the 2nd argument was returned as is, but now null + will be returned. * add AQL function FIRST_DOCUMENT(), with same behavior as FIRST_LIST(), but working with documents instead of lists. -* added UPGRADE file +* added UPGRADING help text * WARNING: arangod now performs a database version check at startup. It will look for a file @@ -84,6 +89,9 @@ v1.1.beta3 (XXXX-XX-XX) that users have full control over when they perform any updates/upgrades of their data, and do not risk running an incompatible server/database state tandem. +* fixed issue #284: fixed Javascript errors when adding edges/vertices without own + attributes + * fixed issue #283: AQL LENGTH() now works on documents, too * fixed issue #281: documentation for skip lists shows wrong example @@ -95,9 +103,6 @@ v1.1.beta3 (XXXX-XX-XX) the fix of this issue also implies validation of collection names / ids passed to the REST edge create method. edges with invalid collection ids or names in the "from" or "to" values will be rejected and not saved - Also allow using collection names in document ids when creating edges from - Javascript using the edges..save(from, to, data) method - v1.1.beta2 (2012-11-13) ----------------------- @@ -306,6 +311,18 @@ v1.0.4 (2012-11-12) * strange error message in arangosh 1.0.3 at startup +v1.0.3 (2012-11-08) +------------------- + +* fixed AQL optimiser bug + +* issue #273: fixed segfault in arangosh on HTTP 40x + +* issue #265: allow optional base64 encoding/decoding of action response data + +* issue #252: _modules collection not created automatically + + v1.0.2 (2012-10-22) ------------------- diff --git a/Documentation/Makefile.files b/Documentation/Makefile.files index b841e33558..39d10f0d05 100644 --- a/Documentation/Makefile.files +++ b/Documentation/Makefile.files @@ -92,8 +92,8 @@ WIKI = \ SimpleQueries \ Upgrading \ UserManual \ - UserManualBasics \ UserManualArangosh \ + UserManualWebInterface \ UserManualActions \ jsUnity @@ -250,12 +250,7 @@ endif ################################################################################ CLEANUP += \ - $(DOXYGEN) \ - Doxygen/doc \ - Doxygen/latex \ - Doxygen/website \ - Doxygen/wiki \ - Doxygen/xml + Doxygen/* ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/Documentation/Manual/NewFeatures11.md b/Documentation/Manual/NewFeatures11.md index ab8b5c7877..452fa1c0a5 100644 --- a/Documentation/Manual/NewFeatures11.md +++ b/Documentation/Manual/NewFeatures11.md @@ -103,16 +103,6 @@ removed. Replacing will also create a new revision: For more information, please check @ref RestDocument. -Blueprints API {#NewFeatures11BluePrintsAPI} --------------------------------------------- - -Blueprints is a property graph model interface with provided -implementations. Databases that implement the Blueprints interfaces -automatically support Blueprints-enabled applications -(@EXTREF{http://tinkerpop.com/,http://tinkerpop.com}). - -For more information please refer to @ref HttpBlueprints. - AQL Improvements {#NewFeatures11AqlImprovements} ------------------------------------------------ @@ -218,7 +208,9 @@ parameter to `true` will force synchronisation. Server Statistics {#NewFeatures11ServerStatistics} -------------------------------------------------- -ArangoDB 1.1 allows querying the server status via REST API methods. +ArangoDB 1.1 allows querying the server status via the administration +front-end (see @ref UserManualWebInterfaceStatistics) or via REST API +methods. The following methods are available: - `GET /_admin/connection-statistics`: provides connection statistics diff --git a/Documentation/Manual/NewFeatures11TOC.md b/Documentation/Manual/NewFeatures11TOC.md index 0cf91cee0e..6f10839718 100644 --- a/Documentation/Manual/NewFeatures11TOC.md +++ b/Documentation/Manual/NewFeatures11TOC.md @@ -5,7 +5,6 @@ TOC {#NewFeatures11TOC} - @ref NewFeatures11CollectionTypes - @ref NewFeatures11BatchRequests - @ref NewFeatures11PartialUpdates - - @ref NewFeatures11BluePrintsAPI - @ref NewFeatures11AqlImprovements - @ref NewFeatures11DiskSynchronisation - @ref NewFeatures11ServerStatistics diff --git a/Documentation/UserManual/FirstStepsArangoDB.md b/Documentation/UserManual/FirstStepsArangoDB.md index 1c799c34e8..69c3d83c0d 100644 --- a/Documentation/UserManual/FirstStepsArangoDB.md +++ b/Documentation/UserManual/FirstStepsArangoDB.md @@ -80,7 +80,34 @@ the ArangoDB database server. arangodb 14536 0.1 0.6 5307264 23464 s002 S 1:21pm 0:00.18 /usr/local/sbin/arangod If there is no such process, check the log file -`/var/log/arangodb/arangod.log` for errors. +`/var/log/arangodb/arangod.log` for errors. If you see a log message +like + + 2012-11-20T00:36:55Z [17253] ERROR No version information file found in database directory. + 2012-11-20T00:36:55Z [17253] FATAL Database version check failed. Please run arango-upgrade --database.directory "/tmp/my-database-path" + +make sure that the program `arango-upgrade` has been used to initialse +(or update) the database stored at `/tmp/my-database-path`. If not run + + arango-upgrade --database.directory /tmp/my-database-path + + +ArangoDB programs {#FirstStepsArangoDBBinaries} +=============================================== + +The ArangoDB database package comes with the following programs: + +- _arangod_: The ArangoDB database daemon. This server program is + intended to run as daemon process and to server the various clients + connection to the server via TCP / HTTP. See @ref + FirstStepsServerStartStop. +- _arango-update_: Used to initialize or update the database. +- _arangosh_: The ArangoDB shell. A client that implements a + read-eval-print loop (REPL) and provides functions to access and + administrate the ArangoDB server. See @ref FirstStepsShellStartStop. +- _arangoimp_: A bulk importer for the ArangoDB server. + See @ref ImpManual + ArangoDB programs {#FirstStepsArangoDBBinaries} =============================================== @@ -311,7 +338,7 @@ The ArangoDB server has a graphical front-end, which allows you to inspect the current state of the server from within your browser. You can use the front-end using the following URL: - http://localhost:8529/_admin + http://localhost:8529/_admin/html/index.html Unless you have loaded an application into the ArangoDB server, which remaps the paths, the front-end will also be available under @@ -435,7 +462,7 @@ to a server, the version number of the ArangoDB server. Command-Line Options {#FirstStepsShellStartStopOptions} ------------------------------------------------------- -Use @LIT{--help} to get a list of command-line options: +Use `--help` to get a list of command-line options: > ./arangosh --help STANDARD options: diff --git a/Makefile.am b/Makefile.am index f13f6cdea4..f977954132 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,12 @@ dist_man_MANS = CLEANUP = +################################################################################ +### @brief tragets for cleanup of 3rd party libraries +################################################################################ + +CLEANUP_3RD = + ################################################################################ ### @brief flex files ################################################################################ @@ -303,6 +309,9 @@ endif ## cleanup ################################################################################ +distclean-local: + @for i in $(CLEANUP_3RD); do $(MAKE) $$i; done + clean-local: rm -rf $(CLEANUP) rm -f $(BUILT_SOURCES) diff --git a/arangod/Ahuacatl/ahuacatl-grammar.c b/arangod/Ahuacatl/ahuacatl-grammar.c index 351031171b..e6dec3c749 100644 --- a/arangod/Ahuacatl/ahuacatl-grammar.c +++ b/arangod/Ahuacatl/ahuacatl-grammar.c @@ -1,10 +1,8 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -75,7 +73,7 @@ /* Copy the first part of user declarations. */ -/* Line 189 of yacc.c */ +/* Line 268 of yacc.c */ #line 10 "arangod/Ahuacatl/ahuacatl-grammar.y" #include @@ -93,8 +91,8 @@ #include "Ahuacatl/ahuacatl-scope.h" -/* Line 189 of yacc.c */ -#line 98 "arangod/Ahuacatl/ahuacatl-grammar.c" +/* Line 268 of yacc.c */ +#line 96 "arangod/Ahuacatl/ahuacatl-grammar.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -179,7 +177,7 @@ typedef union YYSTYPE { -/* Line 214 of yacc.c */ +/* Line 301 of yacc.c */ #line 26 "arangod/Ahuacatl/ahuacatl-grammar.y" TRI_aql_node_t* node; @@ -189,8 +187,8 @@ typedef union YYSTYPE -/* Line 214 of yacc.c */ -#line 194 "arangod/Ahuacatl/ahuacatl-grammar.c" +/* Line 301 of yacc.c */ +#line 192 "arangod/Ahuacatl/ahuacatl-grammar.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -213,7 +211,7 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ +/* Line 343 of yacc.c */ #line 33 "arangod/Ahuacatl/ahuacatl-grammar.y" @@ -243,8 +241,8 @@ void Ahuacatlerror (YYLTYPE* locp, TRI_aql_context_t* const context, const char* -/* Line 264 of yacc.c */ -#line 248 "arangod/Ahuacatl/ahuacatl-grammar.c" +/* Line 343 of yacc.c */ +#line 246 "arangod/Ahuacatl/ahuacatl-grammar.c" #ifdef short # undef short @@ -294,7 +292,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -347,11 +345,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -374,24 +372,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -422,23 +420,7 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -458,6 +440,26 @@ union yyalloc #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ @@ -665,8 +667,8 @@ static const yytype_uint8 yyr2[] = 1, 1, 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint8 yydefact[] = { @@ -735,8 +737,7 @@ static const yytype_int8 yypgoto[] = /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -82 static const yytype_int16 yytable[] = { @@ -774,6 +775,12 @@ static const yytype_int16 yytable[] = 75, 76 }; +#define yypact_value_is_default(yystate) \ + ((yystate) == (-41)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + static const yytype_int16 yycheck[] = { 6, 7, 4, 5, 44, 44, 44, 19, 33, 34, @@ -845,9 +852,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -857,7 +873,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -904,7 +919,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1113,7 +1128,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1216,115 +1230,142 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) { - int yyn = yypact[yystate]; + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1361,6 +1402,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, context) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -1377,12 +1419,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1446,7 +1485,7 @@ YYLTYPE yylloc; YYLTYPE *yylsp; /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + YYLTYPE yyerror_range[3]; YYSIZE_T yystacksize; @@ -1493,7 +1532,7 @@ YYLTYPE yylloc; yyvsp = yyvs; yylsp = yyls; -#if YYLTYPE_IS_TRIVIAL +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = 1; @@ -1595,7 +1634,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1626,8 +1665,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -1683,79 +1722,79 @@ yyreduce: { case 2: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 176 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 3: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 181 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 4: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 183 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 5: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 188 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 6: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 190 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 7: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 192 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 8: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 194 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 9: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 196 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 10: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 198 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 11: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 203 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node; @@ -1772,12 +1811,12 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 12: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 222 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeFilterAql(context, (yyvsp[(2) - (2)].node)); @@ -1788,12 +1827,12 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 13: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 235 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeLetAql(context, (yyvsp[(2) - (4)].strval), (yyvsp[(4) - (4)].node)); @@ -1804,12 +1843,12 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 14: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 248 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeListAql(context); @@ -1819,12 +1858,12 @@ yyreduce: } TRI_PushStackParseAql(context, node); - ;} + } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 256 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeCollectAql(context, TRI_PopStackParseAql(context), (yyvsp[(4) - (4)].strval)); @@ -1835,28 +1874,28 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 16: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 269 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 17: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 271 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 18: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 276 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeAssignAql(context, (yyvsp[(1) - (3)].strval), (yyvsp[(3) - (3)].node)); @@ -1867,30 +1906,30 @@ yyreduce: if (!TRI_PushListAql(context, node)) { ABORT_OOM } - ;} + } break; case 19: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 289 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.strval) = NULL; - ;} + } break; case 20: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 292 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.strval) = (yyvsp[(2) - (2)].strval); - ;} + } break; case 21: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 298 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeListAql(context); @@ -1900,12 +1939,12 @@ yyreduce: } TRI_PushStackParseAql(context, node); - ;} + } break; case 22: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 306 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* list = TRI_PopStackParseAql(context); @@ -1917,34 +1956,34 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 23: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 320 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_PushListAql(context, (yyvsp[(1) - (1)].node))) { ABORT_OOM } - ;} + } break; case 24: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 325 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_PushListAql(context, (yyvsp[(3) - (3)].node))) { ABORT_OOM } - ;} + } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 333 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeSortElementAql(context, (yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].boolval)); @@ -1953,39 +1992,39 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 344 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.boolval) = true; - ;} + } break; case 27: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 347 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.boolval) = true; - ;} + } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 350 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.boolval) = false; - ;} + } break; case 29: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 356 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, TRI_CreateNodeValueIntAql(context, 0), TRI_CreateNodeValueIntAql(context, (yyvsp[(2) - (2)].intval))); @@ -2000,12 +2039,12 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 370 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, TRI_CreateNodeValueIntAql(context, (yyvsp[(2) - (4)].intval)), TRI_CreateNodeValueIntAql(context, (yyvsp[(4) - (4)].intval))); @@ -2016,12 +2055,12 @@ yyreduce: if (!TRI_AppendStatementListAql(context->_statements, node)) { ABORT_OOM } - ;} + } break; case 31: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 383 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeReturnAql(context, (yyvsp[(2) - (2)].node)); @@ -2038,33 +2077,33 @@ yyreduce: } // $$ = node; - ;} + } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 403 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(2) - (3)].node); - ;} + } break; case 33: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 406 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_StartScopeAql(context, TRI_AQL_SCOPE_SUBQUERY)) { ABORT_OOM } - ;} + } break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 411 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* result; @@ -2096,39 +2135,39 @@ yyreduce: // return the result (yyval.node) = result; - ;} + } break; case 35: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 442 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 36: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 445 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 448 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 38: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 451 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node; @@ -2143,12 +2182,12 @@ yyreduce: } TRI_PushStackParseAql(context, node); - ;} + } break; case 39: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 464 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* list = TRI_PopStackParseAql(context); @@ -2158,39 +2197,39 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 40: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 473 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 41: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 476 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 42: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 479 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 43: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 485 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryPlusAql(context, (yyvsp[(2) - (2)].node)); @@ -2199,12 +2238,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 44: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 493 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryMinusAql(context, (yyvsp[(2) - (2)].node)); @@ -2213,12 +2252,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 501 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryNotAql(context, (yyvsp[(2) - (2)].node)); @@ -2227,12 +2266,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 46: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 512 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryOrAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2241,12 +2280,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 47: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 520 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryAndAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2255,12 +2294,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 48: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 528 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryPlusAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2269,12 +2308,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 49: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 536 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryMinusAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2283,12 +2322,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 50: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 544 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryTimesAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2297,12 +2336,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 51: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 552 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryDivAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2311,12 +2350,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 52: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 560 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryModAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2325,12 +2364,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 53: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 568 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryEqAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2339,12 +2378,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 54: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 576 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryNeAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2353,12 +2392,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 584 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLtAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2367,12 +2406,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 56: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 592 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGtAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2381,12 +2420,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 57: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 600 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLeAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2395,12 +2434,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 58: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 608 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGeAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2409,12 +2448,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 59: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 616 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryInAql(context, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); @@ -2423,12 +2462,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 60: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 627 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeOperatorTernaryAql(context, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node)); @@ -2437,64 +2476,64 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 638 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 62: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 640 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 645 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_PushListAql(context, (yyvsp[(1) - (1)].node)); - ;} + } break; case 64: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 648 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_PushListAql(context, (yyvsp[(3) - (3)].node)); - ;} + } break; case 65: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 654 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 66: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 657 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 663 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeListAql(context); @@ -2503,59 +2542,59 @@ yyreduce: } TRI_PushStackParseAql(context, node); - ;} + } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 670 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = TRI_PopStackParseAql(context); - ;} + } break; case 69: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 676 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 678 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 71: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 683 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_PushListAql(context, (yyvsp[(1) - (1)].node))) { ABORT_OOM } - ;} + } break; case 72: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 688 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_PushListAql(context, (yyvsp[(3) - (3)].node))) { ABORT_OOM } - ;} + } break; case 73: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 696 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeArrayAql(context); @@ -2564,74 +2603,74 @@ yyreduce: } TRI_PushStackParseAql(context, node); - ;} + } break; case 74: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 703 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = TRI_PopStackParseAql(context); - ;} + } break; case 75: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 709 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 76: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 711 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 77: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 716 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 78: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 718 "arangod/Ahuacatl/ahuacatl-grammar.y" { - ;} + } break; case 79: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 723 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!TRI_PushArrayAql(context, (yyvsp[(1) - (3)].strval), (yyvsp[(3) - (3)].node))) { ABORT_OOM } - ;} + } break; case 80: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 732 "arangod/Ahuacatl/ahuacatl-grammar.y" { // start of reference (collection or variable name) (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 81: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 736 "arangod/Ahuacatl/ahuacatl-grammar.y" { // expanded variable access, e.g. variable[*] @@ -2657,12 +2696,12 @@ yyreduce: // push the variable TRI_PushStackParseAql(context, node); - ;} + } break; case 82: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 760 "arangod/Ahuacatl/ahuacatl-grammar.y" { // return from the "expansion" subrule @@ -2689,12 +2728,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 83: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 789 "arangod/Ahuacatl/ahuacatl-grammar.y" { // variable or collection @@ -2712,12 +2751,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 84: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 806 "arangod/Ahuacatl/ahuacatl-grammar.y" { // named variable access, e.g. variable.reference @@ -2726,12 +2765,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 85: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 814 "arangod/Ahuacatl/ahuacatl-grammar.y" { // indexed variable access, e.g. variable[index] @@ -2740,12 +2779,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 86: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 825 "arangod/Ahuacatl/ahuacatl-grammar.y" { // named variable access, continuation from * expansion, e.g. [*].variable.reference @@ -2756,12 +2795,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 87: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 835 "arangod/Ahuacatl/ahuacatl-grammar.y" { // indexed variable access, continuation from * expansion, e.g. [*].variable[index] @@ -2772,12 +2811,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 88: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 845 "arangod/Ahuacatl/ahuacatl-grammar.y" { // named variable access, continuation from * expansion, e.g. [*].variable.xx.reference @@ -2785,12 +2824,12 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 89: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 852 "arangod/Ahuacatl/ahuacatl-grammar.y" { // indexed variable access, continuation from * expansion, e.g. [*].variable.xx.[index] @@ -2798,30 +2837,30 @@ yyreduce: if (!(yyval.node)) { ABORT_OOM } - ;} + } break; case 90: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 862 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 91: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 865 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); - ;} + } break; case 92: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 871 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeValueStringAql(context, (yyvsp[(1) - (1)].strval)); @@ -2830,12 +2869,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 93: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 879 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node; @@ -2850,12 +2889,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 94: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 893 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeValueNullAql(context); @@ -2864,12 +2903,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 95: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 901 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, true); @@ -2878,12 +2917,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 96: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 909 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, false); @@ -2892,12 +2931,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 97: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 920 "arangod/Ahuacatl/ahuacatl-grammar.y" { TRI_aql_node_t* node = TRI_CreateNodeParameterAql(context, (yyvsp[(1) - (1)].strval)); @@ -2906,12 +2945,12 @@ yyreduce: } (yyval.node) = node; - ;} + } break; case 98: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 931 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!(yyvsp[(1) - (1)].strval)) { @@ -2919,12 +2958,12 @@ yyreduce: } (yyval.strval) = (yyvsp[(1) - (1)].strval); - ;} + } break; case 99: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 938 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!(yyvsp[(1) - (1)].strval)) { @@ -2932,21 +2971,21 @@ yyreduce: } (yyval.strval) = (yyvsp[(1) - (1)].strval); - ;} + } break; case 100: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 947 "arangod/Ahuacatl/ahuacatl-grammar.y" { (yyval.strval) = (yyvsp[(1) - (1)].strval); - ;} + } break; case 101: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 953 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!(yyvsp[(1) - (1)].strval)) { @@ -2954,12 +2993,12 @@ yyreduce: } (yyval.intval) = TRI_Int64String((yyvsp[(1) - (1)].strval)); - ;} + } break; case 102: -/* Line 1455 of yacc.c */ +/* Line 1821 of yacc.c */ #line 960 "arangod/Ahuacatl/ahuacatl-grammar.y" { if (!(yyvsp[(2) - (2)].strval)) { @@ -2967,15 +3006,26 @@ yyreduce: } (yyval.intval) = - TRI_Int64String((yyvsp[(2) - (2)].strval)); - ;} + } break; -/* Line 1455 of yacc.c */ -#line 2977 "arangod/Ahuacatl/ahuacatl-grammar.c" +/* Line 1821 of yacc.c */ +#line 3016 "arangod/Ahuacatl/ahuacatl-grammar.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -3004,6 +3054,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -3011,41 +3065,40 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (&yylloc, context, YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (&yylloc, context, yymsg); - } - else - { - yyerror (&yylloc, context, YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (&yylloc, context, yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } - yyerror_range[0] = yylloc; + yyerror_range[1] = yylloc; if (yyerrstatus == 3) { @@ -3082,7 +3135,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[0] = yylsp[1-yylen]; + yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -3101,7 +3154,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -3116,7 +3169,7 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[0] = *yylsp; + yyerror_range[1] = *yylsp; yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp, context); YYPOPSTACK (1); @@ -3126,10 +3179,10 @@ yyerrlab1: *++yyvsp = yylval; - yyerror_range[1] = yylloc; + yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + YYLLOC_DEFAULT (yyloc, yyerror_range, 2); *++yylsp = yyloc; /* Shift the error token. */ @@ -3165,8 +3218,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, context); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc, context); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); diff --git a/arangod/Ahuacatl/ahuacatl-grammar.h b/arangod/Ahuacatl/ahuacatl-grammar.h index a47c8c24d2..cd0c7a1280 100644 --- a/arangod/Ahuacatl/ahuacatl-grammar.h +++ b/arangod/Ahuacatl/ahuacatl-grammar.h @@ -1,10 +1,8 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -97,7 +95,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 2132 of yacc.c */ #line 26 "arangod/Ahuacatl/ahuacatl-grammar.y" TRI_aql_node_t* node; @@ -107,8 +105,8 @@ typedef union YYSTYPE -/* Line 1676 of yacc.c */ -#line 112 "arangod/Ahuacatl/ahuacatl-grammar.h" +/* Line 2132 of yacc.c */ +#line 110 "arangod/Ahuacatl/ahuacatl-grammar.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/arangod/Ahuacatl/ahuacatl-tokens.c b/arangod/Ahuacatl/ahuacatl-tokens.c index e5da74e95f..f14d639f07 100644 --- a/arangod/Ahuacatl/ahuacatl-tokens.c +++ b/arangod/Ahuacatl/ahuacatl-tokens.c @@ -46,6 +46,7 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -169,6 +170,11 @@ typedef void* yyscan_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -182,7 +188,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; */ #define YY_LESS_LINENO(n) \ do { \ - int yyl;\ + yy_size_t yyl;\ for ( yyl = n; yyl < yyleng; ++yyl )\ if ( yytext[yyl] == '\n' )\ --yylineno;\ @@ -204,11 +210,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -226,7 +227,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -305,7 +306,7 @@ static void Ahuacatl_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscann YY_BUFFER_STATE Ahuacatl_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); +YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); void *Ahuacatlalloc (yy_size_t ,yyscan_t yyscanner ); void *Ahuacatlrealloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -356,7 +357,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); */ #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (yy_size_t) (yy_cp - yy_bp); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; @@ -628,8 +629,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - int yy_n_chars; - int yyleng_r; + yy_size_t yy_n_chars; + yy_size_t yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -686,7 +687,7 @@ FILE *Ahuacatlget_out (yyscan_t yyscanner ); void Ahuacatlset_out (FILE * out_str ,yyscan_t yyscanner ); -int Ahuacatlget_leng (yyscan_t yyscanner ); +yy_size_t Ahuacatlget_leng (yyscan_t yyscanner ); char *Ahuacatlget_text (yyscan_t yyscanner ); @@ -753,7 +754,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -914,7 +915,7 @@ yy_find_action: if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - int yyl; + yy_size_t yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) @@ -1482,7 +1483,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1496,7 +1497,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1527,7 +1528,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, (int) num_to_read ); + yyg->yy_n_chars, num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1652,7 +1653,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1676,7 +1677,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) case EOB_ACT_END_OF_FILE: { if ( Ahuacatlwrap(yyscanner ) ) - return EOF; + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1945,7 +1946,7 @@ void Ahuacatlpop_buffer_state (yyscan_t yyscanner) */ static void Ahuacatlensure_buffer_stack (yyscan_t yyscanner) { - int num_to_alloc; + yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -2043,12 +2044,11 @@ YY_BUFFER_STATE Ahuacatl_scan_string (yyconst char * yystr , yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE Ahuacatl_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - int i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2158,7 +2158,7 @@ FILE *Ahuacatlget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -int Ahuacatlget_leng (yyscan_t yyscanner) +yy_size_t Ahuacatlget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; diff --git a/arangod/Documentation/api-blueprints.dox b/arangod/Documentation/api-blueprints.dox index a1cf977e5c..662ed34182 100644 --- a/arangod/Documentation/api-blueprints.dox +++ b/arangod/Documentation/api-blueprints.dox @@ -55,15 +55,9 @@ /// @anchor A_JSF_DELETE_blueprints_vertex /// @copydetails JSF_DELETE_blueprints_vertex /// -/// -/// -/// /// @anchor A_JSF_POST_blueprints_vertices /// @copydetails JSF_POST_blueprints_vertices /// -/// -/// -/// /// @anchor A_JSF_POST_blueprints_edge /// @copydetails JSF_POST_blueprints_edge /// @@ -76,12 +70,8 @@ /// @anchor A_JSF_DELETE_blueprints_edge /// @copydetails JSF_DELETE_blueprints_edge /// -/// -/// -/// /// @anchor A_JSF_POST_blueprints_edges /// @copydetails JSF_POST_blueprints_edges -/// ////////////////////////////////////////////////////// // Local Variables: diff --git a/arangod/Documentation/user-manual.dox b/arangod/Documentation/user-manual.dox index ce1a51c811..c8dd2fe557 100644 --- a/arangod/Documentation/user-manual.dox +++ b/arangod/Documentation/user-manual.dox @@ -38,6 +38,7 @@ ///
    ///
  • @ref FirstStepsArangoDB
    • ///
  • @ref UserManualArangosh
    • +///
  • @ref UserManualWebInterface
    • ///
  • @ref ShellCollection
    • ///
  • @ref ShellDocument
    • ///
  • @ref ShellEdge
    • @@ -52,6 +53,7 @@ /// @else /// @copydetails FirstStepsArangoDBTOC /// @copydetails UserManualArangoshTOC +/// @copydetails UserManualWebInterfaceTOC /// @copydetails ShellCollectionTOC /// @copydetails ShellDocumentTOC /// @copydetails ShellEdgeTOC diff --git a/arangod/HashIndex/hasharray.c b/arangod/HashIndex/hasharray.c index 5114c00cf0..51286c42fc 100755 --- a/arangod/HashIndex/hasharray.c +++ b/arangod/HashIndex/hasharray.c @@ -125,7 +125,7 @@ static bool AllocateTable (TRI_hasharray_t* array, size_t numElements) { return false; } - // check if memory was aligned on a cache line boundary + // position array directly on a cache line boundary offset = ((intptr_t) data) % CACHE_LINE_SIZE; if (offset == 0) { diff --git a/arangod/MRServer/ApplicationMR.h b/arangod/MRServer/ApplicationMR.h index 3b2ecc9304..f29d43db85 100644 --- a/arangod/MRServer/ApplicationMR.h +++ b/arangod/MRServer/ApplicationMR.h @@ -1,4 +1,4 @@ -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// /// @brief MR enigne configuration /// /// @file @@ -271,7 +271,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief path to the directory containing alternate startup scripts /// -/// @CMDOPT{\-\-ruby.directory @CA{directory}} +/// @CMDOPT{\--ruby.directory @CA{directory}} /// /// Specifies the @CA{directory} path to alternate startup MRuby files. /// Normally, the server will start using built-in MRuby core functionality. To @@ -284,7 +284,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief semicolon separated list of module directories /// -/// @CMDOPT{\-\-ruby.modules-path @CA{directory}} +/// @CMDOPT{\--ruby.modules-path @CA{directory}} /// /// Specifies the @CA{directory} path with user defined MRuby modules. Multiple /// paths can be specified separated with commas. @@ -295,7 +295,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief path to the system action directory /// -/// @CMDOPT{\-\-ruby.action-directory @CA{directory}} +/// @CMDOPT{\--ruby.action-directory @CA{directory}} /// /// Specifies the @CA{directory} containg the system defined MRuby files that /// can be invoked as actions. @@ -306,7 +306,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief MRuby garbage collection interval (each x requests) /// -/// @CMDOPT{\-\-ruby.gc-interval @CA{interval}} +/// @CMDOPT{\--ruby.gc-interval @CA{interval}} /// /// Specifies the interval (approximately in number of requests) that the /// garbage collection for MRuby objects will be run in each thread. @@ -317,7 +317,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief MRuby garbage collection frequency (each x seconds) /// -/// @CMDOPT{\-\-ruby.gc-frequency @CA{frequency}} +/// @CMDOPT{\--ruby.gc-frequency @CA{frequency}} /// /// Specifies the frequency in seconds for the automatic garbage collection of /// MRuby objects. This setting is useful to have the garbage collection diff --git a/arangod/RestServer/ArangoServer.h b/arangod/RestServer/ArangoServer.h index 3d574467e8..afa3f5c5b1 100644 --- a/arangod/RestServer/ArangoServer.h +++ b/arangod/RestServer/ArangoServer.h @@ -256,7 +256,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief number of dispatcher threads for non-database worker /// -/// @CMDOPT{\-\-server.threads @CA{number}} +/// @CMDOPT{\--server.threads @CA{number}} /// /// Specifies the @CA{number} of threads that are spawned to handle action /// requests using Rest, JavaScript, or Ruby. @@ -267,7 +267,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief path to the database /// -/// @CMDOPT{\-\-database.directory @CA{directory}} +/// @CMDOPT{\--database.directory @CA{directory}} /// /// The directory containing the collections and data-files. Defaults /// to @LIT{/var/lib/arango}. @@ -287,7 +287,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief remove on drop /// -/// @CMDOPT{\-\-database.remove-on-drop @CA{flag}} +/// @CMDOPT{\--database.remove-on-drop @CA{flag}} /// /// If @LIT{true} and you drop a collection, then they directory and all /// associated datafiles will be removed from disk. If @LIT{false}, then they @@ -304,7 +304,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief remove on compaction /// -/// @CMDOPT{\-\-database.remove-on-compaction @CA{flag}} +/// @CMDOPT{\--database.remove-on-compaction @CA{flag}} /// /// Normally the garbage collection will removed compacted datafile. For debug /// purposes you can use this option to keep the old datafiles. You should @@ -318,7 +318,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief default journal size /// -/// @CMDOPT{\-\-database.maximal-journal-size @CA{size}} +/// @CMDOPT{\--database.maximal-journal-size @CA{size}} /// /// Maximal size of journal in bytes. Can be overwritten when creating a new /// collection. Note that this also limits the maximal size of a single @@ -332,7 +332,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief default wait for sync behavior /// -/// @CMDOPT{\-\-database.wait-for-sync @CA{boolean}} +/// @CMDOPT{\--database.wait-for-sync @CA{boolean}} /// /// Default wait-for-sync value. Can be overwritten when creating a new /// collection. @@ -345,7 +345,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief force sync shapes /// -/// @CMDOPT{\-\-database.force-sync-shapes @CA{boolean}} +/// @CMDOPT{\--database.force-sync-shapes @CA{boolean}} /// /// Force syncing of shape data to disk when writing shape information. /// If turned off, syncing will still happen for shapes of collections that @@ -360,7 +360,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief unit tests /// -/// @CMDOPT{\-\-javascript.unit-tests @CA{test-file}} +/// @CMDOPT{\--javascript.unit-tests @CA{test-file}} /// /// Runs one or more unit tests. //////////////////////////////////////////////////////////////////////////////// @@ -370,7 +370,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief files to jslint /// -/// @CMDOPT{\-\-jslint @CA{test-file}} +/// @CMDOPT{\--jslint @CA{test-file}} /// /// Runs jslint on one or more files. //////////////////////////////////////////////////////////////////////////////// @@ -380,7 +380,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief run script file /// -/// @CMDOPT{\-\-javascript.script @CA{script-file}} +/// @CMDOPT{\--javascript.script @CA{script-file}} /// /// Runs the script file. //////////////////////////////////////////////////////////////////////////////// @@ -390,7 +390,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief parameters to script file /// -/// @CMDOPT{\-\-javascript.script-parameter @CA{script-parameter}} +/// @CMDOPT{\--javascript.script-parameter @CA{script-parameter}} /// /// Parameter to script. //////////////////////////////////////////////////////////////////////////////// @@ -400,7 +400,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief server default language /// -/// @CMDOPT{\-\-default-language @CA{script-parameter}} +/// @CMDOPT{\--default-language @CA{script-parameter}} /// /// Parameter to script. //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/V8Server/ApplicationV8.h b/arangod/V8Server/ApplicationV8.h index ff0af95eab..afd17a7ff0 100644 --- a/arangod/V8Server/ApplicationV8.h +++ b/arangod/V8Server/ApplicationV8.h @@ -330,7 +330,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief path to the directory containing alternate startup scripts /// -/// @CMDOPT{\-\-javascript.directory @CA{directory}} +/// @CMDOPT{\--javascript.directory @CA{directory}} /// /// Specifies the @CA{directory} path to alternate startup JavaScript files. /// Normally, the server will start using built-in JavaScript core @@ -343,7 +343,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief semicolon separated list of module directories /// -/// @CMDOPT{\-\-javascript.modules-path @CA{directory}} +/// @CMDOPT{\--javascript.modules-path @CA{directory}} /// /// Specifies the @CA{directory} path with user defined JavaScript modules. /// Multiple paths can be specified separated with commas. @@ -354,7 +354,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief path to the system action directory /// -/// @CMDOPT{\-\-javascript.action-directory @CA{directory}} +/// @CMDOPT{\--javascript.action-directory @CA{directory}} /// /// Specifies the @CA{directory} containg the system defined JavaScript files /// that can be invoked as actions. @@ -377,7 +377,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript garbage collection interval (each x requests) /// -/// @CMDOPT{\-\-javascript.gc-interval @CA{interval}} +/// @CMDOPT{\--javascript.gc-interval @CA{interval}} /// /// Specifies the interval (approximately in number of requests) that the /// garbage collection for JavaScript objects will be run in each thread. @@ -388,7 +388,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief JavaScript garbage collection frequency (each x seconds) /// -/// @CMDOPT{\-\-javascript.gc-frequency @CA{frequency}} +/// @CMDOPT{\--javascript.gc-frequency @CA{frequency}} /// /// Specifies the frequency (in seconds) for the automatic garbage collection of /// JavaScript objects. This setting is useful to have the garbage collection @@ -400,7 +400,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief optional arguments to pass to v8 /// -/// @CMDOPT{\-\-javascript.v8-options @CA{options}} +/// @CMDOPT{\--javascript.v8-options @CA{options}} /// /// Optional arguments to pass to the V8 Javascript engine. The V8 engine will /// run with default settings unless explicit options are specified using this diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 9f3f76a1eb..c6e84282de 100755 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -6176,6 +6176,10 @@ TRI_v8_global_t* TRI_InitV8VocBridge (v8::Handle context, context->Global()->Set(TRI_V8_SYMBOL("VERSION"), v8::String::New(TRIAGENS_VERSION), v8::ReadOnly); context->Global()->Set(TRI_V8_SYMBOL("DATABASEPATH"), v8::String::New(vocbase->_path), v8::ReadOnly); + + // ............................................................................. + // create the global variables + // ............................................................................. context->Global()->Set(TRI_V8_SYMBOL("db"), TRI_WrapVocBase(vocbase, TRI_COL_TYPE_DOCUMENT), diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index e181302d97..ef4103f79f 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -1,4 +1,4 @@ -//////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// /// @brief primary collection with global read-write lock /// /// @file diff --git a/config/compile b/config/compile index c0096a7b56..7b4a9a7e1e 100755 --- a/config/compile +++ b/config/compile @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-03-05.13; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,219 @@ scriptversion=2009-10-06.20; # UTC # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +250,13 @@ EOF echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +265,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +293,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +305,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff --git a/config/install-sh b/config/install-sh index 6781b987bd..377bb8687f 100755 --- a/config/install-sh +++ b/config/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/config/missing b/config/missing index 28055d2ae6..9a5564823d 100755 --- a/config/missing +++ b/config/missing @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ run=: sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ case $1 in echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ Options: --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ case $1 in # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ esac case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ WARNING: \`$1' is $msg. You should only need it if automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ WARNING: \`$1' is $msg. You should only need it if autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ WARNING: \`$1' is needed, but is $msg. bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ WARNING: \`$1' $msg. You should only need it if lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ WARNING: \`$1' is $msg. You should only need it if help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ WARNING: \`$1' is $msg. You should only need it if makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff --git a/html/admin/js/master.js b/html/admin/js/master.js index 2633cdb49d..a9ecf36f63 100644 --- a/html/admin/js/master.js +++ b/html/admin/js/master.js @@ -2957,6 +2957,8 @@ function systemAttributes () { '_to' : true, '_bidirectional' : true, '_vertices' : true, + '_from' : true, + '_to' : true, '$id' : true }; } diff --git a/js/common/modules/graph.js b/js/common/modules/graph.js index a45b0011a6..482adfde68 100644 --- a/js/common/modules/graph.js +++ b/js/common/modules/graph.js @@ -1267,10 +1267,11 @@ Graph.prototype.addEdge = function (out_vertex, in_vertex, id, label, data) { } if (data === null || typeof data !== "object") { - data = {}; + shallow = {}; + } + else { + shallow = data.shallowCopy || {}; } - - shallow = data.shallowCopy; shallow.$id = id || null; shallow.$label = label || null; @@ -1309,10 +1310,11 @@ Graph.prototype.addVertex = function (id, data) { shallow; if (data === null || typeof data !== "object") { - data = {}; + shallow = {}; + } + else { + shallow = data.shallowCopy || {}; } - - shallow = data.shallowCopy; shallow.$id = id || null; diff --git a/js/server/arango-upgrade.js b/js/server/arango-upgrade.js index f39daad5ae..7763c68779 100644 --- a/js/server/arango-upgrade.js +++ b/js/server/arango-upgrade.js @@ -286,7 +286,6 @@ function main (argv) { return true; }); - // loop through all tasks and execute them console.log("Found " + allTasks.length + " defined task(s), " + activeTasks.length + " task(s) to run"); diff --git a/lib/ApplicationServer/ApplicationServer.h b/lib/ApplicationServer/ApplicationServer.h index 532d47a884..2f7a68adbb 100644 --- a/lib/ApplicationServer/ApplicationServer.h +++ b/lib/ApplicationServer/ApplicationServer.h @@ -341,7 +341,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief program options /// -/// @CMDOPT{\-\-help} +/// @CMDOPT{\--help} /// /// @CMDOPT{-h} /// @@ -409,7 +409,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief version of the application /// -/// @CMDOPT{\-\-version} +/// @CMDOPT{\--version} /// /// @CMDOPT{-v} /// @@ -421,7 +421,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief config file /// -/// @CMDOPT{\-\-configuration @CA{filename}} +/// @CMDOPT{\--configuration @CA{filename}} /// /// @CMDOPT{-c @CA{filename}} /// @@ -500,7 +500,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief the user id to use for the process /// -/// @CMDOPT{\-\-uid @CA{uid}} +/// @CMDOPT{\--uid @CA{uid}} /// /// The name (identity) of the user the server will run as. If this parameter is /// not specified, the server will not attempt to change its UID, so that the @@ -534,7 +534,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief the group id to use for the process /// -/// @CMDOPT{\-\-gid @CA{gid}} +/// @CMDOPT{\--gid @CA{gid}} /// /// The name (identity) of the group the server will run as. If this parameter /// is not specified, then the server will not attempt to change its GID, so @@ -564,7 +564,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log application name /// -/// @CMDOPT{\-\-log.application @CA{name}} +/// @CMDOPT{\--log.application @CA{name}} /// /// Specifies the @CA{name} of the application which should be logged if this item of /// information is to be logged. @@ -575,7 +575,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log host name /// -/// @CMDOPT{\-\-log.hostname @CA{name}} +/// @CMDOPT{\--log.hostname @CA{name}} /// /// Specifies the @CA{name} of the operating environment (the "hostname") which /// should be logged if this item of information is to be logged. Note that @@ -587,7 +587,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log facility /// -/// @CMDOPT{\-\-log.facility @CA{name}} +/// @CMDOPT{\--log.facility @CA{name}} /// /// Specifies the name of the server instance which should be logged if this /// item of information is to be logged. @@ -598,9 +598,9 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log level /// -/// @CMDOPT{\-\-log.level @CA{level}} +/// @CMDOPT{\--log.level @CA{level}} /// -/// @CMDOPT{\-\-log @CA{level}} +/// @CMDOPT{\--log @CA{level}} /// /// Allows the user to choose the level of information which is logged by the /// server. The argument @CA{level} is specified as a string and can be one of @@ -670,7 +670,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log format /// -/// @CMDOPT{\-\-log.format @CA{format}} +/// @CMDOPT{\--log.format @CA{format}} /// /// @copydetails triagens::basics::Logger::setLogFormat //////////////////////////////////////////////////////////////////////////////// @@ -680,7 +680,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log severity /// -/// @CMDOPT{\-\-log.severity @CA{severity}} +/// @CMDOPT{\--log.severity @CA{severity}} /// /// This parameter provides a set of standard log severities which can be /// used. The currently accepted @CA{severities} are: @@ -701,7 +701,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log level /// -/// @CMDOPT{\-\-log.file @CA{filename}} +/// @CMDOPT{\--log.file @CA{filename}} /// /// This option allows the user to specify the name of a file to which /// information is logged. By default, if no log file is specified, the standard @@ -719,7 +719,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log prefix /// -/// @CMDOPT{\-\-log.prefix @CA{prefix}} +/// @CMDOPT{\--log.prefix @CA{prefix}} /// /// This option is used specify an prefix to logged text. //////////////////////////////////////////////////////////////////////////////// @@ -729,7 +729,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log level /// -/// @CMDOPT{\-\-log.syslog @CA{arg}} +/// @CMDOPT{\--log.syslog @CA{arg}} /// /// If this option is set, then in addition to output being directed to the /// standard output (or to a specified file, in the case that the command line @@ -750,7 +750,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log thread identifier /// -/// @CMDOPT{\-\-log.thread} +/// @CMDOPT{\--log.thread} /// /// Whenever log output is generated, the process ID is written as part of the /// log information. Setting this option appends the thread id of the calling @@ -770,7 +770,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log line number /// -/// @CMDOPT{\-\-log.line-number} +/// @CMDOPT{\--log.line-number} /// /// Normally, if an human readable fatal, error, warning or info message is /// logged, no information about the file and line number is provided. The file @@ -783,7 +783,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief log filter /// -/// @CMDOPT{\-\-log.filter @CA{arg}} +/// @CMDOPT{\--log.filter @CA{arg}} /// /// For debug and trace messages, only log those messages occurring in the /// file @CA{arg}. @@ -794,7 +794,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief random number generator to use /// -/// @CMDOPT{\-\-random.generator @CA{arg}} +/// @CMDOPT{\--random.generator @CA{arg}} /// /// The argument is an integer (1,2,3 or 4) which sets the manner in which /// random numbers are generated. The default method (3) is to use the a @@ -805,7 +805,7 @@ namespace triagens { /// algorithm. Algorithm 4 is a combination of the blocking random number /// generator and the Mersenne Twister. /// -/// @CMDOPT{\-\-random.no-seed} +/// @CMDOPT{\--random.no-seed} /// /// By default, the random generator is seeded. Setting this option causes the /// random number generator not to be seeded. (Seeding the random number diff --git a/lib/BasicsC/logging.c b/lib/BasicsC/logging.c index 4487ebf4ae..e160f60e23 100644 --- a/lib/BasicsC/logging.c +++ b/lib/BasicsC/logging.c @@ -1601,9 +1601,8 @@ TRI_log_appender_t* TRI_CreateLogAppenderSyslog (char const* name, char const* f } } - // and open logging + // and open logging, openlog does not have a return value... TRI_LockMutex(&appender->_mutex); - // openlog does not have a return value... openlog(name, LOG_CONS | LOG_PID, value); TRI_UnlockMutex(&appender->_mutex); diff --git a/lib/HttpServer/ApplicationEndpointServer.h b/lib/HttpServer/ApplicationEndpointServer.h index 9663555f90..09b4b6bfd8 100644 --- a/lib/HttpServer/ApplicationEndpointServer.h +++ b/lib/HttpServer/ApplicationEndpointServer.h @@ -271,7 +271,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief endpoints for client HTTP requests /// -/// @CMDOPT{\-\-server.endpoint @CA{endpoint}} +/// @CMDOPT{\--server.endpoint @CA{endpoint}} /// /// Specifies an @CA{endpoint} for HTTP requests by clients. Endpoints have /// the following pattern: @@ -299,7 +299,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief disable authentication for ALL client requests /// -/// @CMDOPT{\-\-server.disable-authentication @CA{value}} +/// @CMDOPT{\--server.disable-authentication @CA{value}} /// /// Setting @CA{value} to true will turn off authentication on the server side /// so all clients can execute any action without authorisation and privilege @@ -313,7 +313,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief timeout for HTTP keep-alive /// -/// @CMDOPT{\-\-server.keep-alive-timeout} +/// @CMDOPT{\--server.keep-alive-timeout} /// /// Allows to specify the timeout for HTTP keep-alive connections. The timeout /// value must be specified in seconds. @@ -327,7 +327,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief listen backlog size /// -/// @CMDOPT{\-\-server.backlog-size} +/// @CMDOPT{\--server.backlog-size} /// /// Allows to specify the size of the backlog for the listen system call /// The default value is 10. The maximum value is platform-dependent. @@ -338,7 +338,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief keyfile containing server certificate /// -/// @CMDOPT{\-\-server.keyfile @CA{filename}} +/// @CMDOPT{\--server.keyfile @CA{filename}} /// /// If SSL encryption is used, this option must be used to specify the filename /// of the server private key. The file must be PEM formatted and contain both @@ -367,7 +367,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief CA file /// -/// @CMDOPT{\-\-server.cafile @CA{filename}} +/// @CMDOPT{\--server.cafile @CA{filename}} /// /// This option can be used to specify a file with CA certificates that are sent /// to the client whenever the server requests a client certificate. If the @@ -385,7 +385,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief SSL protocol type to use /// -/// @CMDOPT{\-\-server.ssl-protocol @CA{value}} +/// @CMDOPT{\--server.ssl-protocol @CA{value}} /// /// Use this option to specify the default encryption protocol to be used. /// The following variants are available: @@ -404,7 +404,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief whether or not to use SSL session caching /// -/// @CMDOPT{\-\-server.ssl-cache @CA{value}} +/// @CMDOPT{\--server.ssl-cache @CA{value}} /// /// Set to true if SSL session caching should be used. /// @@ -419,7 +419,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief ssl options to use /// -/// @CMDOPT{\-\-server.ssl-options @CA{value}} +/// @CMDOPT{\--server.ssl-options @CA{value}} /// /// This option can be used to set various SSL-related options. Individual /// option values must be combined using bitwise OR. @@ -441,7 +441,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief ssl cipher list to use /// -/// @CMDOPT{\-\-server.ssl-cipher-list @CA{cipher-list}} +/// @CMDOPT{\--server.ssl-cipher-list @CA{cipher-list}} /// /// This option can be used to restrict the server to certain SSL ciphers only, /// and to define the relative usage preference of SSL ciphers. diff --git a/lib/JsonParser/json-parser.c b/lib/JsonParser/json-parser.c index d5fd779efd..bd5694fe51 100644 --- a/lib/JsonParser/json-parser.c +++ b/lib/JsonParser/json-parser.c @@ -89,6 +89,7 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -212,6 +213,11 @@ typedef void* yyscan_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -234,11 +240,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -256,7 +257,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -335,7 +336,7 @@ static void tri_jsp__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscann YY_BUFFER_STATE tri_jsp__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_jsp__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); +YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); void *tri_jsp_alloc (yy_size_t ,yyscan_t yyscanner ); void *tri_jsp_realloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -386,7 +387,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); */ #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (yy_size_t) (yy_cp - yy_bp); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; @@ -565,8 +566,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - int yy_n_chars; - int yyleng_r; + yy_size_t yy_n_chars; + yy_size_t yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -613,7 +614,7 @@ FILE *tri_jsp_get_out (yyscan_t yyscanner ); void tri_jsp_set_out (FILE * out_str ,yyscan_t yyscanner ); -int tri_jsp_get_leng (yyscan_t yyscanner ); +yy_size_t tri_jsp_get_leng (yyscan_t yyscanner ); char *tri_jsp_get_text (yyscan_t yyscanner ); @@ -672,7 +673,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1128,7 +1129,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1142,7 +1143,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1173,7 +1174,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, (int) num_to_read ); + yyg->yy_n_chars, num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1298,7 +1299,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1322,7 +1323,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) case EOB_ACT_END_OF_FILE: { if ( tri_jsp_wrap(yyscanner ) ) - return EOF; + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1584,7 +1585,7 @@ void tri_jsp_pop_buffer_state (yyscan_t yyscanner) */ static void tri_jsp_ensure_buffer_stack (yyscan_t yyscanner) { - int num_to_alloc; + yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -1682,12 +1683,11 @@ YY_BUFFER_STATE tri_jsp__scan_string (yyconst char * yystr , yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE tri_jsp__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - int i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -1797,7 +1797,7 @@ FILE *tri_jsp_get_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -int tri_jsp_get_leng (yyscan_t yyscanner) +yy_size_t tri_jsp_get_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; diff --git a/lib/Rest/AnyServer.h b/lib/Rest/AnyServer.h index e6a44081b4..dcc154bfcd 100644 --- a/lib/Rest/AnyServer.h +++ b/lib/Rest/AnyServer.h @@ -168,7 +168,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief pid file /// -/// @CMDOPT{\-\-pid-file @CA{filename}} +/// @CMDOPT{\--pid-file @CA{filename}} /// /// The name of the process ID file to use when running the server as a /// daemon. This parameter must be specified if either the flag @LIT{daemon} or diff --git a/lib/Scheduler/ApplicationScheduler.h b/lib/Scheduler/ApplicationScheduler.h index 3192fc42c3..0bc7c66b49 100644 --- a/lib/Scheduler/ApplicationScheduler.h +++ b/lib/Scheduler/ApplicationScheduler.h @@ -269,7 +269,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief number of scheduler threads /// -/// @CMDOPT{\-\-scheduler.threads @CA{arg}} +/// @CMDOPT{\--scheduler.threads @CA{arg}} /// /// An integer argument which sets the number of threads to use in the IO /// scheduler. The default is 1. @@ -280,7 +280,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// /// @brief scheduler backend /// -/// @CMDOPT{\-\-scheduler.backend @CA{arg}} +/// @CMDOPT{\--scheduler.backend @CA{arg}} /// /// The I/O method used by the event handler. The default (if this option is /// not specified) is to try all recommended backends. This is platform diff --git a/lib/V8/V8LineEditor.cpp b/lib/V8/V8LineEditor.cpp index 6f4163c58c..c27f85b780 100644 --- a/lib/V8/V8LineEditor.cpp +++ b/lib/V8/V8LineEditor.cpp @@ -251,6 +251,7 @@ V8LineEditor::V8LineEditor (v8::Handle context, std::string const& bool V8LineEditor::open (const bool autoComplete) { if (autoComplete) { + // issue #289: do not append a space after completion rl_completion_append_character = '\0'; diff --git a/lib/V8/v8-json.cpp b/lib/V8/v8-json.cpp index 192e2fc2ab..f5a3fb2440 100644 --- a/lib/V8/v8-json.cpp +++ b/lib/V8/v8-json.cpp @@ -84,6 +84,7 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -207,6 +208,11 @@ typedef void* yyscan_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -229,11 +235,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -251,7 +252,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -330,7 +331,7 @@ static void tri_v8__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanne YY_BUFFER_STATE tri_v8__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE tri_v8__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); +YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); void *tri_v8_alloc (yy_size_t ,yyscan_t yyscanner ); void *tri_v8_realloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -381,7 +382,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); */ #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (yy_size_t) (yy_cp - yy_bp); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; @@ -553,8 +554,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - int yy_n_chars; - int yyleng_r; + yy_size_t yy_n_chars; + yy_size_t yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -601,7 +602,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner ); void tri_v8_set_out (FILE * out_str ,yyscan_t yyscanner ); -int tri_v8_get_leng (yyscan_t yyscanner ); +yy_size_t tri_v8_get_leng (yyscan_t yyscanner ); char *tri_v8_get_text (yyscan_t yyscanner ); @@ -660,7 +661,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1107,7 +1108,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1121,7 +1122,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1152,7 +1153,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, (int) num_to_read ); + yyg->yy_n_chars, num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1277,7 +1278,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1301,7 +1302,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) case EOB_ACT_END_OF_FILE: { if ( tri_v8_wrap(yyscanner ) ) - return EOF; + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1561,7 +1562,7 @@ void tri_v8_pop_buffer_state (yyscan_t yyscanner) */ static void tri_v8_ensure_buffer_stack (yyscan_t yyscanner) { - int num_to_alloc; + yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -1659,12 +1660,11 @@ YY_BUFFER_STATE tri_v8__scan_string (yyconst char * yystr , yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE tri_v8__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - int i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -1774,7 +1774,7 @@ FILE *tri_v8_get_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -int tri_v8_get_leng (yyscan_t yyscanner) +yy_size_t tri_v8_get_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng;