Merge pull request Unidata#1759 from brianmckenna/CES_FCN

parse projection functions
LProx2020 · Jul 14, 2020 · cee0a93 · cee0a93
2 parents 03eeea5 + c0c56b1
commit cee0a93
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/libdap2/constraints.c b/libdap2/constraints.c
@@ -114,6 +114,7 @@ qualifyprojectionnames(DCEprojection* proj)
     NCerror ncstat = NC_NOERR;
     NClist* fullpath = nclistnew();
 
+    if (proj->discrim == CES_VAR) {
     ASSERT((proj->discrim == CES_VAR
             && proj->var->annotation != NULL
             && ((CDFnode*)proj->var->annotation)->ocnode != NULL));
@@ -129,6 +130,7 @@ fprintf(stderr,"qualify: %s -> ",
 fprintf(stderr,"%s\n",
 	dumpprojection(proj));
 #endif
+    }
     nclistfree(fullpath);
     return ncstat;
 }
@@ -138,6 +140,7 @@ static NCerror
 qualifyprojectionsizes(DCEprojection* proj)
 {
     size_t i,j;
+    if (proj->discrim == CES_VAR) {
     ASSERT(proj->discrim == CES_VAR);
 #ifdef DEBUG
 fprintf(stderr,"qualifyprojectionsizes.before: %s\n",
@@ -168,6 +171,7 @@ fprintf(stderr,"qualifyprojectionsizes.before: %s\n",
 fprintf(stderr,"qualifyprojectionsizes.after: %s\n",
 		dumpprojection(proj));
 #endif
+    }
     return NC_NOERR;
 }
 

diff --git a/libdap2/dce.y b/libdap2/dce.y
@@ -58,7 +58,7 @@ projection:
 	  segmentlist
 	    {$$=projection(parsestate,$1);}
 	| function
-	    {$$=$1;}
+	    {$$=projection(parsestate,$1);}
 	;
 
 function:

diff --git a/libdap2/dcetab.c b/libdap2/dcetab.c
@@ -1305,7 +1305,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
   case 13:
 #line 61 "dce.y" /* yacc.c:1646  */
-    {(yyval)=(yyvsp[0]);}
+    {(yyval)=projection(parsestate,(yyvsp[0]));}
 #line 1310 "dcetab.c" /* yacc.c:1646  */
     break;