Merge pull request #1905 from Unidata/gh1740.wif

Fixing up PR 1740
2024-12-27 08:49:16 +08:00 · 2020-12-07 14:58:33 -07:00 · 2020-12-07 14:58:33 -07:00 · eba281a8d9
commit eba281a8d9
parent b2924966b0 66a2cd371a
4 changed files with 2004 additions and 1766 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -984,7 +984,7 @@ OPTION(ENABLE_NCZARR_S3_TESTS "Enable NCZarr S3 tests." OFF)

 IF(ENABLE_NCZARR_S3_TESTS AND NOT ENABLE_NCZARR_S3)
  message(FATAL_ERROR "NCZarr S3 support is disabled; please specify option -DENABLE_NCZARR_S3_TESTS=no")
-  SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCARR S3 TESTS" FORCE)  
+  SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCARR S3 TESTS" FORCE)
 ENDIF()

 # See if aws-s3-sdk is available
@ -994,7 +994,7 @@ find_package(AWSSDK REQUIRED)
 set(SERVICE s3)
 AWSSDK_DETERMINE_LIBS_TO_LINK(SERVICE AWSSDK_LINK_LIBRARIES)
 IF(AWSSDK_FOUND)
-  SET(ENABLE_S3_SDK ON CACHE BOOL "S3 SDK" FORCE)  
+  SET(ENABLE_S3_SDK ON CACHE BOOL "S3 SDK" FORCE)
 ELSE()
  SET(ENABLE_S3_SDK OFF CACHE BOOL "S3 SDK" FORCE)
 ENDIF()
@ -1580,24 +1580,34 @@ IF(NC_M4)
  SET(HAVE_M4 TRUE)
 ELSE()
  MESSAGE(STATUS "m4 not found.")
+  SET(HAVE_M4 FALSE)
 ENDIF()

