[Pkg-ofed-commits] r600 - in /branches/ofed-1.5lenny/opensm/trunk: debian/ debia...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Feb 5 16:27:42 UTC 2010
Author: gmpc-guest
Date: Fri Feb 5 16:27:42 2010
New Revision: 600
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=600
Log:
Remove dpatch; fixes are now upstream
Removed:
branches/ofed-1.5lenny/opensm/trunk/debian/patches/
Modified:
branches/ofed-1.5lenny/opensm/trunk/debian/control
branches/ofed-1.5lenny/opensm/trunk/debian/rules
branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_l.c
branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_y.c
Modified: branches/ofed-1.5lenny/opensm/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/opensm/trunk/debian/control?rev=600&op=diff
==============================================================================
--- branches/ofed-1.5lenny/opensm/trunk/debian/control (original)
+++ branches/ofed-1.5lenny/opensm/trunk/debian/control Fri Feb 5 16:27:42 2010
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mortier at opensides.be>, Guy Coates <gmpc at sanger.ac.uk>, Mario Lang <mlang at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, dpatch, flex, bison, libibumad-dev, libibcommon-dev
+Build-Depends: debhelper (>= 7), autotools-dev, flex, bison, libibumad-dev
Standards-Version: 3.8.3
Homepage: http://www.openfabrics.org
Modified: branches/ofed-1.5lenny/opensm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/opensm/trunk/debian/rules?rev=600&op=diff
==============================================================================
--- branches/ofed-1.5lenny/opensm/trunk/debian/rules (original)
+++ branches/ofed-1.5lenny/opensm/trunk/debian/rules Fri Feb 5 16:27:42 2010
@@ -22,7 +22,7 @@
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
@@ -39,8 +39,7 @@
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -48,19 +47,11 @@
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.sub config.guess
-
- -find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \;
+ # Don't blow away svn directories; breaks svn-buildpackage
+# -find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \;
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
install: build
dh_testdir
Modified: branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_l.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_l.c?rev=600&op=diff
==============================================================================
--- branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_l.c (original)
+++ branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_l.c Fri Feb 5 16:27:42 2010
@@ -53,7 +53,6 @@
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -83,6 +82,8 @@
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
+
+#endif /* ! C99 */
#endif /* ! FLEXINT_H */
@@ -140,7 +141,15 @@
/* 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.
@@ -929,7 +938,7 @@
#define YY_NO_INPUT 1
-#line 933 "osm_qos_parser_l.c"
+#line 942 "osm_qos_parser_l.c"
#define INITIAL 0
@@ -1008,7 +1017,12 @@
/* 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. */
@@ -1016,7 +1030,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1027,7 +1041,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1113,7 +1127,7 @@
-#line 1117 "osm_qos_parser_l.c"
+#line 1131 "osm_qos_parser_l.c"
if ( !(yy_init) )
{
@@ -1659,7 +1673,7 @@
#line 358 "osm_qos_parser_l.l"
ECHO;
YY_BREAK
-#line 1663 "osm_qos_parser_l.c"
+#line 1677 "osm_qos_parser_l.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2172,19 +2186,9 @@
yyfree((void *) b );
}
-#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __THROW /* this is a gnuism */
-extern int isatty (int ) __THROW;
-#else
+#ifndef __cplusplus
extern int isatty (int );
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+#endif /* __cplusplus */
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
@@ -2390,8 +2394,8 @@
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
*
* @return the newly allocated buffer state object.
*/
Modified: branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_y.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_y.c?rev=600&op=diff
==============================================================================
--- branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_y.c (original)
+++ branches/ofed-1.5lenny/opensm/trunk/opensm/osm_qos_parser_y.c Fri Feb 5 16:27:42 2010
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+ 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
+
+ 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.
-
+ the Free Software Foundation; either version 2, 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 <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,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. */
@@ -46,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -54,227 +55,9 @@
/* Pure parsers. */
#define YYPURE 0
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 1 "osm_qos_parser_y.y"
-
-/*
- * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2008 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- * Copyright (c) 2008 HNR Consulting. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * Grammar of OSM QoS parser.
- *
- * Environment:
- * Linux User Mode
- *
- * Author:
- * Yevgeny Kliteynik, Mellanox
- */
-
-#include <stdio.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <opensm/osm_opensm.h>
-#include <opensm/osm_qos_policy.h>
-
-#define OSM_QOS_POLICY_MAX_LINE_LEN 1024*10
-#define OSM_QOS_POLICY_SL2VL_TABLE_LEN IB_MAX_NUM_VLS
-#define OSM_QOS_POLICY_MAX_VL_NUM IB_MAX_NUM_VLS
-
-typedef struct tmp_parser_struct_t_ {
- char str[OSM_QOS_POLICY_MAX_LINE_LEN];
- uint64_t num_pair[2];
- cl_list_t str_list;
- cl_list_t num_list;
- cl_list_t num_pair_list;
-} tmp_parser_struct_t;
-
-static void __parser_tmp_struct_init();
-static void __parser_tmp_struct_reset();
-static void __parser_tmp_struct_destroy();
-
-static char * __parser_strip_white(char * str);
-
-static void __parser_str2uint64(uint64_t * p_val, char * str);
-
-static void __parser_port_group_start();
-static int __parser_port_group_end();
-
-static void __parser_sl2vl_scope_start();
-static int __parser_sl2vl_scope_end();
-
-static void __parser_vlarb_scope_start();
-static int __parser_vlarb_scope_end();
-
-static void __parser_qos_level_start();
-static int __parser_qos_level_end();
-
-static void __parser_match_rule_start();
-static int __parser_match_rule_end();
-
-static void __parser_ulp_match_rule_start();
-static int __parser_ulp_match_rule_end();
-
-static void __pkey_rangelist2rangearr(
- cl_list_t * p_list,
- uint64_t ** * p_arr,
- unsigned * p_arr_len);
-
-static void __rangelist2rangearr(
- cl_list_t * p_list,
- uint64_t ** * p_arr,
- unsigned * p_arr_len);
-
-static void __merge_rangearr(
- uint64_t ** range_arr_1,
- unsigned range_len_1,
- uint64_t ** range_arr_2,
- unsigned range_len_2,
- uint64_t ** * p_arr,
- unsigned * p_arr_len );
-
-static void __parser_add_port_to_port_map(
- cl_qmap_t * p_map,
- osm_physp_t * p_physp);
-
-static void __parser_add_guid_range_to_port_map(
- cl_qmap_t * p_map,
- uint64_t ** range_arr,
- unsigned range_len);
-
-static void __parser_add_pkey_range_to_port_map(
- cl_qmap_t * p_map,
- uint64_t ** range_arr,
- unsigned range_len);
-
-static void __parser_add_partition_list_to_port_map(
- cl_qmap_t * p_map,
- cl_list_t * p_list);
-
-static void __parser_add_map_to_port_map(
- cl_qmap_t * p_dmap,
- cl_map_t * p_smap);
-
-static int __validate_pkeys(
- uint64_t ** range_arr,
- unsigned range_len,
- boolean_t is_ipoib);
-
-static void __setup_simple_qos_levels();
-static void __clear_simple_qos_levels();
-static void __setup_ulp_match_rules();
-static void __process_ulp_match_rules();
-static void yyerror(const char *format, ...);
-
-extern char * yytext;
-extern int yylex (void);
-extern FILE * yyin;
-extern int errno;
-int yyparse();
-
-#define RESET_BUFFER __parser_tmp_struct_reset()
-
-tmp_parser_struct_t tmp_parser_struct;
-
-int column_num;
-int line_num;
-
-osm_qos_policy_t * p_qos_policy = NULL;
-osm_qos_port_group_t * p_current_port_group = NULL;
-osm_qos_sl2vl_scope_t * p_current_sl2vl_scope = NULL;
-osm_qos_vlarb_scope_t * p_current_vlarb_scope = NULL;
-osm_qos_level_t * p_current_qos_level = NULL;
-osm_qos_match_rule_t * p_current_qos_match_rule = NULL;
-osm_log_t * p_qos_parser_osm_log;
-
-/* 16 Simple QoS Levels - one for each SL */
-static osm_qos_level_t osm_qos_policy_simple_qos_levels[16];
-
-/* Default Simple QoS Level */
-osm_qos_level_t __default_simple_qos_level;
-
-/*
- * List of match rules that will be generated by the
- * qos-ulp section. These rules are concatenated to
- * the end of the usual matching rules list at the
- * end of parsing.
- */
-static cl_list_t __ulp_match_rules;
-
-/***************************************************/
-
-
-
-/* Line 189 of yacc.c */
-#line 260 "osm_qos_parser_y.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
/* Tokens. */
@@ -440,19 +223,226 @@
+/* Copy the first part of user declarations. */
+#line 1 "osm_qos_parser_y.y"
+
+/*
+ * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2002-2008 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Copyright (c) 2008 HNR Consulting. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+/*
+ * Abstract:
+ * Grammar of OSM QoS parser.
+ *
+ * Environment:
+ * Linux User Mode
+ *
+ * Author:
+ * Yevgeny Kliteynik, Mellanox
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <opensm/osm_opensm.h>
+#include <opensm/osm_qos_policy.h>
+
+#define OSM_QOS_POLICY_MAX_LINE_LEN 1024*10
+#define OSM_QOS_POLICY_SL2VL_TABLE_LEN IB_MAX_NUM_VLS
+#define OSM_QOS_POLICY_MAX_VL_NUM IB_MAX_NUM_VLS
+
+typedef struct tmp_parser_struct_t_ {
+ char str[OSM_QOS_POLICY_MAX_LINE_LEN];
+ uint64_t num_pair[2];
+ cl_list_t str_list;
+ cl_list_t num_list;
+ cl_list_t num_pair_list;
+} tmp_parser_struct_t;
+
+static void __parser_tmp_struct_init();
+static void __parser_tmp_struct_reset();
+static void __parser_tmp_struct_destroy();
+
+static char * __parser_strip_white(char * str);
+
+static void __parser_str2uint64(uint64_t * p_val, char * str);
+
+static void __parser_port_group_start();
+static int __parser_port_group_end();
+
+static void __parser_sl2vl_scope_start();
+static int __parser_sl2vl_scope_end();
+
+static void __parser_vlarb_scope_start();
+static int __parser_vlarb_scope_end();
+
+static void __parser_qos_level_start();
+static int __parser_qos_level_end();
+
+static void __parser_match_rule_start();
+static int __parser_match_rule_end();
+
+static void __parser_ulp_match_rule_start();
+static int __parser_ulp_match_rule_end();
+
+static void __pkey_rangelist2rangearr(
+ cl_list_t * p_list,
+ uint64_t ** * p_arr,
+ unsigned * p_arr_len);
+
+static void __rangelist2rangearr(
+ cl_list_t * p_list,
+ uint64_t ** * p_arr,
+ unsigned * p_arr_len);
+
+static void __merge_rangearr(
+ uint64_t ** range_arr_1,
+ unsigned range_len_1,
+ uint64_t ** range_arr_2,
+ unsigned range_len_2,
+ uint64_t ** * p_arr,
+ unsigned * p_arr_len );
+
+static void __parser_add_port_to_port_map(
+ cl_qmap_t * p_map,
+ osm_physp_t * p_physp);
+
+static void __parser_add_guid_range_to_port_map(
+ cl_qmap_t * p_map,
+ uint64_t ** range_arr,
+ unsigned range_len);
+
+static void __parser_add_pkey_range_to_port_map(
+ cl_qmap_t * p_map,
+ uint64_t ** range_arr,
+ unsigned range_len);
+
+static void __parser_add_partition_list_to_port_map(
+ cl_qmap_t * p_map,
+ cl_list_t * p_list);
+
+static void __parser_add_map_to_port_map(
+ cl_qmap_t * p_dmap,
+ cl_map_t * p_smap);
+
+static int __validate_pkeys(
+ uint64_t ** range_arr,
+ unsigned range_len,
+ boolean_t is_ipoib);
+
+static void __setup_simple_qos_levels();
+static void __clear_simple_qos_levels();
+static void __setup_ulp_match_rules();
+static void __process_ulp_match_rules();
+static void yyerror(const char *format, ...);
+
+extern char * yytext;
+extern int yylex (void);
+extern FILE * yyin;
+extern int errno;
+int yyparse();
+
+#define RESET_BUFFER __parser_tmp_struct_reset()
+
+tmp_parser_struct_t tmp_parser_struct;
+
+int column_num;
+int line_num;
+
+osm_qos_policy_t * p_qos_policy = NULL;
+osm_qos_port_group_t * p_current_port_group = NULL;
+osm_qos_sl2vl_scope_t * p_current_sl2vl_scope = NULL;
+osm_qos_vlarb_scope_t * p_current_vlarb_scope = NULL;
+osm_qos_level_t * p_current_qos_level = NULL;
+osm_qos_match_rule_t * p_current_qos_match_rule = NULL;
+osm_log_t * p_qos_parser_osm_log;
+
+/* 16 Simple QoS Levels - one for each SL */
+static osm_qos_level_t osm_qos_policy_simple_qos_levels[16];
+
+/* Default Simple QoS Level */
+osm_qos_level_t __default_simple_qos_level;
+
+/*
+ * List of match rules that will be generated by the
+ * qos-ulp section. These rules are concatenated to
+ * the end of the usual matching rules list at the
+ * end of parsing.
+ */
+static cl_list_t __ulp_match_rules;
+
+/***************************************************/
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#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
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 456 "osm_qos_parser_y.c"
+/* Line 216 of yacc.c. */
+#line 446 "osm_qos_parser_y.c"
#ifdef short
# undef short
@@ -527,14 +517,14 @@
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -615,9 +605,9 @@
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -651,12 +641,12 @@
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) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -889,28 +879,28 @@
"qos_level_end", "qos_level_entries", "qos_level_entry",
"qos_match_rules_section", "qos_match_rules", "qos_match_rule",
"qos_match_rule_start", "qos_match_rule_end", "qos_match_rule_entries",
- "qos_match_rule_entry", "qos_ulp", "$@1", "$@2", "$@3", "$@4", "$@5",
- "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12",
- "qos_ulp_type_any_service", "qos_ulp_type_any_pkey",
- "qos_ulp_type_any_target_port_guid", "qos_ulp_type_sdp_default",
- "qos_ulp_type_sdp_port", "qos_ulp_type_rds_default",
- "qos_ulp_type_rds_port", "qos_ulp_type_iser_default",
- "qos_ulp_type_iser_port", "qos_ulp_type_srp_guid",
- "qos_ulp_type_ipoib_default", "qos_ulp_type_ipoib_pkey", "qos_ulp_sl",
- "port_group_name", "port_group_name_start", "port_group_use",
- "port_group_use_start", "port_group_port_name",
- "port_group_port_name_start", "port_group_port_guid",
- "port_group_port_guid_start", "port_group_pkey", "port_group_pkey_start",
- "port_group_partition", "port_group_partition_start",
- "port_group_node_type", "port_group_node_type_start",
- "port_group_node_type_list", "node_type_item", "node_type_ca",
- "node_type_switch", "node_type_router", "node_type_all",
- "node_type_self", "vlarb_scope_group", "vlarb_scope_group_start",
- "vlarb_scope_across", "vlarb_scope_across_start",
- "vlarb_scope_vlarb_high_limit", "vlarb_scope_vlarb_high_limit_start",
- "vlarb_scope_vlarb_high", "vlarb_scope_vlarb_high_start",
- "vlarb_scope_vlarb_low", "vlarb_scope_vlarb_low_start",
- "sl2vl_scope_group", "sl2vl_scope_group_start", "sl2vl_scope_across",
+ "qos_match_rule_entry", "qos_ulp", "@1", "@2", "@3", "@4", "@5", "@6",
+ "@7", "@8", "@9", "@10", "@11", "@12", "qos_ulp_type_any_service",
+ "qos_ulp_type_any_pkey", "qos_ulp_type_any_target_port_guid",
+ "qos_ulp_type_sdp_default", "qos_ulp_type_sdp_port",
+ "qos_ulp_type_rds_default", "qos_ulp_type_rds_port",
+ "qos_ulp_type_iser_default", "qos_ulp_type_iser_port",
+ "qos_ulp_type_srp_guid", "qos_ulp_type_ipoib_default",
+ "qos_ulp_type_ipoib_pkey", "qos_ulp_sl", "port_group_name",
+ "port_group_name_start", "port_group_use", "port_group_use_start",
+ "port_group_port_name", "port_group_port_name_start",
+ "port_group_port_guid", "port_group_port_guid_start", "port_group_pkey",
+ "port_group_pkey_start", "port_group_partition",
+ "port_group_partition_start", "port_group_node_type",
+ "port_group_node_type_start", "port_group_node_type_list",
+ "node_type_item", "node_type_ca", "node_type_switch", "node_type_router",
+ "node_type_all", "node_type_self", "vlarb_scope_group",
+ "vlarb_scope_group_start", "vlarb_scope_across",
+ "vlarb_scope_across_start", "vlarb_scope_vlarb_high_limit",
+ "vlarb_scope_vlarb_high_limit_start", "vlarb_scope_vlarb_high",
+ "vlarb_scope_vlarb_high_start", "vlarb_scope_vlarb_low",
+ "vlarb_scope_vlarb_low_start", "sl2vl_scope_group",
+ "sl2vl_scope_group_start", "sl2vl_scope_across",
"sl2vl_scope_across_start", "sl2vl_scope_across_from",
"sl2vl_scope_across_from_start", "sl2vl_scope_across_to",
"sl2vl_scope_across_to_start", "sl2vl_scope_from",
@@ -1426,20 +1416,17 @@
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -1473,11 +1460,11 @@
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1757,8 +1744,10 @@
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1774,10 +1763,11 @@
#endif /* ! YYPARSE_PARAM */
-/* The lookahead symbol. */
+
+/* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -1785,9 +1775,9 @@
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1811,39 +1801,14 @@
#endif
#endif
{
-
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* 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. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
-
+
+ int yystate;
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;
-
+ /* 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];
@@ -1851,28 +1816,51 @@
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ 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 semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
/* 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;
@@ -1902,6 +1890,7 @@
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
@@ -1909,6 +1898,7 @@
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1931,8 +1921,9 @@
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1943,6 +1934,7 @@
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1951,9 +1943,6 @@
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
- if (yystate == YYFINAL)
- YYACCEPT;
goto yybackup;
@@ -1963,16 +1952,16 @@
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
-
- /* First try to decide what to do without reference to lookahead token. */
+ look-ahead token if we need one and don't already have one. */
+
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
-
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* Not known => get a look-ahead token if don't already have one. */
+
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -2004,16 +1993,20 @@
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -2053,8 +2046,6 @@
switch (yyn)
{
case 17:
-
-/* Line 1455 of yacc.c */
#line 354 "osm_qos_parser_y.y"
{
__parser_port_group_start();
@@ -2062,8 +2053,6 @@
break;
case 18:
-
-/* Line 1455 of yacc.c */
#line 359 "osm_qos_parser_y.y"
{
if ( __parser_port_group_end() )
@@ -2072,8 +2061,6 @@
break;
case 36:
-
-/* Line 1455 of yacc.c */
#line 422 "osm_qos_parser_y.y"
{
__parser_vlarb_scope_start();
@@ -2081,8 +2068,6 @@
break;
case 37:
-
-/* Line 1455 of yacc.c */
#line 427 "osm_qos_parser_y.y"
{
if ( __parser_vlarb_scope_end() )
@@ -2091,8 +2076,6 @@
break;
case 49:
-
-/* Line 1455 of yacc.c */
#line 468 "osm_qos_parser_y.y"
{
__parser_sl2vl_scope_start();
@@ -2100,8 +2083,6 @@
break;
case 50:
-
-/* Line 1455 of yacc.c */
#line 473 "osm_qos_parser_y.y"
{
if ( __parser_sl2vl_scope_end() )
@@ -2110,8 +2091,6 @@
break;
case 64:
-
-/* Line 1455 of yacc.c */
#line 539 "osm_qos_parser_y.y"
{
__parser_qos_level_start();
@@ -2119,8 +2098,6 @@
break;
case 65:
-
-/* Line 1455 of yacc.c */
#line 544 "osm_qos_parser_y.y"
{
if ( __parser_qos_level_end() )
@@ -2129,8 +2106,6 @@
break;
case 80:
-
-/* Line 1455 of yacc.c */
#line 593 "osm_qos_parser_y.y"
{
__parser_match_rule_start();
@@ -2138,8 +2113,6 @@
break;
case 81:
-
-/* Line 1455 of yacc.c */
#line 598 "osm_qos_parser_y.y"
{
if ( __parser_match_rule_end() )
@@ -2148,8 +2121,6 @@
break;
case 91:
-
-/* Line 1455 of yacc.c */
#line 636 "osm_qos_parser_y.y"
{
/* parsing default ulp rule: "default: num" */
@@ -2171,8 +2142,6 @@
break;
case 92:
-
-/* Line 1455 of yacc.c */
#line 654 "osm_qos_parser_y.y"
{
/* "any, service-id ... : sl" - one instance of list of ranges */
@@ -2197,8 +2166,6 @@
break;
case 94:
-
-/* Line 1455 of yacc.c */
#line 675 "osm_qos_parser_y.y"
{
/* "any, pkey ... : sl" - one instance of list of ranges */
@@ -2223,8 +2190,6 @@
break;
case 96:
-
-/* Line 1455 of yacc.c */
#line 696 "osm_qos_parser_y.y"
{
/* any, target-port-guid ... : sl */
@@ -2263,8 +2228,6 @@
break;
case 98:
-
-/* Line 1455 of yacc.c */
#line 731 "osm_qos_parser_y.y"
{
/* "sdp : sl" - default SL for SDP */
@@ -2281,8 +2244,6 @@
break;
case 100:
-
-/* Line 1455 of yacc.c */
#line 744 "osm_qos_parser_y.y"
{
/* sdp with port numbers */
@@ -2319,8 +2280,6 @@
break;
case 102:
-
-/* Line 1455 of yacc.c */
#line 777 "osm_qos_parser_y.y"
{
/* "rds : sl" - default SL for RDS */
@@ -2337,8 +2296,6 @@
break;
case 104:
-
-/* Line 1455 of yacc.c */
#line 790 "osm_qos_parser_y.y"
{
/* rds with port numbers */
@@ -2375,8 +2332,6 @@
break;
case 106:
-
-/* Line 1455 of yacc.c */
#line 823 "osm_qos_parser_y.y"
{
/* "iSER : sl" - default SL for iSER */
@@ -2393,8 +2348,6 @@
break;
case 108:
-
-/* Line 1455 of yacc.c */
#line 836 "osm_qos_parser_y.y"
{
/* iser with port numbers */
@@ -2431,8 +2384,6 @@
break;
case 110:
-
-/* Line 1455 of yacc.c */
#line 869 "osm_qos_parser_y.y"
{
/* srp with target guids - this rule is similar
@@ -2472,8 +2423,6 @@
break;
case 112:
-
-/* Line 1455 of yacc.c */
#line 905 "osm_qos_parser_y.y"
{
/* ipoib w/o any pkeys (default pkey) */
@@ -2497,8 +2446,6 @@
break;
case 114:
-
-/* Line 1455 of yacc.c */
#line 925 "osm_qos_parser_y.y"
{
/* ipoib with pkeys */
@@ -2532,92 +2479,66 @@
break;
case 116:
-
-/* Line 1455 of yacc.c */
#line 957 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 117:
-
-/* Line 1455 of yacc.c */
#line 960 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 118:
-
-/* Line 1455 of yacc.c */
#line 963 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 119:
-
-/* Line 1455 of yacc.c */
#line 966 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 120:
-
-/* Line 1455 of yacc.c */
#line 969 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 121:
-
-/* Line 1455 of yacc.c */
#line 972 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 122:
-
-/* Line 1455 of yacc.c */
#line 975 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 123:
-
-/* Line 1455 of yacc.c */
#line 978 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 124:
-
-/* Line 1455 of yacc.c */
#line 981 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 125:
-
-/* Line 1455 of yacc.c */
#line 984 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 126:
-
-/* Line 1455 of yacc.c */
#line 987 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 127:
-
-/* Line 1455 of yacc.c */
#line 990 "osm_qos_parser_y.y"
{ __parser_ulp_match_rule_start(); }
break;
case 128:
-
-/* Line 1455 of yacc.c */
#line 993 "osm_qos_parser_y.y"
{
/* get the SL for ULP rules */
@@ -2648,8 +2569,6 @@
break;
case 129:
-
-/* Line 1455 of yacc.c */
#line 1032 "osm_qos_parser_y.y"
{
/* 'name' of 'port-group' - one instance */
@@ -2675,8 +2594,6 @@
break;
case 130:
-
-/* Line 1455 of yacc.c */
#line 1055 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2684,8 +2601,6 @@
break;
case 131:
-
-/* Line 1455 of yacc.c */
#line 1060 "osm_qos_parser_y.y"
{
/* 'use' of 'port-group' - one instance */
@@ -2711,8 +2626,6 @@
break;
case 132:
-
-/* Line 1455 of yacc.c */
#line 1083 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2720,8 +2633,6 @@
break;
case 133:
-
-/* Line 1455 of yacc.c */
#line 1088 "osm_qos_parser_y.y"
{
/* 'port-name' in 'port-group' - any num of instances */
@@ -2790,8 +2701,6 @@
break;
case 134:
-
-/* Line 1455 of yacc.c */
#line 1154 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2799,8 +2708,6 @@
break;
case 135:
-
-/* Line 1455 of yacc.c */
#line 1159 "osm_qos_parser_y.y"
{
/* 'port-guid' in 'port-group' - any num of instances */
@@ -2823,8 +2730,6 @@
break;
case 136:
-
-/* Line 1455 of yacc.c */
#line 1179 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2832,8 +2737,6 @@
break;
case 137:
-
-/* Line 1455 of yacc.c */
#line 1184 "osm_qos_parser_y.y"
{
/* 'pkey' in 'port-group' - any num of instances */
@@ -2856,8 +2759,6 @@
break;
case 138:
-
-/* Line 1455 of yacc.c */
#line 1204 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2865,8 +2766,6 @@
break;
case 139:
-
-/* Line 1455 of yacc.c */
#line 1209 "osm_qos_parser_y.y"
{
/* 'partition' in 'port-group' - any num of instances */
@@ -2877,8 +2776,6 @@
break;
case 140:
-
-/* Line 1455 of yacc.c */
#line 1217 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2886,8 +2783,6 @@
break;
case 141:
-
-/* Line 1455 of yacc.c */
#line 1222 "osm_qos_parser_y.y"
{
/* 'node-type' in 'port-group' - any num of instances */
@@ -2895,8 +2790,6 @@
break;
case 142:
-
-/* Line 1455 of yacc.c */
#line 1227 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2904,8 +2797,6 @@
break;
case 150:
-
-/* Line 1455 of yacc.c */
#line 1243 "osm_qos_parser_y.y"
{
p_current_port_group->node_types |=
@@ -2914,8 +2805,6 @@
break;
case 151:
-
-/* Line 1455 of yacc.c */
#line 1249 "osm_qos_parser_y.y"
{
p_current_port_group->node_types |=
@@ -2924,8 +2813,6 @@
break;
case 152:
-
-/* Line 1455 of yacc.c */
#line 1255 "osm_qos_parser_y.y"
{
p_current_port_group->node_types |=
@@ -2934,8 +2821,6 @@
break;
case 153:
-
-/* Line 1455 of yacc.c */
#line 1261 "osm_qos_parser_y.y"
{
p_current_port_group->node_types |=
@@ -2946,8 +2831,6 @@
break;
case 154:
-
-/* Line 1455 of yacc.c */
#line 1269 "osm_qos_parser_y.y"
{
osm_port_t * p_osm_port =
@@ -2961,8 +2844,6 @@
break;
case 155:
-
-/* Line 1455 of yacc.c */
#line 1291 "osm_qos_parser_y.y"
{
/* 'group' in 'vlarb-scope' - any num of instances */
@@ -2982,8 +2863,6 @@
break;
case 156:
-
-/* Line 1455 of yacc.c */
#line 1308 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -2991,8 +2870,6 @@
break;
case 157:
-
-/* Line 1455 of yacc.c */
#line 1313 "osm_qos_parser_y.y"
{
/* 'across' in 'vlarb-scope' - any num of instances */
@@ -3012,8 +2889,6 @@
break;
case 158:
-
-/* Line 1455 of yacc.c */
#line 1330 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3021,8 +2896,6 @@
break;
case 159:
-
-/* Line 1455 of yacc.c */
#line 1335 "osm_qos_parser_y.y"
{
/* 'vl-high-limit' in 'vlarb-scope' - one instance of one number */
@@ -3043,8 +2916,6 @@
break;
case 160:
-
-/* Line 1455 of yacc.c */
#line 1353 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3052,8 +2923,6 @@
break;
case 161:
-
-/* Line 1455 of yacc.c */
#line 1358 "osm_qos_parser_y.y"
{
/* 'vlarb-high' in 'vlarb-scope' - list of pairs of numbers with ':' and ',' */
@@ -3073,8 +2942,6 @@
break;
case 162:
-
-/* Line 1455 of yacc.c */
#line 1375 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3082,8 +2949,6 @@
break;
case 163:
-
-/* Line 1455 of yacc.c */
#line 1380 "osm_qos_parser_y.y"
{
/* 'vlarb-low' in 'vlarb-scope' - list of pairs of numbers with ':' and ',' */
@@ -3103,8 +2968,6 @@
break;
case 164:
-
-/* Line 1455 of yacc.c */
#line 1397 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3112,8 +2975,6 @@
break;
case 165:
-
-/* Line 1455 of yacc.c */
#line 1413 "osm_qos_parser_y.y"
{
/* 'group' in 'sl2vl-scope' - any num of instances */
@@ -3133,8 +2994,6 @@
break;
case 166:
-
-/* Line 1455 of yacc.c */
#line 1430 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3142,8 +3001,6 @@
break;
case 167:
-
-/* Line 1455 of yacc.c */
#line 1435 "osm_qos_parser_y.y"
{
/* 'across' in 'sl2vl-scope' - any num of instances */
@@ -3165,8 +3022,6 @@
break;
case 168:
-
-/* Line 1455 of yacc.c */
#line 1454 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3174,8 +3029,6 @@
break;
case 169:
-
-/* Line 1455 of yacc.c */
#line 1459 "osm_qos_parser_y.y"
{
/* 'across-from' in 'sl2vl-scope' - any num of instances */
@@ -3195,8 +3048,6 @@
break;
case 170:
-
-/* Line 1455 of yacc.c */
#line 1476 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3204,8 +3055,6 @@
break;
case 171:
-
-/* Line 1455 of yacc.c */
#line 1481 "osm_qos_parser_y.y"
{
/* 'across-to' in 'sl2vl-scope' - any num of instances */
@@ -3226,8 +3075,6 @@
break;
case 172:
-
-/* Line 1455 of yacc.c */
#line 1499 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3235,8 +3082,6 @@
break;
case 173:
-
-/* Line 1455 of yacc.c */
#line 1504 "osm_qos_parser_y.y"
{
/* 'from' in 'sl2vl-scope' - any num of instances */
@@ -3244,8 +3089,6 @@
break;
case 174:
-
-/* Line 1455 of yacc.c */
#line 1509 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3253,8 +3096,6 @@
break;
case 175:
-
-/* Line 1455 of yacc.c */
#line 1514 "osm_qos_parser_y.y"
{
/* 'to' in 'sl2vl-scope' - any num of instances */
@@ -3262,8 +3103,6 @@
break;
case 176:
-
-/* Line 1455 of yacc.c */
#line 1519 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3271,8 +3110,6 @@
break;
case 179:
-
-/* Line 1455 of yacc.c */
#line 1528 "osm_qos_parser_y.y"
{
int i;
@@ -3282,8 +3119,6 @@
break;
case 182:
-
-/* Line 1455 of yacc.c */
#line 1539 "osm_qos_parser_y.y"
{
int i;
@@ -3293,8 +3128,6 @@
break;
case 183:
-
-/* Line 1455 of yacc.c */
#line 1546 "osm_qos_parser_y.y"
{
int i;
@@ -3329,8 +3162,6 @@
break;
case 184:
-
-/* Line 1455 of yacc.c */
#line 1578 "osm_qos_parser_y.y"
{
int i;
@@ -3365,8 +3196,6 @@
break;
case 185:
-
-/* Line 1455 of yacc.c */
#line 1611 "osm_qos_parser_y.y"
{
/* 'sl2vl-table' - one instance of exactly
@@ -3412,8 +3241,6 @@
break;
case 186:
-
-/* Line 1455 of yacc.c */
#line 1654 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3421,8 +3248,6 @@
break;
case 187:
-
-/* Line 1455 of yacc.c */
#line 1671 "osm_qos_parser_y.y"
{
/* 'name' of 'qos-level' - one instance */
@@ -3448,8 +3273,6 @@
break;
case 188:
-
-/* Line 1455 of yacc.c */
#line 1694 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3457,8 +3280,6 @@
break;
case 189:
-
-/* Line 1455 of yacc.c */
#line 1699 "osm_qos_parser_y.y"
{
/* 'use' of 'qos-level' - one instance */
@@ -3484,8 +3305,6 @@
break;
case 190:
-
-/* Line 1455 of yacc.c */
#line 1722 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3493,8 +3312,6 @@
break;
case 191:
-
-/* Line 1455 of yacc.c */
#line 1727 "osm_qos_parser_y.y"
{
/* 'sl' in 'qos-level' - one instance */
@@ -3517,8 +3334,6 @@
break;
case 192:
-
-/* Line 1455 of yacc.c */
#line 1747 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3526,8 +3341,6 @@
break;
case 193:
-
-/* Line 1455 of yacc.c */
#line 1752 "osm_qos_parser_y.y"
{
/* 'mtu-limit' in 'qos-level' - one instance */
@@ -3550,8 +3363,6 @@
break;
case 194:
-
-/* Line 1455 of yacc.c */
#line 1772 "osm_qos_parser_y.y"
{
/* 'mtu-limit' in 'qos-level' - one instance */
@@ -3560,8 +3371,6 @@
break;
case 195:
-
-/* Line 1455 of yacc.c */
#line 1778 "osm_qos_parser_y.y"
{
/* 'rate-limit' in 'qos-level' - one instance */
@@ -3584,8 +3393,6 @@
break;
case 196:
-
-/* Line 1455 of yacc.c */
#line 1798 "osm_qos_parser_y.y"
{
/* 'rate-limit' in 'qos-level' - one instance */
@@ -3594,8 +3401,6 @@
break;
case 197:
-
-/* Line 1455 of yacc.c */
#line 1804 "osm_qos_parser_y.y"
{
/* 'packet-life' in 'qos-level' - one instance */
@@ -3618,8 +3423,6 @@
break;
case 198:
-
-/* Line 1455 of yacc.c */
#line 1824 "osm_qos_parser_y.y"
{
/* 'packet-life' in 'qos-level' - one instance */
@@ -3628,8 +3431,6 @@
break;
case 199:
-
-/* Line 1455 of yacc.c */
#line 1830 "osm_qos_parser_y.y"
{
/* 'path-bits' in 'qos-level' - any num of instances */
@@ -3667,8 +3468,6 @@
break;
case 200:
-
-/* Line 1455 of yacc.c */
#line 1865 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3676,8 +3475,6 @@
break;
case 201:
-
-/* Line 1455 of yacc.c */
#line 1870 "osm_qos_parser_y.y"
{
/* 'pkey' in 'qos-level' - num of instances of list of ranges */
@@ -3713,8 +3510,6 @@
break;
case 202:
-
-/* Line 1455 of yacc.c */
#line 1903 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3722,8 +3517,6 @@
break;
case 203:
-
-/* Line 1455 of yacc.c */
#line 1920 "osm_qos_parser_y.y"
{
/* 'use' of 'qos-match-rule' - one instance */
@@ -3749,8 +3542,6 @@
break;
case 204:
-
-/* Line 1455 of yacc.c */
#line 1943 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3758,8 +3549,6 @@
break;
case 205:
-
-/* Line 1455 of yacc.c */
#line 1948 "osm_qos_parser_y.y"
{
/* 'qos-class' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3796,8 +3585,6 @@
break;
case 206:
-
-/* Line 1455 of yacc.c */
#line 1982 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3805,8 +3592,6 @@
break;
case 207:
-
-/* Line 1455 of yacc.c */
#line 1987 "osm_qos_parser_y.y"
{
/* 'source' in 'qos-match-rule' - text */
@@ -3826,8 +3611,6 @@
break;
case 208:
-
-/* Line 1455 of yacc.c */
#line 2004 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3835,8 +3618,6 @@
break;
case 209:
-
-/* Line 1455 of yacc.c */
#line 2009 "osm_qos_parser_y.y"
{
/* 'destination' in 'qos-match-rule' - text */
@@ -3856,8 +3637,6 @@
break;
case 210:
-
-/* Line 1455 of yacc.c */
#line 2026 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3865,8 +3644,6 @@
break;
case 211:
-
-/* Line 1455 of yacc.c */
#line 2031 "osm_qos_parser_y.y"
{
/* 'qos-level-name' in 'qos-match-rule' - single string */
@@ -3892,8 +3669,6 @@
break;
case 212:
-
-/* Line 1455 of yacc.c */
#line 2054 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3901,8 +3676,6 @@
break;
case 213:
-
-/* Line 1455 of yacc.c */
#line 2059 "osm_qos_parser_y.y"
{
/* 'service-id' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3938,8 +3711,6 @@
break;
case 214:
-
-/* Line 1455 of yacc.c */
#line 2092 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3947,8 +3718,6 @@
break;
case 215:
-
-/* Line 1455 of yacc.c */
#line 2097 "osm_qos_parser_y.y"
{
/* 'pkey' in 'qos-match-rule' - num of instances of list of ranges */
@@ -3984,8 +3753,6 @@
break;
case 216:
-
-/* Line 1455 of yacc.c */
#line 2130 "osm_qos_parser_y.y"
{
RESET_BUFFER;
@@ -3993,8 +3760,6 @@
break;
case 217:
-
-/* Line 1455 of yacc.c */
#line 2141 "osm_qos_parser_y.y"
{
cl_list_insert_tail(&tmp_parser_struct.str_list,
@@ -4004,8 +3769,6 @@
break;
case 220:
-
-/* Line 1455 of yacc.c */
#line 2152 "osm_qos_parser_y.y"
{
strcat(tmp_parser_struct.str,(yyvsp[(1) - (1)]));
@@ -4014,8 +3777,6 @@
break;
case 226:
-
-/* Line 1455 of yacc.c */
#line 2172 "osm_qos_parser_y.y"
{
uint64_t * p_num = (uint64_t*)malloc(sizeof(uint64_t));
@@ -4026,8 +3787,6 @@
break;
case 227:
-
-/* Line 1455 of yacc.c */
#line 2180 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4038,8 +3797,6 @@
break;
case 228:
-
-/* Line 1455 of yacc.c */
#line 2186 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4050,8 +3807,6 @@
break;
case 229:
-
-/* Line 1455 of yacc.c */
#line 2194 "osm_qos_parser_y.y"
{
__parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -4060,8 +3815,6 @@
break;
case 230:
-
-/* Line 1455 of yacc.c */
#line 2200 "osm_qos_parser_y.y"
{
__parser_str2uint64(&tmp_parser_struct.num_pair[1],(yyvsp[(1) - (1)]));
@@ -4070,8 +3823,6 @@
break;
case 232:
-
-/* Line 1455 of yacc.c */
#line 2209 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4082,8 +3833,6 @@
break;
case 233:
-
-/* Line 1455 of yacc.c */
#line 2215 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4100,8 +3849,6 @@
break;
case 234:
-
-/* Line 1455 of yacc.c */
#line 2227 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4118,8 +3865,6 @@
break;
case 235:
-
-/* Line 1455 of yacc.c */
#line 2239 "osm_qos_parser_y.y"
{
uint64_t * num_pair = (uint64_t*)malloc(sizeof(uint64_t)*2);
@@ -4130,8 +3875,6 @@
break;
case 236:
-
-/* Line 1455 of yacc.c */
#line 2247 "osm_qos_parser_y.y"
{
__parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -4141,8 +3884,6 @@
break;
case 237:
-
-/* Line 1455 of yacc.c */
#line 2254 "osm_qos_parser_y.y"
{
__parser_str2uint64(&tmp_parser_struct.num_pair[0],(yyvsp[(1) - (1)]));
@@ -4151,8 +3892,6 @@
break;
case 238:
-
-/* Line 1455 of yacc.c */
#line 2260 "osm_qos_parser_y.y"
{
__parser_str2uint64(&tmp_parser_struct.num_pair[1],(yyvsp[(1) - (1)]));
@@ -4161,9 +3900,8 @@
break;
-
-/* Line 1455 of yacc.c */
-#line 4167 "osm_qos_parser_y.c"
+/* Line 1267 of yacc.c. */
+#line 3905 "osm_qos_parser_y.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -4173,6 +3911,7 @@
YY_STACK_PRINT (yyss, yyssp);
*++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
@@ -4238,7 +3977,7 @@
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -4255,7 +3994,7 @@
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -4312,6 +4051,9 @@
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -4336,7 +4078,7 @@
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -4347,7 +4089,7 @@
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
@@ -4373,8 +4115,6 @@
}
-
-/* Line 1675 of yacc.c */
#line 2266 "osm_qos_parser_y.y"
More information about the Pkg-ofed-commits
mailing list