[udunits] 01/04: upstream release 2.2.20
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Nov 11 09:28:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository udunits.
commit 8a07b701643c59cfeeeb5da6e50149cec8b300dc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Oct 29 02:54:46 2015 +0000
upstream release 2.2.20
---
CHANGE_LOG | 21 +-
CMakeLists.txt | 47 ++-
config.h.cmake | 4 +-
configure | 20 +-
configure.ac | 2 +-
lib/CMakeLists.txt | 24 +-
lib/parser.c | 858 ++++++++++++++++++++++++++--------------------
lib/scanner.c | 86 +++--
lib/scanner.l | 2 +-
lib/udunits2-accepted.xml | 17 +-
lib/udunits2lib.pdf | Bin 270660 -> 270660 bytes
prog/udunits2prog.pdf | Bin 71512 -> 71512 bytes
stamp-vti | 8 +-
udunits2.html | 10 +-
udunits2.info | 4 +-
udunits2.pdf | Bin 117913 -> 117911 bytes
version.texi | 8 +-
17 files changed, 664 insertions(+), 447 deletions(-)
diff --git a/CHANGE_LOG b/CHANGE_LOG
index 1655a9f..b45a27f 100644
--- a/CHANGE_LOG
+++ b/CHANGE_LOG
@@ -1,4 +1,18 @@
-2.2.19
+2.2.20
+ Building:
+ Add Ward Fisher's modifications for better portability.
+
+ Library (udunits2(3)):
+ Replaced use of deprecated atof() with strtod().
+
+ Units Database:
+ Changed definition of "astronomical_unit" from "1.495979e11 m" to
+ "1.49597870700e11 m" and its symbol from "ua" to "au" based on 2012
+ resolution by the International Astronomical Union (IAU) and 2014
+ revision of the SI Brochure by the BIPM. Added the new unit
+ "astronomical_unit_BIPM_2006" with the old symbol and definition.
+
+2.2.19 2015-04-02T11:50:09-0600
Added `tsearch.c` and `tsearch.h` to the distribution to support building
on Windows.
@@ -14,13 +28,13 @@
Changed the definition of "molecule" to "1/avogadro_constant".
Added comments and human-readable definitions.
- Improved support for static builds.
Program (udunits2(1)):
Removed latent bug on Windows in determining the name of the program.
Misc:
Removed lint discovered by Coverity.
+ Improved support for static builds.
2.2.17 2014-11-18T11:32:32-0700
Modified the lexical scanner to accept the use of "ref" in an offset
@@ -127,9 +141,6 @@
Added scripts and configuration-files to support continuous-delivery.
- Units Database:
- Added units "molecule" (for conversion with "mole") and "bit".
-
Misc:
Removed bundled EXPAT package.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dfbc4a..23c3713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(VERSION_MAJOR 2)
SET(VERSION_MINOR 2)
-SET(VERSION_PATCH 19)
+SET(VERSION_PATCH 20)
# Ensure a path in the format common to both Unix and MinGW.
FUNCTION(to_common_path input result)
@@ -38,6 +38,49 @@ IF(MSVC)
ENDIF()
+##
+# Configuration for post-install RPath
+# Adapted from http://www.cmake.org/Wiki/CMake_RPATH_handling
+##
+IF(NOT MSVC)
+ # use, i.e. don't skip the full RPATH for the build tree
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+ # when building, don't use the install RPATH already
+ # (but later on when installing)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+ if(APPLE)
+ set(CMAKE_MACOSX_RPATH ON)
+ endif(APPLE)
+
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+ # the RPATH to be used when installing,
+ # but only if it's not a system directory
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+ IF("${isSystemDir}" STREQUAL "-1")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ ENDIF("${isSystemDir}" STREQUAL "-1")
+
+ENDIF()
+
+##
+# End configuration for post-install RPath
+##
+
+
+###
+# Fix to make sure we don't try to include unistd.h
+# when using Visual Studio.
+###
+INCLUDE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
+IF(NOT HAVE_UNISTD_H)
+ SET(YY_NO_UNISTD_H TRUE)
+ENDIF()
# Ensures a path in the native format.
#FUNCTION(to_native_path input result)
@@ -121,7 +164,7 @@ FUNCTION(texi_doc input)
DEPENDS ${ARGN}
COMMAND ${MAKEINFO} -o ${file}.info -I ${common_source_dir}
${common_input}
- COMMAND ${MAKEINFO} -o ${file}.html -I ${common_source_dir}
+ COMMAND ${MAKEINFO} -o ${file}.html -I ${common_source_dir}
--html --no-split ${common_input}
VERBATIM
COMMENT "Creating documentation from ${common_input}")
diff --git a/config.h.cmake b/config.h.cmake
index 59b1f9d..8916df5 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -3,4 +3,6 @@
*/
#define DEFAULT_UDUNITS2_XML_PATH "@DEFAULT_UDUNITS2_XML_PATH@"
#cmakedefine DLL_UDUNITS2
-#cmakedefine DLL_EXPORT
\ No newline at end of file
+#cmakedefine DLL_EXPORT
+#cmakedefine HAVE_UNISTD_H
+#cmakedefine YY_NO_UNISTD_H
\ No newline at end of file
diff --git a/configure b/configure
index 679da8b..d4d33f8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for UDUNITS 2.2.19.
+# Generated by GNU Autoconf 2.68 for UDUNITS 2.2.20.
#
# Report bugs to <support-udunits at unidata.ucar.edu>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='UDUNITS'
PACKAGE_TARNAME='udunits'
-PACKAGE_VERSION='2.2.19'
-PACKAGE_STRING='UDUNITS 2.2.19'
+PACKAGE_VERSION='2.2.20'
+PACKAGE_STRING='UDUNITS 2.2.20'
PACKAGE_BUGREPORT='support-udunits at unidata.ucar.edu'
PACKAGE_URL=''
@@ -1310,7 +1310,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures UDUNITS 2.2.19 to adapt to many kinds of systems.
+\`configure' configures UDUNITS 2.2.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1380,7 +1380,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of UDUNITS 2.2.19:";;
+ short | recursive ) echo "Configuration of UDUNITS 2.2.20:";;
esac
cat <<\_ACEOF
@@ -1493,7 +1493,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-UDUNITS configure 2.2.19
+UDUNITS configure 2.2.20
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2000,7 +2000,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by UDUNITS $as_me 2.2.19, which was
+It was created by UDUNITS $as_me 2.2.20, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2817,7 +2817,7 @@ fi
# Define the identity of the package.
PACKAGE='udunits'
- VERSION='2.2.19'
+ VERSION='2.2.20'
cat >>confdefs.h <<_ACEOF
@@ -15896,7 +15896,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by UDUNITS $as_me 2.2.19, which was
+This file was extended by UDUNITS $as_me 2.2.20, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15962,7 +15962,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-UDUNITS config.status 2.2.19
+UDUNITS config.status 2.2.20
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 7bab3c6..2b86e0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
#
AC_PREREQ(2.59)
-AC_INIT([UDUNITS], [2.2.19], [support-udunits at unidata.ucar.edu])
+AC_INIT([UDUNITS], [2.2.20], [support-udunits at unidata.ucar.edu])
AC_CONFIG_SRCDIR([lib/converter.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2db6274..17b2304 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -4,18 +4,36 @@ IF (CUNIT_INCLUDE_DIR)
INCLUDE_DIRECTORIES("${CUNIT_INCLUDE_DIR}")
ENDIF()
+IF(YY_NO_UNISTD_H)
+ ADD_DEFINITIONS(-DYY_NO_UNISTD_H)
+ENDIF(YY_NO_UNISTD_H)
+
+##
+# Check to see if we have flex and bison.
+##
+FIND_PROGRAM(UD_FLEX NAMES flex)
+FIND_PROGRAM(UD_BISON NAMES bison)
+
# Ensure that the C source-files for the scanner and parser are up-to-date
# on a Unix system.
-if (UNIX)
+#
+# MODIFICATION: Instead of checking for Unix, see if flex and bison
+# are available.
+#
+# MODIFICATION 2: Moving back for now, but leaving framework.
+# Other complications arose on Windows with MSVC.
+#
+
+IF(UNIX)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanner.c
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND flex -d -Put -o scanner.c scanner.l
+ COMMAND ${UD_FLEX} -d -Put -o scanner.c scanner.l
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanner.l)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/parser.c
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND bison -t -p ut -o parser.c parser.y
+ COMMAND ${UD_BISON} -t -p ut -o parser.c parser.y
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/parser.y)
set_source_files_properties(parser.c
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanner.c)
diff --git a/lib/parser.c b/lib/parser.c
index 3ffbea6..2e42db6 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3. */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
+/* Bison implementation for Yacc-like parsers in C
+
+ 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
- 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
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, 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
@@ -29,7 +26,7 @@
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. */
@@ -47,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,57 +52,28 @@
/* Pure parsers. */
#define YYPURE 0
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse utparse
-#define yylex utlex
-#define yyerror uterror
-#define yylval utlval
-#define yychar utchar
-#define yydebug utdebug
-#define yynerrs utnerrs
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- ERR = 258,
- SHIFT = 259,
- MULTIPLY = 260,
- DIVIDE = 261,
- INT = 262,
- EXPONENT = 263,
- REAL = 264,
- ID = 265,
- DATE = 266,
- CLOCK = 267,
- TIMESTAMP = 268,
- LOGREF = 269
- };
-#endif
-/* Tokens. */
-#define ERR 258
-#define SHIFT 259
-#define MULTIPLY 260
-#define DIVIDE 261
-#define INT 262
-#define EXPONENT 263
-#define REAL 264
-#define ID 265
-#define DATE 266
-#define CLOCK 267
-#define TIMESTAMP 268
-#define LOGREF 269
-
-
+#define yyparse utparse
+#define yylex utlex
+#define yyerror uterror
+#define yylval utlval
+#define yychar utchar
+#define yydebug utdebug
+#define yynerrs utnerrs
/* Copy the first part of user declarations. */
+
+/* Line 268 of yacc.c */
#line 1 "parser.y"
/*
@@ -133,12 +101,10 @@
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
-#include <string.h>
-
#ifndef _MSC_VER
+#include <string.h>
#include <strings.h>
#endif
-
#include "udunits2.h"
static ut_unit* _finalUnit; /* fully-parsed specification */
@@ -312,6 +278,9 @@ static int isTime(
+/* Line 268 of yacc.c */
+#line 283 "parser.c"
+
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@@ -330,29 +299,57 @@ static int isTime(
# define YYTOKEN_TABLE 0
#endif
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ ERR = 258,
+ SHIFT = 259,
+ MULTIPLY = 260,
+ DIVIDE = 261,
+ INT = 262,
+ EXPONENT = 263,
+ REAL = 264,
+ ID = 265,
+ DATE = 266,
+ CLOCK = 267,
+ TIMESTAMP = 268,
+ LOGREF = 269
+ };
+#endif
+
+
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 203 "parser.y"
{
+
+/* Line 293 of yacc.c */
+#line 204 "parser.y"
+
char* id; /* identifier */
ut_unit* unit; /* "unit" structure */
double rval; /* floating-point numerical value */
long ival; /* integer numerical value */
-}
-/* Line 193 of yacc.c. */
-#line 341 "parser.c"
- YYSTYPE;
+
+
+
+/* Line 293 of yacc.c */
+#line 342 "parser.c"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
#endif
-
/* Copy the second part of user declarations. */
-/* Line 216 of yacc.c. */
+/* Line 343 of yacc.c */
#line 354 "parser.c"
#ifdef short
@@ -428,14 +425,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int i)
+YYID (int yyi)
#else
static int
-YYID (i)
- int i;
+YYID (yyi)
+ int yyi;
#endif
{
- return i;
+ return yyi;
}
#endif
@@ -456,11 +453,11 @@ YYID (i)
# 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 <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -483,24 +480,24 @@ YYID (i)
# 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 <stdlib.h> /* 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
@@ -516,9 +513,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss;
- YYSTYPE yyvs;
- };
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
+};
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -529,6 +526,27 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
+# 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
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (YYID (0))
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
/* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */
# ifndef YYCOPY
@@ -546,24 +564,7 @@ union yyalloc
while (YYID (0))
# endif
# endif
-
-/* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
- elements in the stack, and YYPTR gives the new location of the
- stack. Advance YYPTR to a properly aligned location for the next
- stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
- while (YYID (0))
-
-#endif
+#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 15
@@ -648,10 +649,10 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 233, 233, 237, 241, 246, 249, 255, 261, 267,
- 275, 279, 287, 293, 301, 307, 315, 323, 326, 332,
- 338, 346, 399, 402, 408, 414, 420, 426, 429, 434,
- 437, 440, 443, 462, 465, 468
+ 0, 234, 234, 238, 242, 247, 250, 256, 262, 268,
+ 276, 280, 288, 294, 302, 308, 316, 324, 327, 333,
+ 339, 347, 400, 403, 409, 415, 421, 427, 430, 435,
+ 438, 441, 444, 463, 466, 469
};
#endif
@@ -695,8 +696,8 @@ static const yytype_uint8 yyr2[] =
2, 3, 3, 1, 2, 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[] =
{
@@ -733,8 +734,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 -26
static const yytype_int8 yytable[] =
{
@@ -750,6 +750,12 @@ static const yytype_int8 yytable[] =
4, 0, 0, 0, 5, 6
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-10))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_int8 yycheck[] =
{
0, 1, 0, 12, 4, 5, 6, 7, 8, 9,
@@ -787,9 +793,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)
@@ -799,7 +814,6 @@ do \
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
@@ -841,19 +855,10 @@ while (YYID (0))
#endif
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
+/* This macro is provided for backward compatibility. */
#ifndef YY_LOCATION_PRINT
-# 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, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
@@ -957,17 +962,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else
static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
@@ -1001,11 +1009,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, "\n");
}
}
@@ -1042,7 +1050,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -1145,115 +1152,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)
-{
- int yyn = yypact[yystate];
+/* 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.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
+ 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)
+{
+ 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;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ 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;
-
-# 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;
- }
+ 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;
+
+ 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;
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- 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_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- 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;
+ 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. |
@@ -1285,10 +1319,9 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
-
-/* Prevent warnings from -Wmissing-prototypes. */
+/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1304,18 +1337,16 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-/* The look-ahead symbol. */
+/* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
+/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
int yynerrs;
-
/*----------.
| yyparse. |
`----------*/
@@ -1342,66 +1373,66 @@ yyparse ()
#endif
#endif
{
-
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ 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;
@@ -1431,7 +1462,6 @@ yyparse ()
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
@@ -1439,7 +1469,6 @@ yyparse ()
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
-
&yystacksize);
yyss = yyss1;
@@ -1462,9 +1491,8 @@ yyparse ()
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1475,7 +1503,6 @@ yyparse ()
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1485,6 +1512,9 @@ yyparse ()
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1493,16 +1523,16 @@ yyparse ()
yybackup:
/* Do appropriate processing given the current state. Read a
- look-ahead token if we need one and don't already have one. */
+ lookahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* 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 look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1528,26 +1558,22 @@ 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;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the look-ahead token. */
+ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1587,7 +1613,9 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 233 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 234 "parser.y"
{
_finalUnit = ut_get_dimensionless_unit_one(_unitSystem);
YYACCEPT;
@@ -1595,7 +1623,9 @@ yyreduce:
break;
case 3:
-#line 237 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 238 "parser.y"
{
_finalUnit = (yyvsp[(1) - (1)].unit);
YYACCEPT;
@@ -1603,21 +1633,27 @@ yyreduce:
break;
case 4:
-#line 241 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 242 "parser.y"
{
YYABORT;
}
break;
case 5:
-#line 246 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 247 "parser.y"
{
(yyval.unit) = (yyvsp[(1) - (1)].unit);
}
break;
case 6:
-#line 249 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 250 "parser.y"
{
(yyval.unit) = ut_offset((yyvsp[(1) - (3)].unit), (yyvsp[(3) - (3)].rval));
ut_free((yyvsp[(1) - (3)].unit));
@@ -1627,7 +1663,9 @@ yyreduce:
break;
case 7:
-#line 255 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 256 "parser.y"
{
(yyval.unit) = ut_offset((yyvsp[(1) - (3)].unit), (yyvsp[(3) - (3)].ival));
ut_free((yyvsp[(1) - (3)].unit));
@@ -1637,7 +1675,9 @@ yyreduce:
break;
case 8:
-#line 261 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 262 "parser.y"
{
(yyval.unit) = ut_offset_by_time((yyvsp[(1) - (3)].unit), (yyvsp[(3) - (3)].rval));
ut_free((yyvsp[(1) - (3)].unit));
@@ -1647,7 +1687,9 @@ yyreduce:
break;
case 9:
-#line 267 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 268 "parser.y"
{
ut_status prev = ut_get_status();
ut_free((yyvsp[(1) - (3)].unit));
@@ -1657,7 +1699,9 @@ yyreduce:
break;
case 10:
-#line 275 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 276 "parser.y"
{
(yyval.unit) = (yyvsp[(1) - (1)].unit);
_isTime = isTime((yyval.unit));
@@ -1665,7 +1709,9 @@ yyreduce:
break;
case 11:
-#line 279 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 280 "parser.y"
{
(yyval.unit) = ut_multiply((yyvsp[(1) - (2)].unit), (yyvsp[(2) - (2)].unit));
_isTime = isTime((yyval.unit));
@@ -1677,7 +1723,9 @@ yyreduce:
break;
case 12:
-#line 287 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 288 "parser.y"
{
ut_status prev = ut_get_status();
ut_free((yyvsp[(1) - (2)].unit));
@@ -1687,7 +1735,9 @@ yyreduce:
break;
case 13:
-#line 293 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 294 "parser.y"
{
(yyval.unit) = ut_multiply((yyvsp[(1) - (3)].unit), (yyvsp[(3) - (3)].unit));
_isTime = isTime((yyval.unit));
@@ -1699,7 +1749,9 @@ yyreduce:
break;
case 14:
-#line 301 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 302 "parser.y"
{
ut_status prev = ut_get_status();
ut_free((yyvsp[(1) - (3)].unit));
@@ -1709,7 +1761,9 @@ yyreduce:
break;
case 15:
-#line 307 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 308 "parser.y"
{
(yyval.unit) = ut_divide((yyvsp[(1) - (3)].unit), (yyvsp[(3) - (3)].unit));
_isTime = isTime((yyval.unit));
@@ -1721,7 +1775,9 @@ yyreduce:
break;
case 16:
-#line 315 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 316 "parser.y"
{
ut_status prev = ut_get_status();
ut_free((yyvsp[(1) - (3)].unit));
@@ -1731,14 +1787,18 @@ yyreduce:
break;
case 17:
-#line 323 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 324 "parser.y"
{
(yyval.unit) = (yyvsp[(1) - (1)].unit);
}
break;
case 18:
-#line 326 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 327 "parser.y"
{
(yyval.unit) = ut_raise((yyvsp[(1) - (2)].unit), (yyvsp[(2) - (2)].ival));
ut_free((yyvsp[(1) - (2)].unit));
@@ -1748,7 +1808,9 @@ yyreduce:
break;
case 19:
-#line 332 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 333 "parser.y"
{
(yyval.unit) = ut_raise((yyvsp[(1) - (2)].unit), (yyvsp[(2) - (2)].ival));
ut_free((yyvsp[(1) - (2)].unit));
@@ -1758,7 +1820,9 @@ yyreduce:
break;
case 20:
-#line 338 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 339 "parser.y"
{
ut_status prev = ut_get_status();
ut_free((yyvsp[(1) - (2)].unit));
@@ -1768,7 +1832,9 @@ yyreduce:
break;
case 21:
-#line 346 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 347 "parser.y"
{
double prefix = 1;
ut_unit* unit = NULL;
@@ -1825,14 +1891,18 @@ yyreduce:
break;
case 22:
-#line 399 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 400 "parser.y"
{
(yyval.unit) = (yyvsp[(2) - (3)].unit);
}
break;
case 23:
-#line 402 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 403 "parser.y"
{
ut_status status = ut_get_status();
ut_free((yyvsp[(2) - (3)].unit));
@@ -1842,7 +1912,9 @@ yyreduce:
break;
case 24:
-#line 408 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 409 "parser.y"
{
(yyval.unit) = ut_log((yyvsp[(1) - (3)].rval), (yyvsp[(2) - (3)].unit));
ut_free((yyvsp[(2) - (3)].unit));
@@ -1852,7 +1924,9 @@ yyreduce:
break;
case 25:
-#line 414 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 415 "parser.y"
{
ut_status status = ut_get_status();
ut_free((yyvsp[(2) - (3)].unit));
@@ -1862,7 +1936,9 @@ yyreduce:
break;
case 26:
-#line 420 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 421 "parser.y"
{
(yyval.unit) = ut_scale((yyvsp[(1) - (1)].rval),
ut_get_dimensionless_unit_one(_unitSystem));
@@ -1870,42 +1946,54 @@ yyreduce:
break;
case 27:
-#line 426 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 427 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (1)].ival);
}
break;
case 28:
-#line 429 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 430 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (1)].rval);
}
break;
case 29:
-#line 434 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 435 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (1)].rval);
}
break;
case 30:
-#line 437 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 438 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (2)].rval) + (yyvsp[(2) - (2)].rval);
}
break;
case 31:
-#line 440 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 441 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (3)].rval) + ((yyvsp[(2) - (3)].rval) - (yyvsp[(3) - (3)].rval));
}
break;
case 32:
-#line 443 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 444 "parser.y"
{
int error = 0;
@@ -1928,21 +2016,27 @@ yyreduce:
break;
case 33:
-#line 462 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 463 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (1)].rval);
}
break;
case 34:
-#line 465 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 466 "parser.y"
{
(yyval.rval) = (yyvsp[(1) - (2)].rval) - (yyvsp[(2) - (2)].rval);
}
break;
case 35:
-#line 468 "parser.y"
+
+/* Line 1806 of yacc.c */
+#line 469 "parser.y"
{
int error = 0;
@@ -1965,10 +2059,22 @@ yyreduce:
break;
-/* Line 1267 of yacc.c. */
-#line 1967 "parser.c"
+
+/* Line 1806 of yacc.c */
+#line 2065 "parser.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);
@@ -1977,7 +2083,6 @@ yyreduce:
*++yyvsp = yyval;
-
/* 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. */
@@ -1997,6 +2102,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)
{
@@ -2004,37 +2113,36 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (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 (yymsg);
- }
- else
- {
- yyerror (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 (yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
@@ -2042,7 +2150,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
+ /* If just tried and failed to reuse lookahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -2059,7 +2167,7 @@ yyerrlab:
}
}
- /* Else will try to reuse look-ahead token after shifting the error
+ /* Else will try to reuse lookahead token after shifting the error
token. */
goto yyerrlab1;
@@ -2093,7 +2201,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)
@@ -2116,9 +2224,6 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
*++yyvsp = yylval;
@@ -2143,7 +2248,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2154,9 +2259,14 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ if (yychar != YYEMPTY)
+ {
+ /* 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);
+ }
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -2180,7 +2290,9 @@ yyreturn:
}
-#line 489 "parser.y"
+
+/* Line 2067 of yacc.c */
+#line 490 "parser.y"
#define yymaxdepth utmaxdepth
diff --git a/lib/scanner.c b/lib/scanner.c
index 18103d7..870f941 100644
--- a/lib/scanner.c
+++ b/lib/scanner.c
@@ -1,5 +1,6 @@
+#line 2 "scanner.c"
-#line 3 "<stdout>"
+#line 4 "scanner.c"
#define YY_INT_ALIGNED short int
@@ -35,7 +36,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -202,7 +203,15 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -214,13 +223,8 @@ typedef unsigned int flex_uint32_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
-
/* %if-not-reentrant */
-extern yy_size_t utleng;
+extern int utleng;
/* %endif */
/* %if-c-only */
@@ -251,6 +255,11 @@ extern FILE *utin, *utout;
#define unput(c) yyunput( c, (yytext_ptr) )
+#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
@@ -273,7 +282,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int 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
@@ -357,8 +366,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when uttext is formed. */
static char yy_hold_char;
-static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
-yy_size_t utleng;
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
+int utleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -389,7 +398,7 @@ static void ut_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE ut_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE ut_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE ut_scan_bytes (yyconst char *bytes,yy_size_t len );
+YY_BUFFER_STATE ut_scan_bytes (yyconst char *bytes,int len );
/* %endif */
@@ -424,7 +433,7 @@ void utfree (void * );
/* %% [1.0] uttext/utin/utout/yy_state_type/utlineno etc. def's & init go here */
/* Begin user sect3 */
-#define utwrap() 1
+#define utwrap(n) 1
#define YY_SKIP_YYWRAP
#define FLEX_DEBUG
@@ -1020,7 +1029,7 @@ static int decodeReal(
double* const value)
{
errno = 0;
- *value = atof(text);
+ *value = strtod(text, NULL);
if (errno == 0)
return REAL;
@@ -1030,7 +1039,7 @@ static int decodeReal(
}
-#line 1034 "<stdout>"
+#line 1043 "scanner.c"
#define INITIAL 0
#define ID_SEEN 1
@@ -1038,9 +1047,6 @@ static int decodeReal(
#define DATE_SEEN 3
#define CLOCK_SEEN 4
-#ifdef WIN32
-#define YY_NO_UNISTD_H
-#endif
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
@@ -1089,7 +1095,7 @@ FILE *utget_out (void );
void utset_out (FILE * out_str );
-yy_size_t utget_leng (void );
+int utget_leng (void );
char *utget_text (void );
@@ -1148,7 +1154,12 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1286,7 +1297,7 @@ YY_DECL
_restartScanner = 0;
}
-#line 1287 "<stdout>"
+#line 1301 "scanner.c"
if ( !(yy_init) )
{
@@ -1653,7 +1664,7 @@ YY_RULE_SETUP
#line 342 "scanner.l"
ECHO;
YY_BREAK
-#line 1654 "<stdout>"
+#line 1668 "scanner.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(ID_SEEN):
case YY_STATE_EOF(SHIFT_SEEN):
@@ -1856,21 +1867,21 @@ static int yy_get_next_buffer (void)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
- yy_size_t new_size = b->yy_buf_size * 2;
+ int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1901,7 +1912,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), num_to_read );
+ (yy_n_chars), (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -2009,7 +2020,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 270);
- return yy_is_jam ? 0 : yy_current_state;
+ return yy_is_jam ? 0 : yy_current_state;
}
/* %if-c-only */
@@ -2029,7 +2040,7 @@ static int yy_get_next_buffer (void)
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register yy_size_t number_to_move = (yy_n_chars) + 2;
+ register int number_to_move = (yy_n_chars) + 2;
register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
register char *source =
@@ -2087,7 +2098,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+ int offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -2271,6 +2282,17 @@ static void ut_load_buffer_state (void)
utfree((void *) b );
}
+/* %if-c-only */
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a utrestart() or at EOF.
@@ -2413,7 +2435,7 @@ static void utensure_buffer_stack (void)
/* %if-c++-only */
/* %endif */
{
- yy_size_t num_to_alloc;
+ int num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -2516,12 +2538,12 @@ YY_BUFFER_STATE ut_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE ut_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
+YY_BUFFER_STATE ut_scan_bytes (yyconst char * yybytes, int _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
- yy_size_t i;
+ int i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -2612,7 +2634,7 @@ FILE *utget_out (void)
/** Get the length of the current token.
*
*/
-yy_size_t utget_leng (void)
+int utget_leng (void)
{
return utleng;
}
diff --git a/lib/scanner.l b/lib/scanner.l
index 6801ef2..2fa05e1 100644
--- a/lib/scanner.l
+++ b/lib/scanner.l
@@ -83,7 +83,7 @@ static int decodeReal(
double* const value)
{
errno = 0;
- *value = atof(text);
+ *value = strtod(text, NULL);
if (errno == 0)
return REAL;
diff --git a/lib/udunits2-accepted.xml b/lib/udunits2-accepted.xml
index 784051e..b34f92f 100644
--- a/lib/udunits2-accepted.xml
+++ b/lib/udunits2-accepted.xml
@@ -116,13 +116,22 @@ Units accepted for use with the SI
<definition>standard unit for indicating mass on an atomic or molecular scale; is approximately the mass of one nucleon (either a single proton or neutron), and equivalent to 1 g/mol</definition>
</unit>
<unit>
- <comment>Unit's value is obtained experimentally</comment>
- <def>1.495979e11 m</def>
+ <comment>According to resolution by the International Astronomical Union (IAU) in 2012 </comment>
+ <def>1.49597870700e11 m</def>
<aliases>
<name><singular>astronomical_unit</singular></name>
- <symbol>ua</symbol>
+ <symbol>au</symbol> <!-- Adopted by BIPM in 2014 -->
+ </aliases>
+ <definition>Exact definition according to 2012 resolution by the International Astronomical Union (IAU). Ostensibly equal to the mean distance from the center of the earth to the center of the sun.</definition>
+ </unit>
+ <unit>
+ <comment>Pre-2012 resolution by the IAU</comment>
+ <def>1.495979e11 m</def>
+ <aliases>
+ <name><singular>astronomical_unit_BIPM_2006</singular></name>
+ <symbol>ua</symbol>
</aliases>
- <definition>unit of measurement equal to 149.6 million kilometers, the mean distance from the center of the earth to the center of the sun</definition>
+ <definition>unit of measurement equal to 149.6 million kilometers, the mean distance from the center of the earth to the center of the sun according to the International Bureau of Weights and Measures (BIPM) in 2006</definition>
</unit>
<!-- Units temporarily accepted for use with the SI. NB: <name>
diff --git a/lib/udunits2lib.pdf b/lib/udunits2lib.pdf
index 91ea36c..6965109 100644
Binary files a/lib/udunits2lib.pdf and b/lib/udunits2lib.pdf differ
diff --git a/prog/udunits2prog.pdf b/prog/udunits2prog.pdf
index 8c10816..9d3073d 100644
Binary files a/prog/udunits2prog.pdf and b/prog/udunits2prog.pdf differ
diff --git a/stamp-vti b/stamp-vti
index 24c0f3c..ad9c6e3 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
- at set UPDATED 2 April 2015
- at set UPDATED-MONTH April 2015
- at set EDITION 2.2.19
- at set VERSION 2.2.19
+ at set UPDATED 22 October 2015
+ at set UPDATED-MONTH October 2015
+ at set EDITION 2.2.20
+ at set VERSION 2.2.20
diff --git a/udunits2.html b/udunits2.html
index 0bc5e2e..b062e98 100644
--- a/udunits2.html
+++ b/udunits2.html
@@ -1,8 +1,8 @@
<html lang="en">
<head>
-<title>UDUNITS 2.2.19 Manual</title>
+<title>UDUNITS 2.2.20 Manual</title>
<meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="UDUNITS 2.2.19 Manual">
+<meta name="description" content="UDUNITS 2.2.20 Manual">
<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="top" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -55,7 +55,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
--></style>
</head>
<body>
-<h1 class="settitle">UDUNITS 2.2.19 Manual</h1>
+<h1 class="settitle">UDUNITS 2.2.20 Manual</h1>
<div class="contents">
<h2>Table of Contents</h2>
<ul>
@@ -352,7 +352,7 @@ and unpack it in an appropriate place. For example,
<pre class="example"> su -
cd /usr/local/src
- wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.19-Source.tar.gz |
+ wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.20-Source.tar.gz |
gunzip -c | pax -r
</pre>
<div class="node">
@@ -396,7 +396,7 @@ Up: <a rel="up" accesskey="u" href="#Unix">Unix</a>
<ol type=1 start=1>
<li>Go to the top-level source-directory of this package, e.g.,
- <pre class="example"> cd udunits-2.2.19
+ <pre class="example"> cd udunits-2.2.20
</pre>
<li>If necessary, clean-up from a previous installation attempt by making
the <code>distclean</code> target using the <var>make</var> utility from step 2:
diff --git a/udunits2.info b/udunits2.info
index 9087c5c..e9c4f1b 100644
--- a/udunits2.info
+++ b/udunits2.info
@@ -256,7 +256,7 @@ appropriate place. For example,
su -
cd /usr/local/src
- wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.19-Source.tar.gz |
+ wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.20-Source.tar.gz |
gunzip -c | pax -r
@@ -290,7 +290,7 @@ Short instructions:
Long instructions:
1. Go to the top-level source-directory of this package, e.g.,
- cd udunits-2.2.19
+ cd udunits-2.2.20
2. If necessary, clean-up from a previous installation attempt by
making the `distclean' target using the MAKE utility from step 2:
diff --git a/udunits2.pdf b/udunits2.pdf
index a84af9c..1f5eebc 100644
Binary files a/udunits2.pdf and b/udunits2.pdf differ
diff --git a/version.texi b/version.texi
index 24c0f3c..ad9c6e3 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
- at set UPDATED 2 April 2015
- at set UPDATED-MONTH April 2015
- at set EDITION 2.2.19
- at set VERSION 2.2.19
+ at set UPDATED 22 October 2015
+ at set UPDATED-MONTH October 2015
+ at set EDITION 2.2.20
+ at set VERSION 2.2.20
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git
More information about the debian-science-commits
mailing list