-MACRO(GEN_m4 filename dest)
-  set(${dest} "${CMAKE_CURRENT_BINARY_DIR}/${filename}.c")
-  IF(HAVE_M4)
-    ADD_CUSTOM_COMMAND(
-      OUTPUT ${${dest}}
-      COMMAND ${NC_M4}
-      ARGS ${M4FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${${dest}}
-      VERBATIM
-    )
-  ELSE(HAVE_M4)
-    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
-      FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
-           DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-    ELSE()
-        MESSAGE(FATAL_ERROR "File ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c does not exists, and can not be generated")
+MACRO(GEN_m4 filename)
+
+set(dest "${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c")
+
+  # If m4 isn't present, and the generated file doesn't exist,
+  # it cannot be generated and an error should be thrown.
+  IF(NOT HAVE_M4)
+    IF(NOT EXISTS ${dest})
+      MESSAGE(FATAL_ERROR "m4 is required to generate ${filename}.c. Please install m4 so that it is on the PATH and try again.")
    ENDIF()
+  ENDIF(NOT HAVE_M4)
+
+  IF(HAVE_M4)
+    # If m4 is available, remove generated file if it exists.
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
+      FILE(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
+    ENDIF()
+
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${dest}
+      COMMAND ${NC_M4}
+      ARGS ${M4FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${dest}
+      VERBATIM
+      )
+
  ENDIF(HAVE_M4)
 ENDMACRO(GEN_m4)

--- a/ncgen/ncgenl.c
+++ b/ncgen/ncgenl.c
--- a/ncgen/ncgeny.c
+++ b/ncgen/ncgeny.c
--- a/ncgen/ncgeny.h
+++ b/ncgen/ncgeny.h
@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.5.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-2015, 2018-2020 Free Software Foundation,
+   Inc.

-   This program is free software; you can redistribute it and/or modify
+   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 2, or (at your option)
-   any later version.
+   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
@ -16,9 +16,7 @@
   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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 /* As a special exception, you may create a larger work that contains
   part or all of the Bison parser skeleton and distribute that work
@ -33,143 +31,104 @@
   This special exception was added by the Free Software Foundation in
   version 2.2 of Bison.  */

-/* Tokens.  */
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
+#ifndef YY_NCG_NCGEN_TAB_H_INCLUDED
+# define YY_NCG_NCGEN_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int ncgdebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     NC_UNLIMITED_K = 258,
-     CHAR_K = 259,
-     BYTE_K = 260,
-     SHORT_K = 261,
-     INT_K = 262,
-     FLOAT_K = 263,
-     DOUBLE_K = 264,
-     UBYTE_K = 265,
-     USHORT_K = 266,
-     UINT_K = 267,
-     INT64_K = 268,
-     UINT64_K = 269,
-     STRING_K = 270,
-     IDENT = 271,
-     TERMSTRING = 272,
-     CHAR_CONST = 273,
-     BYTE_CONST = 274,
-     SHORT_CONST = 275,
-     INT_CONST = 276,
-     INT64_CONST = 277,
-     UBYTE_CONST = 278,
-     USHORT_CONST = 279,
-     UINT_CONST = 280,
-     UINT64_CONST = 281,
-     FLOAT_CONST = 282,
-     DOUBLE_CONST = 283,
-     DIMENSIONS = 284,
-     VARIABLES = 285,
-     NETCDF = 286,
-     DATA = 287,
-     TYPES = 288,
-     COMPOUND = 289,
-     ENUM = 290,
-     OPAQUE_ = 291,
-     OPAQUESTRING = 292,
-     GROUP = 293,
-     PATH = 294,
-     FILLMARKER = 295,
-     NIL = 296,
-     _FILLVALUE = 297,
-     _FORMAT = 298,
-     _STORAGE = 299,
-     _CHUNKSIZES = 300,
-     _DEFLATELEVEL = 301,
-     _SHUFFLE = 302,
-     _ENDIANNESS = 303,
-     _NOFILL = 304,
-     _FLETCHER32 = 305,
-     _NCPROPS = 306,
-     _ISNETCDF4 = 307,
-     _SUPERBLOCK = 308,
-     _FILTER = 309,
-     DATASETID = 310
-   };
+  enum yytokentype
+  {
+    NC_UNLIMITED_K = 258,
+    CHAR_K = 259,
+    BYTE_K = 260,
+    SHORT_K = 261,
+    INT_K = 262,
+    FLOAT_K = 263,
+    DOUBLE_K = 264,
+    UBYTE_K = 265,
+    USHORT_K = 266,
+    UINT_K = 267,
+    INT64_K = 268,
+    UINT64_K = 269,
+    STRING_K = 270,
+    IDENT = 271,
+    TERMSTRING = 272,
+    CHAR_CONST = 273,
+    BYTE_CONST = 274,
+    SHORT_CONST = 275,
+    INT_CONST = 276,
+    INT64_CONST = 277,
+    UBYTE_CONST = 278,
+    USHORT_CONST = 279,
+    UINT_CONST = 280,
+    UINT64_CONST = 281,
+    FLOAT_CONST = 282,
+    DOUBLE_CONST = 283,
+    DIMENSIONS = 284,
+    VARIABLES = 285,
+    NETCDF = 286,
+    DATA = 287,
+    TYPES = 288,
+    COMPOUND = 289,
+    ENUM = 290,
+    OPAQUE_ = 291,
+    OPAQUESTRING = 292,
+    GROUP = 293,
+    PATH = 294,
+    FILLMARKER = 295,
+    NIL = 296,
+    _FILLVALUE = 297,
+    _FORMAT = 298,
+    _STORAGE = 299,
+    _CHUNKSIZES = 300,
+    _DEFLATELEVEL = 301,
+    _SHUFFLE = 302,
+    _ENDIANNESS = 303,
+    _NOFILL = 304,
+    _FLETCHER32 = 305,
+    _NCPROPS = 306,
+    _ISNETCDF4 = 307,
+    _SUPERBLOCK = 308,
+    _FILTER = 309,
+    DATASETID = 310
+  };
 #endif
-/* Tokens.  */
-#define NC_UNLIMITED_K 258
-#define CHAR_K 259
-#define BYTE_K 260
-#define SHORT_K 261
-#define INT_K 262
-#define FLOAT_K 263
-#define DOUBLE_K 264
-#define UBYTE_K 265
-#define USHORT_K 266
-#define UINT_K 267
-#define INT64_K 268
-#define UINT64_K 269
-#define STRING_K 270
-#define IDENT 271
-#define TERMSTRING 272
-#define CHAR_CONST 273
-#define BYTE_CONST 274
-#define SHORT_CONST 275
-#define INT_CONST 276
-#define INT64_CONST 277
-#define UBYTE_CONST 278
-#define USHORT_CONST 279
-#define UINT_CONST 280
-#define UINT64_CONST 281
-#define FLOAT_CONST 282
-#define DOUBLE_CONST 283
-#define DIMENSIONS 284
-#define VARIABLES 285
-#define NETCDF 286
-#define DATA 287
-#define TYPES 288
-#define COMPOUND 289
-#define ENUM 290
-#define OPAQUE_ 291
-#define OPAQUESTRING 292
-#define GROUP 293
-#define PATH 294
-#define FILLMARKER 295
-#define NIL 296
-#define _FILLVALUE 297
-#define _FORMAT 298
-#define _STORAGE 299
-#define _CHUNKSIZES 300
-#define _DEFLATELEVEL 301
-#define _SHUFFLE 302
-#define _ENDIANNESS 303
-#define _NOFILL 304
-#define _FLETCHER32 305
-#define _NCPROPS 306
-#define _ISNETCDF4 307
-#define _SUPERBLOCK 308
-#define _FILTER 309
-#define DATASETID 310
-
-
-

+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 151 "ncgen.y"
+union YYSTYPE
 {
+#line 151 "ncgen.y"
+
 Symbol* sym;
 unsigned long  size; /* allow for zero size to indicate e.g. UNLIMITED*/
 long           mark; /* track indices into the sequence*/
 int            nctype; /* for tracking attribute list type*/
 Datalist*      datalist;
 NCConstant*    constant;
-}
-/* Line 1529 of yacc.c.  */
-#line 168 "ncgeny.h"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 122 "ncgen.tab.h"
+
+};
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif

+
 extern YYSTYPE ncglval;

+int ncgparse (void);
+
+#endif /* !YY_NCG_NCGEN_TAB_H_INCLUDED  */