diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 4a783a6819..a60aa1790e 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -1,6 +1,6 @@ name: NetCDF-C CMake CI - Windows -on: [ pull_request, workflow_dispatch] +on: [push, pull_request, workflow_dispatch] env: REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }} diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml index 11f4bc734a..cfe8077423 100644 --- a/.github/workflows/run_tests_osx.yml +++ b/.github/workflows/run_tests_osx.yml @@ -6,7 +6,7 @@ name: Run macOS-based netCDF Tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml index 3ec6a595cd..6ec2b104be 100644 --- a/.github/workflows/run_tests_ubuntu.yml +++ b/.github/workflows/run_tests_ubuntu.yml @@ -4,7 +4,7 @@ name: Run Ubuntu/Linux netCDF Tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] env: REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }} diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index 463177097b..3e6fda20ff 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.github/workflows/run_tests_win_cygwin.yml @@ -1,6 +1,6 @@ name: Run Cygwin-based tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml index 032a31a894..fe88c64648 100644 --- a/.github/workflows/run_tests_win_mingw.yml +++ b/.github/workflows/run_tests_win_mingw.yml @@ -10,7 +10,7 @@ env: CPPFLAGS: "-D_BSD_SOURCE" REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }} -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/oc2/dap.y b/oc2/dap.y index 0305015429..11bb9db353 100644 --- a/oc2/dap.y +++ b/oc2/dap.y @@ -245,29 +245,29 @@ errorprog : /*empty*/ {$$=null;} | SCAN_PROG '=' WORD_WORD ';' {$$=$3;} */ name: WORD_WORD {$$=dapdecode(parsestate->lexstate,$1);} - | SCAN_ALIAS {$$=strdup($1);} - | SCAN_ARRAY {$$=strdup($1);} - | SCAN_ATTR {$$=strdup($1);} - | SCAN_BYTE {$$=strdup($1);} - | SCAN_DATASET {$$=strdup($1);} - | SCAN_DATA {$$=strdup($1);} - | SCAN_ERROR {$$=strdup($1);} - | SCAN_FLOAT32 {$$=strdup($1);} - | SCAN_FLOAT64 {$$=strdup($1);} - | SCAN_GRID {$$=strdup($1);} - | SCAN_INT16 {$$=strdup($1);} - | SCAN_INT32 {$$=strdup($1);} - | SCAN_MAPS {$$=strdup($1);} - | SCAN_SEQUENCE {$$=strdup($1);} - | SCAN_STRING {$$=strdup($1);} - | SCAN_STRUCTURE {$$=strdup($1);} - | SCAN_UINT16 {$$=strdup($1);} - | SCAN_UINT32 {$$=strdup($1);} - | SCAN_URL {$$=strdup($1);} - | SCAN_CODE {$$=strdup($1);} - | SCAN_MESSAGE {$$=strdup($1);} - | SCAN_PROG {$$=strdup($1);} - | SCAN_PTYPE {$$=strdup($1);} + | SCAN_ALIAS {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_ARRAY {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_ATTR {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_BYTE {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_DATASET {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_DATA {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_ERROR {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_FLOAT32 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_FLOAT64 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_GRID {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_INT16 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_INT32 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_MAPS {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_SEQUENCE {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_STRING {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_STRUCTURE {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_UINT16 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_UINT32 {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_URL {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_CODE {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_MESSAGE {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_PROG {$$=dapdecode(parsestate->lexstate,$1);} + | SCAN_PTYPE {$$=dapdecode(parsestate->lexstate,$1);} ; %% diff --git a/oc2/dapy.c b/oc2/dapy.c index 0569194036..ec27df86fa 100644 --- a/oc2/dapy.c +++ b/oc2/dapy.c @@ -2048,139 +2048,139 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); case 84: /* name: SCAN_ALIAS */ #line 248 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2053 "dapy.c" break; case 85: /* name: SCAN_ARRAY */ #line 249 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2059 "dapy.c" break; case 86: /* name: SCAN_ATTR */ #line 250 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2065 "dapy.c" break; case 87: /* name: SCAN_BYTE */ #line 251 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2071 "dapy.c" break; case 88: /* name: SCAN_DATASET */ #line 252 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2077 "dapy.c" break; case 89: /* name: SCAN_DATA */ #line 253 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2083 "dapy.c" break; case 90: /* name: SCAN_ERROR */ #line 254 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2089 "dapy.c" break; case 91: /* name: SCAN_FLOAT32 */ #line 255 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2095 "dapy.c" break; case 92: /* name: SCAN_FLOAT64 */ #line 256 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2101 "dapy.c" break; case 93: /* name: SCAN_GRID */ #line 257 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2107 "dapy.c" break; case 94: /* name: SCAN_INT16 */ #line 258 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2113 "dapy.c" break; case 95: /* name: SCAN_INT32 */ #line 259 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2119 "dapy.c" break; case 96: /* name: SCAN_MAPS */ #line 260 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2125 "dapy.c" break; case 97: /* name: SCAN_SEQUENCE */ #line 261 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2131 "dapy.c" break; case 98: /* name: SCAN_STRING */ #line 262 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2137 "dapy.c" break; case 99: /* name: SCAN_STRUCTURE */ #line 263 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2143 "dapy.c" break; case 100: /* name: SCAN_UINT16 */ #line 264 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2149 "dapy.c" break; case 101: /* name: SCAN_UINT32 */ #line 265 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2155 "dapy.c" break; case 102: /* name: SCAN_URL */ #line 266 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2161 "dapy.c" break; case 103: /* name: SCAN_CODE */ #line 267 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2167 "dapy.c" break; case 104: /* name: SCAN_MESSAGE */ #line 268 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2173 "dapy.c" break; case 105: /* name: SCAN_PROG */ #line 269 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2179 "dapy.c" break; case 106: /* name: SCAN_PTYPE */ #line 270 "dap.y" - {yyval=strdup(yyvsp[0]);} + {yyval=dapdecode(parsestate->lexstate,yyvsp[0]);} #line 2185 "dapy.c" break; diff --git a/oc2/ocinternal.c b/oc2/ocinternal.c index 681a010105..99d9607b83 100644 --- a/oc2/ocinternal.c +++ b/oc2/ocinternal.c @@ -86,6 +86,9 @@ ocinternalinitialize(void) /* Compute some xdr related flags */ xxdr_init(); + if(getenv("OCDEBUG") != NULL) + ocdebug = atoi(getenv("OCDEBUG")); + return OCTHROW(stat); }