- 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
@@ -1205,11 +1068,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
break;
}
yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
+ {
+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
}
}
}
@@ -1229,10 +1094,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
# undef YYCASE_
}
- yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
+ {
+ YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
if (*yymsg_alloc < yysize)
{
@@ -1269,83 +1136,39 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, DAPparsestate* parsestate)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep, parsestate)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
- DAPparsestate* parsestate;
-#endif
{
YYUSE (yyvaluep);
YYUSE (parsestate);
-
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
-
- default:
- break;
- }
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (DAPparsestate* parsestate);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
/*----------.
| yyparse. |
`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
int
yyparse (DAPparsestate* parsestate)
-#else
-int
-yyparse (parsestate)
- DAPparsestate* parsestate;
-#endif
-#endif
{
/* The lookahead symbol. */
int yychar;
+
/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
+/* Default value used for initialization, for pacifying older GCCs
+ or non-GCC compilers. */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
/* Number of syntax errors so far. */
int yynerrs;
@@ -1355,10 +1178,10 @@ YYSTYPE yylval;
int yyerrstatus;
/* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
- Refer to the stacks thru separate pointers, to allow yyoverflow
+ Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
@@ -1376,7 +1199,7 @@ YYSTYPE yylval;
int yyn;
int yyresult;
/* Lookahead token as an internal (translated) token number. */
- int yytoken;
+ int yytoken = 0;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
@@ -1394,9 +1217,8 @@ YYSTYPE yylval;
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
+ yyssp = yyss = yyssa;
+ yyvsp = yyvs = yyvsa;
yystacksize = YYINITDEPTH;
YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1405,14 +1227,6 @@ YYSTYPE yylval;
yyerrstatus = 0;
yynerrs = 0;
yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
- yyssp = yyss;
- yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1433,23 +1247,23 @@ YYSTYPE yylval;
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
- yyss = yyss1;
- yyvs = yyvs1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1457,22 +1271,22 @@ YYSTYPE yylval;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1481,10 +1295,10 @@ YYSTYPE yylval;
yyvsp = yyvs + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1513,7 +1327,7 @@ yybackup:
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
+ yychar = yylex (&yylval, parsestate);
}
if (yychar <= YYEOF)
@@ -1553,7 +1367,9 @@ yybackup:
yychar = YYEMPTY;
yystate = yyn;
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
goto yynewstate;
@@ -1576,7 +1392,7 @@ yyreduce:
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -1590,716 +1406,613 @@ yyreduce:
switch (yyn)
{
case 6:
-
-/* Line 1806 of yacc.c */
-#line 58 "dap.y"
+#line 58 "dap.y" /* yacc.c:1646 */
{dap_unrecognizedresponse(parsestate); YYABORT;}
+#line 1412 "dap.tab.c" /* yacc.c:1646 */
break;
case 7:
-
-/* Line 1806 of yacc.c */
-#line 63 "dap.y"
+#line 63 "dap.y" /* yacc.c:1646 */
{dap_tagparse(parsestate,SCAN_DATASET);}
+#line 1418 "dap.tab.c" /* yacc.c:1646 */
break;
case 8:
-
-/* Line 1806 of yacc.c */
-#line 67 "dap.y"
+#line 67 "dap.y" /* yacc.c:1646 */
{dap_tagparse(parsestate,SCAN_ATTR);}
+#line 1424 "dap.tab.c" /* yacc.c:1646 */
break;
case 9:
-
-/* Line 1806 of yacc.c */
-#line 71 "dap.y"
+#line 71 "dap.y" /* yacc.c:1646 */
{dap_tagparse(parsestate,SCAN_ERROR);}
+#line 1430 "dap.tab.c" /* yacc.c:1646 */
break;
case 10:
-
-/* Line 1806 of yacc.c */
-#line 76 "dap.y"
- {dap_datasetbody(parsestate,(yyvsp[(4) - (5)]),(yyvsp[(2) - (5)]));}
+#line 76 "dap.y" /* yacc.c:1646 */
+ {dap_datasetbody(parsestate,(yyvsp[-1]),(yyvsp[-3]));}
+#line 1436 "dap.tab.c" /* yacc.c:1646 */
break;
case 11:
-
-/* Line 1806 of yacc.c */
-#line 81 "dap.y"
+#line 81 "dap.y" /* yacc.c:1646 */
{(yyval)=dap_declarations(parsestate,null,null);}
+#line 1442 "dap.tab.c" /* yacc.c:1646 */
break;
case 12:
-
-/* Line 1806 of yacc.c */
-#line 82 "dap.y"
- {(yyval)=dap_declarations(parsestate,(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));}
+#line 82 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_declarations(parsestate,(yyvsp[-1]),(yyvsp[0]));}
+#line 1448 "dap.tab.c" /* yacc.c:1646 */
break;
case 13:
-
-/* Line 1806 of yacc.c */
-#line 89 "dap.y"
- {(yyval)=dap_makebase(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]));}
+#line 89 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_makebase(parsestate,(yyvsp[-2]),(yyvsp[-3]),(yyvsp[-1]));}
+#line 1454 "dap.tab.c" /* yacc.c:1646 */
break;
case 14:
-
-/* Line 1806 of yacc.c */
-#line 91 "dap.y"
- {if(((yyval)=dap_makestructure(parsestate,(yyvsp[(5) - (7)]),(yyvsp[(6) - (7)]),(yyvsp[(3) - (7)])))==null) {YYABORT;}}
+#line 91 "dap.y" /* yacc.c:1646 */
+ {if(((yyval)=dap_makestructure(parsestate,(yyvsp[-2]),(yyvsp[-1]),(yyvsp[-4])))==null) {YYABORT;}}
+#line 1460 "dap.tab.c" /* yacc.c:1646 */
break;
case 15:
-
-/* Line 1806 of yacc.c */
-#line 93 "dap.y"
- {if(((yyval)=dap_makesequence(parsestate,(yyvsp[(5) - (6)]),(yyvsp[(3) - (6)])))==null) {YYABORT;}}
+#line 93 "dap.y" /* yacc.c:1646 */
+ {if(((yyval)=dap_makesequence(parsestate,(yyvsp[-1]),(yyvsp[-3])))==null) {YYABORT;}}
+#line 1466 "dap.tab.c" /* yacc.c:1646 */
break;
case 16:
-
-/* Line 1806 of yacc.c */
-#line 96 "dap.y"
- {if(((yyval)=dap_makegrid(parsestate,(yyvsp[(10) - (11)]),(yyvsp[(5) - (11)]),(yyvsp[(8) - (11)])))==null) {YYABORT;}}
+#line 96 "dap.y" /* yacc.c:1646 */
+ {if(((yyval)=dap_makegrid(parsestate,(yyvsp[-1]),(yyvsp[-6]),(yyvsp[-3])))==null) {YYABORT;}}
+#line 1472 "dap.tab.c" /* yacc.c:1646 */
break;
case 17:
-
-/* Line 1806 of yacc.c */
-#line 98 "dap.y"
+#line 98 "dap.y" /* yacc.c:1646 */
{dapsemanticerror(parsestate,OC_EBADTYPE,"Unrecognized type"); YYABORT;}
+#line 1478 "dap.tab.c" /* yacc.c:1646 */
break;
case 18:
-
-/* Line 1806 of yacc.c */
-#line 103 "dap.y"
+#line 103 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_BYTE;}
+#line 1484 "dap.tab.c" /* yacc.c:1646 */
break;
case 19:
-
-/* Line 1806 of yacc.c */
-#line 104 "dap.y"
+#line 104 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_INT16;}
+#line 1490 "dap.tab.c" /* yacc.c:1646 */
break;
case 20:
-
-/* Line 1806 of yacc.c */
-#line 105 "dap.y"
+#line 105 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_UINT16;}
+#line 1496 "dap.tab.c" /* yacc.c:1646 */
break;
case 21:
-
-/* Line 1806 of yacc.c */
-#line 106 "dap.y"
+#line 106 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_INT32;}
+#line 1502 "dap.tab.c" /* yacc.c:1646 */
break;
case 22:
-
-/* Line 1806 of yacc.c */
-#line 107 "dap.y"
+#line 107 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_UINT32;}
+#line 1508 "dap.tab.c" /* yacc.c:1646 */
break;
case 23:
-
-/* Line 1806 of yacc.c */
-#line 108 "dap.y"
+#line 108 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_FLOAT32;}
+#line 1514 "dap.tab.c" /* yacc.c:1646 */
break;
case 24:
-
-/* Line 1806 of yacc.c */
-#line 109 "dap.y"
+#line 109 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_FLOAT64;}
+#line 1520 "dap.tab.c" /* yacc.c:1646 */
break;
case 25:
-
-/* Line 1806 of yacc.c */
-#line 110 "dap.y"
+#line 110 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_URL;}
+#line 1526 "dap.tab.c" /* yacc.c:1646 */
break;
case 26:
-
-/* Line 1806 of yacc.c */
-#line 111 "dap.y"
+#line 111 "dap.y" /* yacc.c:1646 */
{(yyval)=(Object)SCAN_STRING;}
+#line 1532 "dap.tab.c" /* yacc.c:1646 */
break;
case 27:
-
-/* Line 1806 of yacc.c */
-#line 115 "dap.y"
+#line 115 "dap.y" /* yacc.c:1646 */
{(yyval)=dap_arraydecls(parsestate,null,null);}
+#line 1538 "dap.tab.c" /* yacc.c:1646 */
break;
case 28:
-
-/* Line 1806 of yacc.c */
-#line 116 "dap.y"
- {(yyval)=dap_arraydecls(parsestate,(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));}
+#line 116 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_arraydecls(parsestate,(yyvsp[-1]),(yyvsp[0]));}
+#line 1544 "dap.tab.c" /* yacc.c:1646 */
break;
case 29:
-
-/* Line 1806 of yacc.c */
-#line 120 "dap.y"
- {(yyval)=dap_arraydecl(parsestate,null,(yyvsp[(2) - (3)]));}
+#line 120 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_arraydecl(parsestate,null,(yyvsp[-1]));}
+#line 1550 "dap.tab.c" /* yacc.c:1646 */
break;
case 30:
-
-/* Line 1806 of yacc.c */
-#line 121 "dap.y"
- {(yyval)=dap_arraydecl(parsestate,null,(yyvsp[(3) - (4)]));}
+#line 121 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_arraydecl(parsestate,null,(yyvsp[-1]));}
+#line 1556 "dap.tab.c" /* yacc.c:1646 */
break;
case 31:
-
-/* Line 1806 of yacc.c */
-#line 122 "dap.y"
- {(yyval)=dap_arraydecl(parsestate,(yyvsp[(2) - (5)]),(yyvsp[(4) - (5)]));}
+#line 122 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_arraydecl(parsestate,(yyvsp[-3]),(yyvsp[-1]));}
+#line 1562 "dap.tab.c" /* yacc.c:1646 */
break;
case 32:
-
-/* Line 1806 of yacc.c */
-#line 124 "dap.y"
+#line 124 "dap.y" /* yacc.c:1646 */
{dapsemanticerror(parsestate,OC_EDIMSIZE,"Illegal dimension declaration"); YYABORT;}
+#line 1568 "dap.tab.c" /* yacc.c:1646 */
break;
case 33:
-
-/* Line 1806 of yacc.c */
-#line 128 "dap.y"
- {(yyval)=(yyvsp[(1) - (1)]);}
+#line 128 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[0]);}
+#line 1574 "dap.tab.c" /* yacc.c:1646 */
break;
case 34:
-
-/* Line 1806 of yacc.c */
-#line 130 "dap.y"
+#line 130 "dap.y" /* yacc.c:1646 */
{dapsemanticerror(parsestate,OC_EDDS,"Illegal dataset declaration"); YYABORT;}
+#line 1580 "dap.tab.c" /* yacc.c:1646 */
break;
case 35:
-
-/* Line 1806 of yacc.c */
-#line 133 "dap.y"
- {(yyval)=(yyvsp[(1) - (1)]);}
+#line 133 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[0]);}
+#line 1586 "dap.tab.c" /* yacc.c:1646 */
break;
case 36:
-
-/* Line 1806 of yacc.c */
-#line 136 "dap.y"
- {dap_attributebody(parsestate,(yyvsp[(2) - (3)]));}
+#line 136 "dap.y" /* yacc.c:1646 */
+ {dap_attributebody(parsestate,(yyvsp[-1]));}
+#line 1592 "dap.tab.c" /* yacc.c:1646 */
break;
case 37:
-
-/* Line 1806 of yacc.c */
-#line 138 "dap.y"
+#line 138 "dap.y" /* yacc.c:1646 */
{dapsemanticerror(parsestate,OC_EDAS,"Illegal DAS body"); YYABORT;}
+#line 1598 "dap.tab.c" /* yacc.c:1646 */
break;
case 38:
-
-/* Line 1806 of yacc.c */
-#line 142 "dap.y"
+#line 142 "dap.y" /* yacc.c:1646 */
{(yyval)=dap_attrlist(parsestate,null,null);}
+#line 1604 "dap.tab.c" /* yacc.c:1646 */
break;
case 39:
-
-/* Line 1806 of yacc.c */
-#line 143 "dap.y"
- {(yyval)=dap_attrlist(parsestate,(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));}
+#line 143 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrlist(parsestate,(yyvsp[-1]),(yyvsp[0]));}
+#line 1610 "dap.tab.c" /* yacc.c:1646 */
break;
case 40:
-
-/* Line 1806 of yacc.c */
-#line 147 "dap.y"
+#line 147 "dap.y" /* yacc.c:1646 */
{(yyval)=null;}
+#line 1616 "dap.tab.c" /* yacc.c:1646 */
break;
case 41:
-
-/* Line 1806 of yacc.c */
-#line 149 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_BYTE);}
+#line 149 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_BYTE);}
+#line 1622 "dap.tab.c" /* yacc.c:1646 */
break;
case 42:
-
-/* Line 1806 of yacc.c */
-#line 151 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_INT16);}
+#line 151 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_INT16);}
+#line 1628 "dap.tab.c" /* yacc.c:1646 */
break;
case 43:
-
-/* Line 1806 of yacc.c */
-#line 153 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_UINT16);}
+#line 153 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_UINT16);}
+#line 1634 "dap.tab.c" /* yacc.c:1646 */
break;
case 44:
-
-/* Line 1806 of yacc.c */
-#line 155 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_INT32);}
+#line 155 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_INT32);}
+#line 1640 "dap.tab.c" /* yacc.c:1646 */
break;
case 45:
-
-/* Line 1806 of yacc.c */
-#line 157 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_UINT32);}
+#line 157 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_UINT32);}
+#line 1646 "dap.tab.c" /* yacc.c:1646 */
break;
case 46:
-
-/* Line 1806 of yacc.c */
-#line 159 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_FLOAT32);}
+#line 159 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_FLOAT32);}
+#line 1652 "dap.tab.c" /* yacc.c:1646 */
break;
case 47:
-
-/* Line 1806 of yacc.c */
-#line 161 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_FLOAT64);}
+#line 161 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_FLOAT64);}
+#line 1658 "dap.tab.c" /* yacc.c:1646 */
break;
case 48:
-
-/* Line 1806 of yacc.c */
-#line 163 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_STRING);}
+#line 163 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_STRING);}
+#line 1664 "dap.tab.c" /* yacc.c:1646 */
break;
case 49:
-
-/* Line 1806 of yacc.c */
-#line 165 "dap.y"
- {(yyval)=dap_attribute(parsestate,(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(Object)SCAN_URL);}
+#line 165 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attribute(parsestate,(yyvsp[-2]),(yyvsp[-1]),(Object)SCAN_URL);}
+#line 1670 "dap.tab.c" /* yacc.c:1646 */
break;
case 50:
-
-/* Line 1806 of yacc.c */
-#line 166 "dap.y"
- {(yyval)=dap_attrset(parsestate,(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]));}
+#line 166 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrset(parsestate,(yyvsp[-3]),(yyvsp[-1]));}
+#line 1676 "dap.tab.c" /* yacc.c:1646 */
break;
case 51:
-
-/* Line 1806 of yacc.c */
-#line 168 "dap.y"
+#line 168 "dap.y" /* yacc.c:1646 */
{dapsemanticerror(parsestate,OC_EDAS,"Illegal attribute"); YYABORT;}
+#line 1682 "dap.tab.c" /* yacc.c:1646 */
break;
case 52:
-
-/* Line 1806 of yacc.c */
-#line 172 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_BYTE);}
+#line 172 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_BYTE);}
+#line 1688 "dap.tab.c" /* yacc.c:1646 */
break;
case 53:
-
-/* Line 1806 of yacc.c */
-#line 174 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_BYTE);}
+#line 174 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_BYTE);}
+#line 1694 "dap.tab.c" /* yacc.c:1646 */
break;
case 54:
-
-/* Line 1806 of yacc.c */
-#line 177 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_INT16);}
+#line 177 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_INT16);}
+#line 1700 "dap.tab.c" /* yacc.c:1646 */
break;
case 55:
-
-/* Line 1806 of yacc.c */
-#line 179 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_INT16);}
+#line 179 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_INT16);}
+#line 1706 "dap.tab.c" /* yacc.c:1646 */
break;
case 56:
-
-/* Line 1806 of yacc.c */
-#line 182 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_UINT16);}
+#line 182 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_UINT16);}
+#line 1712 "dap.tab.c" /* yacc.c:1646 */
break;
case 57:
-
-/* Line 1806 of yacc.c */
-#line 184 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_UINT16);}
+#line 184 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_UINT16);}
+#line 1718 "dap.tab.c" /* yacc.c:1646 */
break;
case 58:
-
-/* Line 1806 of yacc.c */
-#line 187 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_INT32);}
+#line 187 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_INT32);}
+#line 1724 "dap.tab.c" /* yacc.c:1646 */
break;
case 59:
-
-/* Line 1806 of yacc.c */
-#line 189 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_INT32);}
+#line 189 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_INT32);}
+#line 1730 "dap.tab.c" /* yacc.c:1646 */
break;
case 60:
-
-/* Line 1806 of yacc.c */
-#line 192 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_UINT32);}
+#line 192 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_UINT32);}
+#line 1736 "dap.tab.c" /* yacc.c:1646 */
break;
case 61:
-
-/* Line 1806 of yacc.c */
-#line 193 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_UINT32);}
+#line 193 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_UINT32);}
+#line 1742 "dap.tab.c" /* yacc.c:1646 */
break;
case 62:
-
-/* Line 1806 of yacc.c */
-#line 196 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_FLOAT32);}
+#line 196 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_FLOAT32);}
+#line 1748 "dap.tab.c" /* yacc.c:1646 */
break;
case 63:
-
-/* Line 1806 of yacc.c */
-#line 197 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_FLOAT32);}
+#line 197 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_FLOAT32);}
+#line 1754 "dap.tab.c" /* yacc.c:1646 */
break;
case 64:
-
-/* Line 1806 of yacc.c */
-#line 200 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_FLOAT64);}
+#line 200 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_FLOAT64);}
+#line 1760 "dap.tab.c" /* yacc.c:1646 */
break;
case 65:
-
-/* Line 1806 of yacc.c */
-#line 201 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_FLOAT64);}
+#line 201 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_FLOAT64);}
+#line 1766 "dap.tab.c" /* yacc.c:1646 */
break;
case 66:
-
-/* Line 1806 of yacc.c */
-#line 204 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_STRING);}
+#line 204 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_STRING);}
+#line 1772 "dap.tab.c" /* yacc.c:1646 */
break;
case 67:
-
-/* Line 1806 of yacc.c */
-#line 205 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_STRING);}
+#line 205 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_STRING);}
+#line 1778 "dap.tab.c" /* yacc.c:1646 */
break;
case 68:
-
-/* Line 1806 of yacc.c */
-#line 209 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[(1) - (1)]),(Object)SCAN_URL);}
+#line 209 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,null,(yyvsp[0]),(Object)SCAN_URL);}
+#line 1784 "dap.tab.c" /* yacc.c:1646 */
break;
case 69:
-
-/* Line 1806 of yacc.c */
-#line 210 "dap.y"
- {(yyval)=dap_attrvalue(parsestate,(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),(Object)SCAN_URL);}
+#line 210 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dap_attrvalue(parsestate,(yyvsp[-2]),(yyvsp[0]),(Object)SCAN_URL);}
+#line 1790 "dap.tab.c" /* yacc.c:1646 */
break;
case 70:
-
-/* Line 1806 of yacc.c */
-#line 214 "dap.y"
- {(yyval)=(yyvsp[(1) - (1)]);}
+#line 214 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[0]);}
+#line 1796 "dap.tab.c" /* yacc.c:1646 */
break;
case 71:
-
-/* Line 1806 of yacc.c */
-#line 218 "dap.y"
- {(yyval)=(yyvsp[(1) - (1)]);}
+#line 218 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[0]);}
+#line 1802 "dap.tab.c" /* yacc.c:1646 */
break;
case 72:
-
-/* Line 1806 of yacc.c */
-#line 219 "dap.y"
- {(yyval)=(yyvsp[(1) - (1)]);}
+#line 219 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[0]);}
+#line 1808 "dap.tab.c" /* yacc.c:1646 */
break;
case 73:
-
-/* Line 1806 of yacc.c */
-#line 230 "dap.y"
- {(yyval)=(yyvsp[(2) - (3)]); (yyval)=(yyvsp[(3) - (3)]); (yyval)=null;}
+#line 230 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[-1]); (yyval)=(yyvsp[0]); (yyval)=null;}
+#line 1814 "dap.tab.c" /* yacc.c:1646 */
break;
case 74:
-
-/* Line 1806 of yacc.c */
-#line 235 "dap.y"
- {dap_errorbody(parsestate,(yyvsp[(2) - (7)]),(yyvsp[(3) - (7)]),(yyvsp[(4) - (7)]),(yyvsp[(5) - (7)]));}
+#line 235 "dap.y" /* yacc.c:1646 */
+ {dap_errorbody(parsestate,(yyvsp[-5]),(yyvsp[-4]),(yyvsp[-3]),(yyvsp[-2]));}
+#line 1820 "dap.tab.c" /* yacc.c:1646 */
break;
case 75:
-
-/* Line 1806 of yacc.c */
-#line 238 "dap.y"
+#line 238 "dap.y" /* yacc.c:1646 */
{(yyval)=null;}
+#line 1826 "dap.tab.c" /* yacc.c:1646 */
break;
case 76:
-
-/* Line 1806 of yacc.c */
-#line 238 "dap.y"
- {(yyval)=(yyvsp[(3) - (4)]);}
+#line 238 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[-1]);}
+#line 1832 "dap.tab.c" /* yacc.c:1646 */
break;
case 77:
-
-/* Line 1806 of yacc.c */
-#line 239 "dap.y"
+#line 239 "dap.y" /* yacc.c:1646 */
{(yyval)=null;}
+#line 1838 "dap.tab.c" /* yacc.c:1646 */
break;
case 78:
-
-/* Line 1806 of yacc.c */
-#line 239 "dap.y"
- {(yyval)=(yyvsp[(3) - (4)]);}
+#line 239 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[-1]);}
+#line 1844 "dap.tab.c" /* yacc.c:1646 */
break;
case 79:
-
-/* Line 1806 of yacc.c */
-#line 240 "dap.y"
+#line 240 "dap.y" /* yacc.c:1646 */
{(yyval)=null;}
+#line 1850 "dap.tab.c" /* yacc.c:1646 */
break;
case 80:
-
-/* Line 1806 of yacc.c */
-#line 240 "dap.y"
- {(yyval)=(yyvsp[(3) - (4)]);}
+#line 240 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[-1]);}
+#line 1856 "dap.tab.c" /* yacc.c:1646 */
break;
case 81:
-
-/* Line 1806 of yacc.c */
-#line 241 "dap.y"
+#line 241 "dap.y" /* yacc.c:1646 */
{(yyval)=null;}
+#line 1862 "dap.tab.c" /* yacc.c:1646 */
break;
case 82:
-
-/* Line 1806 of yacc.c */
-#line 241 "dap.y"
- {(yyval)=(yyvsp[(3) - (4)]);}
+#line 241 "dap.y" /* yacc.c:1646 */
+ {(yyval)=(yyvsp[-1]);}
+#line 1868 "dap.tab.c" /* yacc.c:1646 */
break;
case 83:
-
-/* Line 1806 of yacc.c */
-#line 247 "dap.y"
- {(yyval)=dapdecode(parsestate->lexstate,(yyvsp[(1) - (1)]));}
+#line 247 "dap.y" /* yacc.c:1646 */
+ {(yyval)=dapdecode(parsestate->lexstate,(yyvsp[0]));}
+#line 1874 "dap.tab.c" /* yacc.c:1646 */
break;
case 84:
-
-/* Line 1806 of yacc.c */
-#line 248 "dap.y"
+#line 248 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("alias");}
+#line 1880 "dap.tab.c" /* yacc.c:1646 */
break;
case 85:
-
-/* Line 1806 of yacc.c */
-#line 249 "dap.y"
+#line 249 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("array");}
+#line 1886 "dap.tab.c" /* yacc.c:1646 */
break;
case 86:
-
-/* Line 1806 of yacc.c */
-#line 250 "dap.y"
+#line 250 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("attributes");}
+#line 1892 "dap.tab.c" /* yacc.c:1646 */
break;
case 87:
-
-/* Line 1806 of yacc.c */
-#line 251 "dap.y"
+#line 251 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("byte");}
+#line 1898 "dap.tab.c" /* yacc.c:1646 */
break;
case 88:
-
-/* Line 1806 of yacc.c */
-#line 252 "dap.y"
+#line 252 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("dataset");}
+#line 1904 "dap.tab.c" /* yacc.c:1646 */
break;
case 89:
-
-/* Line 1806 of yacc.c */
-#line 253 "dap.y"
+#line 253 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("data");}
+#line 1910 "dap.tab.c" /* yacc.c:1646 */
break;
case 90:
-
-/* Line 1806 of yacc.c */
-#line 254 "dap.y"
+#line 254 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("error");}
+#line 1916 "dap.tab.c" /* yacc.c:1646 */
break;
case 91:
-
-/* Line 1806 of yacc.c */
-#line 255 "dap.y"
+#line 255 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("float32");}
+#line 1922 "dap.tab.c" /* yacc.c:1646 */
break;
case 92:
-
-/* Line 1806 of yacc.c */
-#line 256 "dap.y"
+#line 256 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("float64");}
+#line 1928 "dap.tab.c" /* yacc.c:1646 */
break;
case 93:
-
-/* Line 1806 of yacc.c */
-#line 257 "dap.y"
+#line 257 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("grid");}
+#line 1934 "dap.tab.c" /* yacc.c:1646 */
break;
case 94:
-
-/* Line 1806 of yacc.c */
-#line 258 "dap.y"
+#line 258 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("int16");}
+#line 1940 "dap.tab.c" /* yacc.c:1646 */
break;
case 95:
-
-/* Line 1806 of yacc.c */
-#line 259 "dap.y"
+#line 259 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("int32");}
+#line 1946 "dap.tab.c" /* yacc.c:1646 */
break;
case 96:
-
-/* Line 1806 of yacc.c */
-#line 260 "dap.y"
+#line 260 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("maps");}
+#line 1952 "dap.tab.c" /* yacc.c:1646 */
break;
case 97:
-
-/* Line 1806 of yacc.c */
-#line 261 "dap.y"
+#line 261 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("sequence");}
+#line 1958 "dap.tab.c" /* yacc.c:1646 */
break;
case 98:
-
-/* Line 1806 of yacc.c */
-#line 262 "dap.y"
+#line 262 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("string");}
+#line 1964 "dap.tab.c" /* yacc.c:1646 */
break;
case 99:
-
-/* Line 1806 of yacc.c */
-#line 263 "dap.y"
+#line 263 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("structure");}
+#line 1970 "dap.tab.c" /* yacc.c:1646 */
break;
case 100:
-
-/* Line 1806 of yacc.c */
-#line 264 "dap.y"
+#line 264 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("uint16");}
+#line 1976 "dap.tab.c" /* yacc.c:1646 */
break;
case 101:
-
-/* Line 1806 of yacc.c */
-#line 265 "dap.y"
+#line 265 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("uint32");}
+#line 1982 "dap.tab.c" /* yacc.c:1646 */
break;
case 102:
-
-/* Line 1806 of yacc.c */
-#line 266 "dap.y"
+#line 266 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("url");}
+#line 1988 "dap.tab.c" /* yacc.c:1646 */
break;
case 103:
-
-/* Line 1806 of yacc.c */
-#line 267 "dap.y"
+#line 267 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("code");}
+#line 1994 "dap.tab.c" /* yacc.c:1646 */
break;
case 104:
-
-/* Line 1806 of yacc.c */
-#line 268 "dap.y"
+#line 268 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("message");}
+#line 2000 "dap.tab.c" /* yacc.c:1646 */
break;
case 105:
-
-/* Line 1806 of yacc.c */
-#line 269 "dap.y"
+#line 269 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("program");}
+#line 2006 "dap.tab.c" /* yacc.c:1646 */
break;
case 106:
-
-/* Line 1806 of yacc.c */
-#line 270 "dap.y"
+#line 270 "dap.y" /* yacc.c:1646 */
{(yyval)=strdup("program_type");}
+#line 2012 "dap.tab.c" /* yacc.c:1646 */
break;
-
-/* Line 1806 of yacc.c */
-#line 2303 "dap.tab.c"
+#line 2016 "dap.tab.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -2321,7 +2034,7 @@ yyreduce:
*++yyvsp = yyval;
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -2336,9 +2049,9 @@ yyreduce:
goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error. |
+`--------------------------------------*/
yyerrlab:
/* Make sure we have latest lookahead translation. See comments at
user semantic actions for why this is necessary. */
@@ -2389,20 +2102,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval, parsestate);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval, parsestate);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse lookahead token after shifting the error
@@ -2421,7 +2134,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
yylen = 0;
@@ -2434,35 +2147,37 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp, parsestate);
+ yystos[yystate], yyvsp, parsestate);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
}
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
/* Shift the error token. */
@@ -2486,7 +2201,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2505,14 +2220,14 @@ yyreturn:
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, parsestate);
}
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp, parsestate);
+ yystos[*yyssp], yyvsp, parsestate);
YYPOPSTACK (1);
}
#ifndef yyoverflow
@@ -2523,13 +2238,7 @@ yyreturn:
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
+ return yyresult;
}
-
-
-
-/* Line 2067 of yacc.c */
-#line 273 "dap.y"
-
+#line 273 "dap.y" /* yacc.c:1906 */
diff --git a/oc2/daptab.h b/oc2/daptab.h
index e085df562..97d65186d 100644
--- a/oc2/daptab.h
+++ b/oc2/daptab.h
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.5. */
+/* A Bison parser, made by GNU Bison 3.0.2. */
/* Bison interface for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2013 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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
@@ -26,54 +26,62 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- SCAN_ALIAS = 258,
- SCAN_ARRAY = 259,
- SCAN_ATTR = 260,
- SCAN_BYTE = 261,
- SCAN_CODE = 262,
- SCAN_DATASET = 263,
- SCAN_DATA = 264,
- SCAN_ERROR = 265,
- SCAN_FLOAT32 = 266,
- SCAN_FLOAT64 = 267,
- SCAN_GRID = 268,
- SCAN_INT16 = 269,
- SCAN_INT32 = 270,
- SCAN_MAPS = 271,
- SCAN_MESSAGE = 272,
- SCAN_SEQUENCE = 273,
- SCAN_STRING = 274,
- SCAN_STRUCTURE = 275,
- SCAN_UINT16 = 276,
- SCAN_UINT32 = 277,
- SCAN_URL = 278,
- SCAN_PTYPE = 279,
- SCAN_PROG = 280,
- WORD_WORD = 281,
- WORD_STRING = 282
- };
+#ifndef YY_DAP_DAP_TAB_H_INCLUDED
+# define YY_DAP_DAP_TAB_H_INCLUDED
+/* Debug traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int dapdebug;
#endif
+/* Token type. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ enum yytokentype
+ {
+ SCAN_ALIAS = 258,
+ SCAN_ARRAY = 259,
+ SCAN_ATTR = 260,
+ SCAN_BYTE = 261,
+ SCAN_CODE = 262,
+ SCAN_DATASET = 263,
+ SCAN_DATA = 264,
+ SCAN_ERROR = 265,
+ SCAN_FLOAT32 = 266,
+ SCAN_FLOAT64 = 267,
+ SCAN_GRID = 268,
+ SCAN_INT16 = 269,
+ SCAN_INT32 = 270,
+ SCAN_MAPS = 271,
+ SCAN_MESSAGE = 272,
+ SCAN_SEQUENCE = 273,
+ SCAN_STRING = 274,
+ SCAN_STRUCTURE = 275,
+ SCAN_UINT16 = 276,
+ SCAN_UINT32 = 277,
+ SCAN_URL = 278,
+ SCAN_PTYPE = 279,
+ SCAN_PROG = 280,
+ WORD_WORD = 281,
+ WORD_STRING = 282
+ };
+#endif
-
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
+int dapparse (DAPparsestate* parsestate);
+#endif /* !YY_DAP_DAP_TAB_H_INCLUDED */
diff --git a/oc2/ocauth.html b/oc2/ocauth.html
index 224dc831c..d8e253760 100644
--- a/oc2/ocauth.html
+++ b/oc2/ocauth.html
@@ -74,7 +74,7 @@ The oc library supports an rc file mechanism to allow the passing
of a number of parameters to liboc and libcurl.
The file must be called one of the following names:
-".daprc" or ".dodsrc"
+".daprc", ".dodsrc"
If both .daprc and .dodsrc exist, then
the .daprc file will take precedence.
diff --git a/oc2/ocinternal.c b/oc2/ocinternal.c
index 08eedaadc..7d2a67c3f 100644
--- a/oc2/ocinternal.c
+++ b/oc2/ocinternal.c
@@ -7,16 +7,15 @@
#ifdef HAVE_UNISTD_H
#include
#endif
-
-#ifdef _MSC_VER
-typedef int pid_t;
-#endif
-
#ifdef HAVE_FCNTL_H
#include
#endif
#include
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
+
#include "ocinternal.h"
#include "ocdebug.h"
#include "occlientparams.h"
diff --git a/oc2/ocrc.c b/oc2/ocrc.c
index c7e18e5fb..042e8fe0a 100644
--- a/oc2/ocrc.c
+++ b/oc2/ocrc.c
@@ -375,7 +375,7 @@ ocrc_load(void)
if(ocglobalstate.rc.rcfile != NULL) { /* always use this */
path = strdup(ocglobalstate.rc.rcfile);
} else if(getenv(OCRCFILEENV) != NULL && strlen(getenv(OCRCFILEENV)) > 0) {
- path = strdup(getenv(OCRCFILEENV));
+ path = strdup(getenv(OCRCFILEENV));
} else {
char** rcname;
int found = 0;