@@ -1,3 +1,8 @@ +2008/05/30 19:20:19 phil +Hopefully fixed a regression introduced when allowing ctor %MethodCode to +indicate that the next signature should be tried. + + 2008/05/20 16:54:49 phil Released as v4.7.6. ChangeLog @@ -1,35 +1,35 @@ -RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.7.6 +RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.7.7 1. This LICENSE AGREEMENT is between Riverbank Computing Limited ("Riverbank"), and the Individual or Organization ("Licensee") accessing -and otherwise using SIP 4.7.6 software in source or binary form and its +and otherwise using SIP 4.7.7 software in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, Riverbank hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare -derivative works, distribute, and otherwise use SIP 4.7.6 alone or in +derivative works, distribute, and otherwise use SIP 4.7.7 alone or in any derivative version, provided, however, that Riverbank's License Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2008 Riverbank Computing Limited; All Rights Reserved" are retained in -SIP 4.7.6 alone or in any derivative version prepared by Licensee. +SIP 4.7.7 alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on -or incorporates SIP 4.7.6 or any part thereof, and wants to make +or incorporates SIP 4.7.7 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of -the changes made to SIP 4.7.6. +the changes made to SIP 4.7.7. -4. Riverbank is making SIP 4.7.6 available to Licensee on an "AS IS" +4. Riverbank is making SIP 4.7.7 available to Licensee on an "AS IS" basis. RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.7.6 WILL NOT +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.7.7 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF -SIP 4.7.6 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.7.6, +SIP 4.7.7 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.7.7, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material @@ -41,5 +41,5 @@ and Licensee. This License Agreement does not grant permission to use Riverbank trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. -8. By copying, installing or otherwise using SIP 4.7.6, Licensee +8. By copying, installing or otherwise using SIP 4.7.7, Licensee agrees to be bound by the terms and conditions of this License Agreement. LICENSE @@ -1,34 +1,3 @@ -- sip generated files aren't "unique" enough for a wildcard in an ignore file - -- calling methods on an object before its __init__ has been called results in - a slightly misleading exception: - "RuntimeError: underlying C/C++ object has been deleted" - -- the documentation for /Transfer/ and its related annotations is weak - - MenuItem* Menu::CreateItem(const char* title) - - how do I make MenuItem owned by Menu? - - does the /Transfer/ family work for %MethodCode functions - -- Make all QT features removable at compiletime - - sipWrapperType has a void *qt_qobject - -- use argument names instead of a0, a1, etc., in %MethodCode% functions (this - might be a nice side effect of keyword args support, since named args will - be necessary for that - -- make "class is abstract" errors show more detailed information about why the - class is abstract, and what you can do about it - -- some exceptions from SIP aren't as helpful as they could be - - type errors: - instead of "TypeError: argument 3 of wxSizer.Add() has an invalid type" - we could have "TypeError: argument 3 of wxSizer.Add() expected %r but you gave %r" - - attribute errors: (done) - instead of "AttributeError: r" - we could have "AttributeError: 'Foo' object has no attribute 'r'" - ---- - 1. Make the parser aware of Python keywords so they can't be used as member function names. TODO @@ -22,8 +22,8 @@ import siputils # Initialise the globals. -sip_version = 0x040706 -sip_version_str = "4.7.6" +sip_version = 0x040707 +sip_version_str = "4.7.7-snapshot-20080530" py_version = sys.hexversion >> 8 plat_py_site_dir = None plat_py_inc_dir = None @@ -222,10 +222,7 @@ def set_platform_directories(): plat_py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename()) if sys.platform == "win32": - if sysconfig.python_build: - plat_py_lib_dir = sysconfig.project_base - else: - plat_py_lib_dir = sys.prefix + "\\libs" + plat_py_lib_dir = sys.prefix + "\\libs" plat_bin_dir = sys.exec_prefix plat_sip_dir = sys.prefix + "\\sip" else: configure.py @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>SIP - A Tool for Generating Python Bindings for C and C++ Libraries</title> <meta name="copyright" content="Copyright (c) 2008 Riverbank Computing Limited" /> <style type="text/css"> @@ -301,7 +301,7 @@ ul.auto-toc { <tr><th class="docinfo-name">Contact:</th> <td><a class="first last reference" href="mailto:info&#64;riverbankcomputing.com">info&#64;riverbankcomputing.com</a></td></tr> <tr><th class="docinfo-name">Version:</th> -<td>4.7.6</td></tr> +<td>4.7.7-snapshot-20080530</td></tr> <tr><th class="docinfo-name">Copyright:</th> <td>Copyright (c) 2008 Riverbank Computing Limited</td></tr> </tbody> @@ -557,7 +557,7 @@ ul.auto-toc { </div> <div class="section"> <h1><a class="toc-backref" href="#id24" id="introduction" name="introduction">1&nbsp;&nbsp;&nbsp;Introduction</a></h1> -<p>This is the reference guide for SIP 4.7.6. SIP is a tool for +<p>This is the reference guide for SIP 4.7.7-snapshot-20080530. SIP is a tool for automatically generating <a class="reference" href="http://www.python.org">Python</a> bindings for C and C++ libraries. SIP was originally developed in 1998 for <a class="reference" href="http://www.riverbankcomputing.com/software/pyqt/">PyQt</a> - the Python @@ -2947,11 +2947,13 @@ specified. The variable is a pointer to the Python object that wraps the argument.</dd> <dt><em>type</em> *sipCpp</dt> <dd><p class="first">If the directive is used in the context of a class constructor then this -must be set by the handwritten code to the constructed instance. If the -directive is used in the context of a method (but not the standard binary -operator methods, e.g. <tt class="docutils literal"><span class="pre">__add__</span></tt>) or a destructor then this is a pointer -to the C structure or C++ class instance. Its <em>type</em> is a pointer to the -structure or class.</p> +must be set by the handwritten code to the constructed instance. If it is +set to <tt class="docutils literal"><span class="pre">0</span></tt> and no Python exception is raised then SIP will continue to +try other Python signatures.</p> +<p>If the directive is used in the context of a method (but not the standard +binary operator methods, e.g. <tt class="docutils literal"><span class="pre">__add__</span></tt>) or a destructor then this is a +pointer to the C structure or C++ class instance.</p> +<p>Its <em>type</em> is a pointer to the structure or class.</p> <p class="last">Standard binary operator methods follow the same convention as global functions and instead define two arguments called <tt class="docutils literal"><span class="pre">a0</span></tt> and <tt class="docutils literal"><span class="pre">a1</span></tt>.</p> </dd> doc/sipref.html @@ -7,7 +7,7 @@ ----------------- :Contact: info@riverbankcomputing.com -:Version: 4.7.6 +:Version: 4.7.7-snapshot-20080530 :Copyright: Copyright (c) 2008 Riverbank Computing Limited .. contents:: @@ -17,7 +17,7 @@ Introduction ============ -This is the reference guide for SIP 4.7.6. SIP is a tool for +This is the reference guide for SIP 4.7.7-snapshot-20080530. SIP is a tool for automatically generating `Python <http://www.python.org>`__ bindings for C and C++ libraries. SIP was originally developed in 1998 for `PyQt <http://www.riverbankcomputing.com/software/pyqt/>`__ - the Python @@ -2614,11 +2614,15 @@ PyObject \*a0Wrapper *type* \*sipCpp If the directive is used in the context of a class constructor then this - must be set by the handwritten code to the constructed instance. If the - directive is used in the context of a method (but not the standard binary - operator methods, e.g. ``__add__``) or a destructor then this is a pointer - to the C structure or C++ class instance. Its *type* is a pointer to the - structure or class. + must be set by the handwritten code to the constructed instance. If it is + set to ``0`` and no Python exception is raised then SIP will continue to + try other Python signatures. + + If the directive is used in the context of a method (but not the standard + binary operator methods, e.g. ``__add__``) or a destructor then this is a + pointer to the C structure or C++ class instance. + + Its *type* is a pointer to the structure or class. Standard binary operator methods follow the same convention as global functions and instead define two arguments called ``a0`` and ``a1``. doc/sipref.txt @@ -2,12 +2,12 @@ * The code generator module for SIP. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -55,7 +55,7 @@ static int generating_c; /* Set if generating C. */ static int release_gil; /* Set if always releasing the GIL. */ static const char *prcode_last = NULL; /* The last prcode format string. */ static int prcode_xml = FALSE; /* Set if prcode is XML aware. */ -static int thread_check = 0; + static void generateDocumentation(sipSpec *pt, const char *docFile); static void generateBuildFile(sipSpec *pt, const char *buildFile, @@ -139,7 +139,6 @@ static void generateBinarySlotCall(classDef *cd, overDef *od, const char *op, int deref, FILE *fp); static void generateNumberSlotCall(overDef *od, char *op, FILE *fp); static void generateVariableHandler(classDef *, varDef *, FILE *); -static void generatePropertyHandler(classDef* context, varDef *, FILE *); static int generateObjToCppConversion(argDef *, FILE *); static void generateVarClassConversion(varDef *, FILE *); static void generateVarMember(varDef *vd, FILE *fp); @@ -237,7 +236,6 @@ void generateCode(sipSpec *pt, char *codeDir, char *buildfile, char *docFile, { exceptions = except; tracing = trace; - thread_check = optThreadChecking(pt); release_gil = releaseGIL; generating_c = pt->genc; @@ -416,10 +414,10 @@ void generateExpression(valueDef *vd, FILE *fp) generateSimpleFunctionCall(vd->u.fcd,fp); break; } - + if (vd->vbinop != '\0') prcode(fp," %c ",vd->vbinop); - + vd = vd->next; } } @@ -607,7 +605,6 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, "#define sipConvertFromConstVoidPtr sipAPI_%s->api_convert_from_const_void_ptr\n" "#define sipConvertFromVoidPtrAndSize sipAPI_%s->api_convert_from_void_ptr_and_size\n" "#define sipConvertFromConstVoidPtrAndSize sipAPI_%s->api_convert_from_const_void_ptr_and_size\n" -"#define sipThreadCheck sipAPI_%s->api_thread_check\n" "#define sipInvokeSlot sipAPI_%s->api_invoke_slot\n" "#define sipParseType sipAPI_%s->api_parse_type\n" "#define sipIsExactWrappedType sipAPI_%s->api_is_exact_wrapped_type\n" @@ -698,7 +695,6 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, ,mname ,mname ,mname - ,mname ,mname); /* The name strings. */ @@ -3383,15 +3379,12 @@ static void generateClassCpp(classDef *cd, sipSpec *pt, FILE *fp) generateAccessFunctions(pt, mod, cd, fp); - /* Generate the variable and property handlers. */ + /* Generate the variable handlers. */ if (hasVarHandlers(cd)) { for (vd = pt->vars; vd != NULL; vd = vd->next) if (vd->ecd == cd && needsHandler(vd)) - if (isProperty(vd)) - generatePropertyHandler(cd, vd, fp); - else - generateVariableHandler(cd, vd, fp); + generateVariableHandler(cd, vd, fp); /* Generate the variable table. */ prcode(fp, @@ -3775,49 +3768,6 @@ static void generateConvertToDefinitions(mappedTypeDef *mtd,classDef *cd, ); } -/* - * Generate a property handler. - */ -static void generatePropertyHandler(classDef* context, varDef *vd, FILE *fp) -{ - prcode(fp, "\n\n"); - if (!generating_c) - prcode(fp, "extern \"C\" {static PyObject *var_%C(PyObject *, PyObject *);}\n" - , vd->fqcname); - prcode(fp, - "static PyObject *var_%C(PyObject *%s,PyObject *sipPy)\n" - "{\n", vd->fqcname, "sipSelf"); // always need self? (isStaticVar(vd) ? "" : "sipSelf")); - - prcode(fp, - " if (sipPy == NULL)\n" - " {\n" - " PyObject* args = PyTuple_New(0);\n" - " PyObject* res = meth_"); - - /* getter */ - prcode(fp, "%s_%s(sipSelf, args);\n", classBaseName(context), vd->getter->cppname); - - prcode(fp, - " Py_DECREF(args);\n" - " return res;\n" - " }\n\n"); - - if (vd->setter != NULL) - { - /* setter */ - prcode(fp, " return meth_"); - prcode(fp, "%s_%s(sipSelf, sipPy);\n", classBaseName(context), vd->setter->cppname); - } - else - { - /* no setter--raise an attribute error */ - prcode(fp, " PyErr_SetString(PyExc_AttributeError, \"%s is a read-only property\"); \n", - vd->pyname->text); - prcode(fp, " return NULL;\n"); - } - - prcode(fp, "}\n\n"); -} /* * Generate a variable handler. @@ -5199,9 +5149,6 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, "{\n" ,classFQCName(cd)); - if (thread_check) - prcode(fp, " if (!sipThreadCheck()) return;\n"); - if (tracing) prcode(fp, " sipTrace(SIP_TRACE_DEALLOCS,\"dealloc_%C()\\n\");\n" @@ -5316,9 +5263,6 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, ,ct->exceptions); } - if (thread_check) - prcode(fp, " if (!sipThreadCheck()) return;\n"); - prcode(fp, " sipCommonCtor(%s,%d);\n" "}\n" @@ -5341,9 +5285,6 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, "\n" ,classFQCName(cd),classFQCName(cd),cd->dtorexceptions); - if (thread_check) - prcode(fp, " if (!sipThreadCheck()) return;\n"); - if (cd->dtorcode != NULL) generateCppCodeBlock(cd->dtorcode,fp); @@ -5390,9 +5331,9 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, } /* Generate the virtual catchers. */ - + virtNr = 0; - + for (vod = cd->vmembers; vod != NULL; vod = vod->next) { overDef *od = &vod->o; @@ -5575,12 +5516,6 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, ,(isConst(od) ? " const" : ""),od->exceptions); } - if (thread_check) - { - prcode(fp, " if (!sipThreadCheck())\n"); - generateVirtHandlerErrorReturn(res,fp); - } - restoreArgs(od->cppsig); saved = *vhd->cppsig; @@ -5675,10 +5610,10 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, generateUnambiguousClass(cd,vod->scope,fp); prcode(fp,"::%O(",od); - + for (a = 0; a < od->cppsig->nrArgs; ++a) prcode(fp,"%sa%d",(a == 0 ? "" : ","),a); - + prcode(fp,");\n" ); @@ -5717,7 +5652,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, ++ad; } - + prcode(fp,");\n" ); @@ -7328,7 +7263,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) prcode(fp, " "); - + prOverloadDecl(fp, cd, od, FALSE); prcode(fp, ";\n"); } @@ -7371,7 +7306,7 @@ void prOverloadDecl(FILE *fp, classDef *context, overDef *od, int defval) normaliseArgs(od->cppsig); generateBaseType(context, &od->cppsig->result, fp); - + prcode(fp, " %O(", od); for (a = 0; a < od->cppsig->nrArgs; ++a) @@ -7389,7 +7324,7 @@ void prOverloadDecl(FILE *fp, classDef *context, overDef *od, int defval) generateExpression(ad->defval, fp); } } - + prcode(fp, ")%s%X", (isConst(od) ? " const" : ""), od->exceptions); restoreArgs(od->cppsig); @@ -8583,9 +8518,6 @@ static void generateTypeInit(classDef *cd, FILE *fp) " sipTrace(SIP_TRACE_INITS,\"init_%C()\\n\");\n" ,classFQCName(cd)); - if (thread_check) - prcode(fp, " if (!sipThreadCheck()) return NULL;\n"); - /* * Generate the code that parses the Python arguments and calls the * correct constructor. @@ -8660,17 +8592,17 @@ static int countVirtuals(classDef *cd) { int nrvirts; virtOverDef *vod; - + nrvirts = 0; - + for (vod = cd->vmembers; vod != NULL; vod = vod->next) if (!isPrivate(&vod->o)) ++nrvirts; - + return nrvirts; } - + /* * Generate the try block for a call. */ @@ -8997,9 +8929,6 @@ static void generateFunction(memberDef *md, overDef *overs, classDef *cd, "\n" ,classFQCName(cd),pname); - if (thread_check) - prcode(fp, " if (!sipThreadCheck()) return NULL;\n"); - if (need_args) prcode(fp, " int sipArgsParsed = 0;\n" @@ -10856,13 +10785,18 @@ static FILE *createFile(moduleDef *mod, const char *fname, { int needComment; codeBlock *cb; + time_t now; + + /* Write the header. */ + now = time(NULL); + prcode(fp, "/*\n" " * %s\n" " *\n" -" * Generated by SIP %s" +" * Generated by SIP %s on %s" ,description - ,sipVersion); + ,sipVersion,ctime(&now)); if (mod->copying != NULL) prcode(fp, @@ -11507,9 +11441,6 @@ static int needDealloc(classDef *cd) if (tracing) return TRUE; - if (thread_check) - return TRUE; - if (generating_c) return TRUE; sipgen/gencode.c @@ -9,7 +9,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 34 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -31,7 +31,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -94,12 +94,11 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#if __STDC__ #define YY_USE_CONST -#endif /* defined (__STDC__) */ +#endif /* __STDC__ */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -182,13 +181,11 @@ extern FILE *yyin, *yyout; /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). - * Given that the standard has decreed that size_t exists since 1989, - * I guess we can afford to depend on it. Manoj. */ #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; +typedef unsigned int yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -1139,7 +1136,7 @@ static FILE *openFile(const char *); static void fatallex(char *); -#line 1143 "lexer.c.tmp" +#line 1140 "lexer.c.tmp" #define INITIAL 0 #define code 1 @@ -1201,7 +1198,7 @@ static int input (void ); /* 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 (void) fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1212,7 +1209,7 @@ static int input (void ); 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; \ @@ -1300,7 +1297,7 @@ YY_DECL #line 55 "lexer.l" -#line 1304 "lexer.c.tmp" +#line 1301 "lexer.c.tmp" if ( !(yy_init) ) { @@ -2136,7 +2133,7 @@ YY_RULE_SETUP #line 402 "lexer.l" ECHO; YY_BREAK -#line 2140 "lexer.c.tmp" +#line 2137 "lexer.c.tmp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(code): case YY_STATE_EOF(ccomment): @@ -2369,7 +2366,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), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -2393,14 +2390,6 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -2691,9 +2680,19 @@ static void yy_load_buffer_state (void) yyfree((void *) b ); } -#ifndef __cplusplus +#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 extern int isatty (int ); -#endif /* __cplusplus */ +#endif +#ifdef __cplusplus +} +#endif +#endif /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, @@ -2819,9 +2818,7 @@ static void yyensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -2839,8 +2836,6 @@ static void yyensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2885,7 +2880,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan + * @param str a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use sipgen/lexer.c @@ -2,12 +2,12 @@ * The main module for SIP. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -26,7 +26,7 @@ #define PACKAGE "sip" #endif -#define VERSION "4.7.6" +#define VERSION "4.7.7-snapshot-20080530" /* Global variables - see sip.h for their meaning. */ sipgen/main.c @@ -1,9 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 1.875d. */ -/* 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. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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 @@ -17,24 +15,16 @@ 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. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - 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. + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -46,9 +36,6 @@ /* Identify Bison output. */ #define YYBISON 1 -/* Bison version. */ -#define YYBISON_VERSION "2.3" - /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -170,7 +157,6 @@ TK_ELLIPSIS = 359 }; #endif -/* Tokens. */ #define TK_OPTIONS 258 #define TK_NOEMITTERS 259 #define TK_DOC 260 @@ -382,15 +368,9 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name); # 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 union YYSTYPE +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #line 105 "parser.y" -{ +typedef union YYSTYPE { char qchar; char *text; long number; @@ -409,10 +389,9 @@ typedef union YYSTYPE int boolean; exceptionDef exceptionbase; classDef *klass; -} -/* Line 187 of yacc.c. */ -#line 415 "parser.tab.c" - YYSTYPE; +} YYSTYPE; +/* Line 186 of yacc.c. */ +#line 395 "parser.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -423,171 +402,56 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 428 "parser.tab.c" +/* Line 214 of yacc.c. */ +#line 407 "parser.c" -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif +#if ! defined (yyoverflow) || YYERROR_VERBOSE -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int +# ifndef YYFREE +# define YYFREE free # endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid +# ifndef YYMALLOC +# define YYMALLOC malloc # endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif +# else +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (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 -# endif -# endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) +# if defined (__STDC__) || defined (__cplusplus) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (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__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif +# define YYSIZE_T size_t # endif +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; + short int yyss; YYSTYPE yyvs; }; @@ -597,24 +461,24 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ +# if defined (__GNUC__) && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else # define YYCOPY(To, From, Count) \ do \ { \ - YYSIZE_T yyi; \ + register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif @@ -632,33 +496,39 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (YYID (0)) + while (0) #endif -/* YYFINAL -- State number of the termination state. */ +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short int yysigned_char; +#endif + +/* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ #define YYLAST 1113 -/* YYNTOKENS -- Number of terminals. */ +/* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 127 -/* YYNNTS -- Number of nonterminals. */ +/* YYNNTS -- Number of nonterminals. */ #define YYNNTS 138 -/* YYNRULES -- Number of rules. */ +/* YYNRULES -- Number of rules. */ #define YYNRULES 346 -/* YYNRULES -- Number of states. */ +/* YYNRULES -- Number of states. */ #define YYNSTATES 581 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 359 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -701,7 +571,7 @@ static const yytype_uint8 yytranslate[] = #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const yytype_uint16 yyprhs[] = +static const unsigned short int yyprhs[] = { 0, 0, 3, 5, 8, 9, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, @@ -740,8 +610,8 @@ static const yytype_uint16 yyprhs[] = 955, 957, 961, 962, 967, 968, 970 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int16 yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const short int yyrhs[] = { 128, 0, -1, 129, -1, 128, 129, -1, -1, 130, 131, -1, 165, -1, 163, -1, 164, -1, 133, -1, @@ -844,7 +714,7 @@ static const yytype_int16 yyrhs[] = }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = +static const unsigned short int yyrline[] = { 0, 295, 295, 296, 299, 299, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, @@ -884,9 +754,9 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { "$end", "error", "$undefined", "TK_OPTIONS", "TK_NOEMITTERS", "TK_DOC", @@ -945,7 +815,7 @@ static const char *const yytname[] = # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -964,7 +834,7 @@ static const yytype_uint16 yytoknum[] = # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint16 yyr1[] = +static const unsigned short int yyr1[] = { 0, 127, 128, 128, 130, 129, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, @@ -1004,7 +874,7 @@ static const yytype_uint16 yyr1[] = }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +static const unsigned char yyr2[] = { 0, 2, 1, 2, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1046,7 +916,7 @@ static const yytype_uint8 yyr2[] = /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const yytype_uint16 yydefact[] = +static const unsigned short int yydefact[] = { 4, 4, 2, 0, 1, 3, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, @@ -1109,8 +979,8 @@ static const yytype_uint16 yydefact[] = 223 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const short int yydefgoto[] = { -1, 1, 2, 3, 63, 64, 65, 164, 66, 358, 190, 481, 68, 223, 69, 263, 285, 333, 334, 359, @@ -1131,7 +1001,7 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ #define YYPACT_NINF -491 -static const yytype_int16 yypact[] = +static const short int yypact[] = { -491, 74, -491, 521, -491, -491, 48, -491, 100, 100, 115, 100, 100, 100, 100, 100, 100, 1009, 51, -491, @@ -1195,7 +1065,7 @@ static const yytype_int16 yypact[] = }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = +static const short int yypgoto[] = { -491, -491, 434, -491, -491, -202, -491, -491, -491, 21, -491, -491, -491, -491, -491, -491, 173, -491, 104, 22, @@ -1218,7 +1088,7 @@ static const yytype_int16 yypgoto[] = number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -313 -static const yytype_int16 yytable[] = +static const short int yytable[] = { 112, 104, 114, 115, 116, 117, 118, 119, 264, 106, 133, 135, 169, 121, 74, 126, 127, 128, 196, 75, @@ -1334,7 +1204,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 62 }; -static const yytype_int16 yycheck[] = +static const short int yycheck[] = { 9, 3, 11, 12, 13, 14, 15, 16, 199, 3, 31, 32, 121, 17, 3, 24, 25, 26, 157, 3, @@ -1452,7 +1322,7 @@ static const yytype_int16 yycheck[] = /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint16 yystos[] = +static const unsigned short int yystos[] = { 0, 128, 129, 130, 0, 129, 3, 4, 5, 6, 7, 11, 12, 13, 14, 16, 17, 18, 20, 21, @@ -1515,6 +1385,22 @@ static const yytype_uint16 yystos[] = 247 }; +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -1540,63 +1426,30 @@ do \ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ + YYPOPSTACK; \ goto yybackup; \ } \ else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ + { \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ -while (YYID (0)) - +while (0) #define YYTERROR 1 #define YYERRCODE 256 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + ((Current).first_line = (Rhs)[1].first_line, \ + (Current).first_column = (Rhs)[1].first_column, \ + (Current).last_line = (Rhs)[N].last_line, \ + (Current).last_column = (Rhs)[N].last_column) #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. */ - -#ifndef YY_LOCATION_PRINT -# if 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 -#endif - - /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -1617,96 +1470,42 @@ while (YYID (0)) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +} while (0) -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) + for (/* Nothing. */; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -1715,52 +1514,45 @@ yy_stack_print (bottom, top) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (int yyrule) #else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; +yy_reduce_print (yyrule) int yyrule; #endif { - int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); - } + unsigned int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) + yy_reduce_print (Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1775,9 +1567,13 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -1787,47 +1583,45 @@ int yydebug; #if YYERROR_VERBOSE # ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H +# if defined (__GLIBC__) && defined (_STRING_H) # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -#else -static YYSIZE_T +# else yystrlen (yystr) - const char *yystr; -#endif + const char *yystr; +# endif { - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) + register const char *yys = yystr; + + while (*yys++ != '\0') continue; - return yylen; + + return yys - yystr - 1; } # endif # endif # ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * +# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -#else -static char * +# else yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif + char *yydest; + const char *yysrc; +# endif { - char *yyd = yydest; - const char *yys = yysrc; + register char *yyd = yydest; + register const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -1837,192 +1631,70 @@ yystpcpy (yydest, yysrc) # endif # endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } +#endif /* !YYERROR_VERBOSE */ - if (! yyres) - return yystrlen (yystr); +* - return yystpcpy (yyres, yystr) - yyres; -} -# endif +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ -/* 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) +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE *yyvaluep; +#endif { - int yyn = yypact[yystate]; + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + if (yytype < YYNTOKENS) { - 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"); + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); # 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; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - 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; } + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyoutput, ")"); } -#endif /* YYERROR_VERBOSE */ -* +#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; +yydestruct (yytype, yyvaluep) int yytype; YYSTYPE *yyvaluep; #endif { - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; switch (yytype) { default: - break; + break; } } * @@ -2030,13 +1702,13 @@ yydestruct (yymsg, yytype, yyvaluep) /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus +# if defined (__STDC__) || defined (__cplusplus) int yyparse (void *YYPARSE_PARAM); -#else +# else int yyparse (); -#endif +# endif #else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void); #else int yyparse (); @@ -2045,10 +1717,10 @@ int yyparse (); -/* 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. */ @@ -2061,18 +1733,14 @@ int yynerrs; `----------*/ #ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM) +# else +int yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +# endif #else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void) #else @@ -2083,19 +1751,13 @@ yyparse () #endif { - int yystate; - int yyn; + register int yystate; + register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead 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 /* Three stacks and their tools: `yyss': related to states, @@ -2106,18 +1768,18 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + register YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) +#define YYPOPSTACK (yyvsp--, yyssp--) YYSIZE_T yystacksize = YYINITDEPTH; @@ -2126,9 +1788,9 @@ yyparse () 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; + /* When reducing, the number of symbols on the RHS of the reduced + rule. */ + int yylen; YYDPRINTF ((stderr, "Starting parse\n")); @@ -2145,6 +1807,7 @@ yyparse () yyssp = yyss; yyvsp = yyvs; + goto yysetstate; /*------------------------------------------------------------. @@ -2152,7 +1815,8 @@ yyparse () `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ + have just been pushed. so pushing a state here evens the stacks. + */ yyssp++; yysetstate: @@ -2165,18 +1829,18 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; + short int *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 be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), + yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -2187,21 +1851,21 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; + goto yyoverflowlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyoverflowlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyexhaustedlab; + goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -2232,17 +1896,19 @@ yyparse () `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ +/* Do appropriate processing given the current state. */ +/* Read a lookahead token if we need one and don't already have one. */ +/* yyresume: */ + + /* First try to decide what to do without reference to lookahead token. */ - /* 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 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: ")); @@ -2257,7 +1923,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -2277,21 +1943,22 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); - /* Discard the shifted token unless it is eof. */ + /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; - yystate = yyn; *++yyvsp = yylval; + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + yystate = yyn; goto yynewstate; @@ -2344,31 +2011,31 @@ yyreduce: free(previousFile); previousFile = NULL; } - ;} + } break; case 19: #line 331 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentSpec->exphdrcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentSpec->exphdrcode, yyvsp[0].codeb); + } break; case 20: #line 335 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentModule->hdrcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentModule->hdrcode, yyvsp[0].codeb); + } break; case 21: #line 339 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentModule->cppcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentModule->cppcode, yyvsp[0].codeb); + } break; case 43: @@ -2381,23 +2048,23 @@ yyreduce: if (scope == NULL) yyerror("%TypeHeaderCode can only be used in a namespace, class or mapped type"); - appendCodeBlock(&scope->iff->hdrcode, (yyvsp[(1) - (1)].codeb)); + appendCodeBlock(&scope->iff->hdrcode, yyvsp[0].codeb); } - ;} + } break; case 45: #line 382 "parser.y" { - appendString(&currentSpec->options, (yyvsp[(1) - (1)].text)); - ;} + appendString(&currentSpec->options, yyvsp[0].text); + } break; case 46: #line 385 "parser.y" { - appendString(&currentSpec->options, (yyvsp[(3) - (3)].text)); - ;} + appendString(&currentSpec->options, yyvsp[0].text); + } break; case 47: @@ -2408,7 +2075,7 @@ yyreduce: yywarning("%SIPNoEmitters is deprecated, please use %SIPOptions instead"); appendString(&currentSpec->options, "QtNoEmitters"); } - ;} + } break; case 48: @@ -2422,11 +2089,11 @@ yyreduce: if (currentSpec->genc) yyerror("%Exception not allowed in a C module"); - pyname = getPythonName(&(yyvsp[(4) - (9)].optflags), scopedNameTail((yyvsp[(2) - (9)].scpvalp))); + pyname = getPythonName(&yyvsp[-5].optflags, scopedNameTail(yyvsp[-7].scpvalp)); checkAttributes(currentSpec, currentModule, NULL, pyname, FALSE); - xd = findException(currentSpec, (yyvsp[(2) - (9)].scpvalp), TRUE); + xd = findException(currentSpec, yyvsp[-7].scpvalp, TRUE); if (xd->cd != NULL) yyerror("%Exception name has already been seen as a class name - it must be defined before being used"); @@ -2436,24 +2103,24 @@ yyreduce: /* Complete the definition. */ xd->iff->module = currentModule; - xd->iff->hdrcode = (yyvsp[(6) - (9)].codeb); + xd->iff->hdrcode = yyvsp[-3].codeb; xd->pyname = pyname; - xd->bibase = (yyvsp[(3) - (9)].exceptionbase).bibase; - xd->base = (yyvsp[(3) - (9)].exceptionbase).base; - xd->raisecode = (yyvsp[(7) - (9)].codeb); + xd->bibase = yyvsp[-6].exceptionbase.bibase; + xd->base = yyvsp[-6].exceptionbase.base; + xd->raisecode = yyvsp[-2].codeb; if (xd->bibase != NULL || xd->base != NULL) xd->exceptionnr = currentModule->nrexceptions++; } - ;} + } break; case 49: #line 434 "parser.y" { - (yyval.exceptionbase).bibase = NULL; - (yyval.exceptionbase).base = NULL; - ;} + yyval.exceptionbase.bibase = NULL; + yyval.exceptionbase.base = NULL; + } break; case 50: @@ -2461,18 +2128,18 @@ yyreduce: { exceptionDef *xd; - (yyval.exceptionbase).bibase = NULL; - (yyval.exceptionbase).base = NULL; + yyval.exceptionbase.bibase = NULL; + yyval.exceptionbase.base = NULL; /* See if it is a defined exception. */ for (xd = currentSpec->exceptions; xd != NULL; xd = xd->next) - if (sameScopedName(xd->iff->fqcname, (yyvsp[(2) - (3)].scpvalp))) + if (sameScopedName(xd->iff->fqcname, yyvsp[-1].scpvalp)) { - (yyval.exceptionbase).base = xd; + yyval.exceptionbase.base = xd; break; } - if (xd == NULL && (yyvsp[(2) - (3)].scpvalp)->next == NULL && strncmp((yyvsp[(2) - (3)].scpvalp)->name, "SIP_", 4) == 0) + if (xd == NULL && yyvsp[-1].scpvalp->next == NULL && strncmp(yyvsp[-1].scpvalp->name, "SIP_", 4) == 0) { /* See if it is a builtin exception. */ @@ -2520,31 +2187,31 @@ yyreduce: char **cp; for (cp = builtins; *cp != NULL; ++cp) - if (strcmp((yyvsp[(2) - (3)].scpvalp)->name + 4, *cp) == 0) + if (strcmp(yyvsp[-1].scpvalp->name + 4, *cp) == 0) { - (yyval.exceptionbase).bibase = *cp; + yyval.exceptionbase.bibase = *cp; break; } } - if ((yyval.exceptionbase).bibase == NULL && (yyval.exceptionbase).base == NULL) + if (yyval.exceptionbase.bibase == NULL && yyval.exceptionbase.base == NULL) yyerror("Unknown exception base type"); - ;} + } break; case 51: #line 512 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 52: #line 517 "parser.y" { if (notSkipping()) - currentMappedType = newMappedType(currentSpec, &(yyvsp[(2) - (3)].memArg), &(yyvsp[(3) - (3)].optflags)); - ;} + currentMappedType = newMappedType(currentSpec, &yyvsp[-1].memArg, &yyvsp[0].optflags); + } break; case 54: @@ -2556,11 +2223,11 @@ yyreduce: yyerror("%MappedType templates not allowed in a C module"); /* Check the template arguments are basic types or simple names. */ - for (a = 0; a < (yyvsp[(1) - (3)].signature).nrArgs; ++a) - if ((yyvsp[(1) - (3)].signature).args[a].atype == defined_type && (yyvsp[(1) - (3)].signature).args[a].u.snd->next != NULL) + for (a = 0; a < yyvsp[-2].signature.nrArgs; ++a) + if (yyvsp[-2].signature.args[a].atype == defined_type && yyvsp[-2].signature.args[a].u.snd->next != NULL) yyerror("%MappedType template arguments must be simple names"); - if ((yyvsp[(3) - (3)].memArg).atype != template_type) + if (yyvsp[0].memArg.atype != template_type) yyerror("%MappedType template must map a template type"); if (notSkipping()) @@ -2570,16 +2237,16 @@ yyreduce: /* Check a template hasn't already been provided. */ for (mtt = currentSpec->mappedtypetemplates; mtt != NULL; mtt = mtt->next) - if (sameScopedName(mtt->mt->type.u.td->fqname, (yyvsp[(3) - (3)].memArg).u.td->fqname) && sameTemplateSignature(&mtt->mt->type.u.td->types, &(yyvsp[(3) - (3)].memArg).u.td->types, TRUE)) + if (sameScopedName(mtt->mt->type.u.td->fqname, yyvsp[0].memArg.u.td->fqname) && sameTemplateSignature(&mtt->mt->type.u.td->types, &yyvsp[0].memArg.u.td->types, TRUE)) yyerror("%MappedType template for this type has already been defined"); - (yyvsp[(3) - (3)].memArg).nrderefs = 0; - (yyvsp[(3) - (3)].memArg).argflags = 0; + yyvsp[0].memArg.nrderefs = 0; + yyvsp[0].memArg.argflags = 0; mtt = sipMalloc(sizeof (mappedTypeTmplDef)); - mtt->sig = (yyvsp[(1) - (3)].signature); - mtt->mt = allocMappedType(&(yyvsp[(3) - (3)].memArg)); + mtt->sig = yyvsp[-2].signature; + mtt->mt = allocMappedType(&yyvsp[0].memArg); mtt->next = currentSpec->mappedtypetemplates; currentSpec->mappedtypetemplates = mtt; @@ -2591,7 +2258,7 @@ yyreduce: iff->hdrcode = NULL; mtt->mt->iff = iff; } - ;} + } break; case 56: @@ -2607,15 +2274,15 @@ yyreduce: currentMappedType = NULL; } - ;} + } break; case 59: #line 586 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentMappedType->iff->hdrcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentMappedType->iff->hdrcode, yyvsp[0].codeb); + } break; case 60: @@ -2626,9 +2293,9 @@ yyreduce: if (currentMappedType -> convfromcode != NULL) yyerror("%MappedType has more than one %ConvertFromTypeCode directive"); - currentMappedType -> convfromcode = (yyvsp[(2) - (2)].codeb); + currentMappedType -> convfromcode = yyvsp[0].codeb; } - ;} + } break; case 61: @@ -2639,9 +2306,9 @@ yyreduce: if (currentMappedType -> convtocode != NULL) yyerror("%MappedType has more than one %ConvertToTypeCode directive"); - currentMappedType -> convtocode = (yyvsp[(2) - (2)].codeb); + currentMappedType -> convtocode = yyvsp[0].codeb; } - ;} + } break; case 62: @@ -2654,13 +2321,13 @@ yyreduce: { classDef *ns; - ns = newClass(currentSpec,namespace_iface,text2scopedName((yyvsp[(2) - (2)].text))); + ns = newClass(currentSpec,namespace_iface,text2scopedName(yyvsp[0].text)); pushScope(ns); sectionFlags = 0; } - ;} + } break; case 63: @@ -2687,7 +2354,7 @@ yyreduce: popScope(); } - ;} + } break; case 66: @@ -2698,7 +2365,7 @@ yyreduce: for (qd = currentModule -> qualifiers; qd != NULL; qd = qd -> next) if (qd -> qtype == platform_qualifier) yyerror("%Platforms has already been defined for this module"); - ;} + } break; case 67: @@ -2720,28 +2387,28 @@ yyreduce: if (nrneeded > 1) yyerror("No more than one of these %Platforms must be specified with the -t flag"); - ;} + } break; case 70: #line 684 "parser.y" { - newQualifier(currentModule,-1,-1,(yyvsp[(1) - (1)].text),platform_qualifier); - ;} + newQualifier(currentModule,-1,-1,yyvsp[0].text,platform_qualifier); + } break; case 71: #line 689 "parser.y" { - newQualifier(currentModule,-1,-1,(yyvsp[(2) - (2)].text),feature_qualifier); - ;} + newQualifier(currentModule,-1,-1,yyvsp[0].text,feature_qualifier); + } break; case 72: #line 694 "parser.y" { currentTimelineOrder = 0; - ;} + } break; case 73: @@ -2765,14 +2432,14 @@ yyreduce: yyerror("At most one of this %Timeline must be specified with the -t flag"); currentModule -> nrtimelines++; - ;} + } break; case 76: #line 723 "parser.y" { - newQualifier(currentModule,currentModule -> nrtimelines,currentTimelineOrder++,(yyvsp[(1) - (1)].text),time_qualifier); - ;} + newQualifier(currentModule,currentModule -> nrtimelines,currentTimelineOrder++,yyvsp[0].text,time_qualifier); + } break; case 77: @@ -2784,45 +2451,45 @@ yyreduce: /* Nested %Ifs are implicit logical ands. */ if (skipStackPtr > 0) - (yyvsp[(3) - (4)].boolean) = ((yyvsp[(3) - (4)].boolean) && skipStack[skipStackPtr - 1]); + yyvsp[-1].boolean = (yyvsp[-1].boolean && skipStack[skipStackPtr - 1]); - skipStack[skipStackPtr++] = (yyvsp[(3) - (4)].boolean); - ;} + skipStack[skipStackPtr++] = yyvsp[-1].boolean; + } break; case 78: #line 741 "parser.y" { - (yyval.boolean) = platOrFeature((yyvsp[(1) - (1)].text),FALSE); - ;} + yyval.boolean = platOrFeature(yyvsp[0].text,FALSE); + } break; case 79: #line 744 "parser.y" { - (yyval.boolean) = platOrFeature((yyvsp[(2) - (2)].text),TRUE); - ;} + yyval.boolean = platOrFeature(yyvsp[0].text,TRUE); + } break; case 80: #line 747 "parser.y" { - (yyval.boolean) = (platOrFeature((yyvsp[(3) - (3)].text),FALSE) || (yyvsp[(1) - (3)].boolean)); - ;} + yyval.boolean = (platOrFeature(yyvsp[0].text,FALSE) || yyvsp[-2].boolean); + } break; case 81: #line 750 "parser.y" { - (yyval.boolean) = (platOrFeature((yyvsp[(4) - (4)].text),TRUE) || (yyvsp[(1) - (4)].boolean)); - ;} + yyval.boolean = (platOrFeature(yyvsp[0].text,TRUE) || yyvsp[-3].boolean); + } break; case 83: #line 756 "parser.y" { - (yyval.boolean) = timePeriod((yyvsp[(1) - (3)].text),(yyvsp[(3) - (3)].text)); - ;} + yyval.boolean = timePeriod(yyvsp[-2].text,yyvsp[0].text); + } break; case 84: @@ -2830,7 +2497,7 @@ yyreduce: { if (skipStackPtr-- <= 0) yyerror("Too many %End directives"); - ;} + } break; case 85: @@ -2838,28 +2505,28 @@ yyreduce: { optFlag *of; - if ((yyvsp[(2) - (2)].optflags).nrFlags == 0) + if (yyvsp[0].optflags.nrFlags == 0) yyerror("%License details not specified"); - if ((of = findOptFlag(&(yyvsp[(2) - (2)].optflags),"Type",string_flag)) == NULL) + if ((of = findOptFlag(&yyvsp[0].optflags,"Type",string_flag)) == NULL) yyerror("%License type not specified"); currentModule -> license = sipMalloc(sizeof (licenseDef)); currentModule -> license -> type = of -> fvalue.sval; - currentModule -> license -> licensee = - ((of = findOptFlag(&(yyvsp[(2) - (2)].optflags),"Licensee",string_flag)) != NULL) + currentModule -> license -> licensee = + ((of = findOptFlag(&yyvsp[0].optflags,"Licensee",string_flag)) != NULL) ? of -> fvalue.sval : NULL; - currentModule -> license -> timestamp = - ((of = findOptFlag(&(yyvsp[(2) - (2)].optflags),"Timestamp",string_flag)) != NULL) + currentModule -> license -> timestamp = + ((of = findOptFlag(&yyvsp[0].optflags,"Timestamp",string_flag)) != NULL) ? of -> fvalue.sval : NULL; - currentModule -> license -> sig = - ((of = findOptFlag(&(yyvsp[(2) - (2)].optflags),"Signature",string_flag)) != NULL) + currentModule -> license -> sig = + ((of = findOptFlag(&yyvsp[0].optflags,"Signature",string_flag)) != NULL) ? of -> fvalue.sval : NULL; - ;} + } break; case 86: @@ -2872,9 +2539,9 @@ yyreduce: if (currentModule->fullname != NULL) yyerror("%ConsolidatedModule must appear before any %Module or %CModule directive"); - setModuleName(currentModule, (yyvsp[(2) - (2)].text)); + setModuleName(currentModule, yyvsp[0].text); setIsConsolidated(currentModule); - ;} + } break; case 87: @@ -2887,9 +2554,9 @@ yyreduce: if (currentModule->fullname != NULL) yyerror("%CompositeModule must appear before any %Module or %CModule directive"); - setModuleName(currentModule, (yyvsp[(2) - (2)].text)); + setModuleName(currentModule, yyvsp[0].text); setIsComposite(currentModule); - ;} + } break; case 88: @@ -2900,7 +2567,7 @@ yyreduce: moduleDef *mod; for (mod = currentSpec->modules; mod != NULL; mod = mod->next) - if (mod->fullname != NULL && strcmp(mod->fullname, (yyvsp[(2) - (3)].text)) == 0) + if (mod->fullname != NULL && strcmp(mod->fullname, yyvsp[-1].text) == 0) yyerror("Module is already defined"); /* @@ -2917,28 +2584,28 @@ yyreduce: currentModule = mod; } - setModuleName(currentModule, (yyvsp[(2) - (3)].text)); - currentModule->version = (yyvsp[(3) - (3)].number); + setModuleName(currentModule, yyvsp[-1].text); + currentModule->version = yyvsp[0].number; if (currentSpec->genc < 0) - currentSpec->genc = (yyvsp[(1) - (3)].boolean); - else if (currentSpec->genc != (yyvsp[(1) - (3)].boolean)) + currentSpec->genc = yyvsp[-2].boolean; + else if (currentSpec->genc != yyvsp[-2].boolean) yyerror("Cannot mix C and C++ modules"); - ;} + } break; case 89: #line 853 "parser.y" { - (yyval.boolean) = FALSE; - ;} + yyval.boolean = FALSE; + } break; case 90: #line 856 "parser.y" { - (yyval.boolean) = TRUE; - ;} + yyval.boolean = TRUE; + } break; case 92: @@ -2951,204 +2618,204 @@ yyreduce: char *cp; - for (cp = (yyvsp[(1) - (1)].text); *cp != '\0'; ++cp) + for (cp = yyvsp[0].text; *cp != '\0'; ++cp) if (*cp != '.' && *cp != '_' && !isalnum(*cp)) yyerror("Invalid character in module name"); - (yyval.text) = (yyvsp[(1) - (1)].text); - ;} + yyval.text = yyvsp[0].text; + } break; case 93: #line 878 "parser.y" { - (yyval.number) = -1; - ;} + yyval.number = -1; + } break; case 95: #line 884 "parser.y" { - parseFile(NULL, (yyvsp[(2) - (2)].text), NULL, FALSE); - ;} + parseFile(NULL, yyvsp[0].text, NULL, FALSE); + } break; case 96: #line 889 "parser.y" { - parseFile(NULL, (yyvsp[(2) - (2)].text), NULL, TRUE); - ;} + parseFile(NULL, yyvsp[0].text, NULL, TRUE); + } break; case 97: #line 894 "parser.y" { - newImport((yyvsp[(2) - (2)].text)); - ;} + newImport(yyvsp[0].text); + } break; case 98: #line 899 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 99: #line 902 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 100: #line 907 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 101: #line 910 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 102: #line 915 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 103: #line 918 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 104: #line 923 "parser.y" { - appendCodeBlock(&currentModule->copying, (yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentModule->copying, yyvsp[0].codeb); + } break; case 105: #line 928 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 106: #line 933 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 107: #line 938 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 108: #line 943 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 110: #line 949 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 111: #line 954 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 112: #line 959 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 113: #line 964 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 114: #line 969 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 115: #line 974 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 116: #line 979 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 117: #line 984 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 118: #line 989 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 119: #line 994 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentModule->preinitcode, (yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentModule->preinitcode, yyvsp[0].codeb); + } break; case 120: #line 1000 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentModule->postinitcode, (yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentModule->postinitcode, yyvsp[0].codeb); + } break; case 121: #line 1006 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentModule->unitcode, (yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentModule->unitcode, yyvsp[0].codeb); + } break; case 122: @@ -3159,22 +2826,22 @@ yyreduce: * until the last use of it (by SIP v3) can be removed * from PyQt. */ - ;} + } break; case 123: #line 1021 "parser.y" { if (inMainModule()) - appendCodeBlock(&currentSpec -> docs,(yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentSpec -> docs,yyvsp[0].codeb); + } break; case 124: #line 1027 "parser.y" { - appendCodeBlock(&currentSpec -> docs,(yyvsp[(2) - (2)].codeb)); - ;} + appendCodeBlock(&currentSpec -> docs,yyvsp[0].codeb); + } break; case 125: @@ -3182,20 +2849,20 @@ yyreduce: { if (inMainModule()) yywarning("%Makefile is ignored, please use the -b flag instead"); - ;} + } break; case 128: #line 1042 "parser.y" { - (yyval.codeb) = (yyvsp[(1) - (2)].codeb); + yyval.codeb = yyvsp[-1].codeb; - append(&(yyval.codeb)->frag, (yyvsp[(2) - (2)].codeb)->frag); + append(&yyval.codeb->frag, yyvsp[0].codeb->frag); - free((yyvsp[(2) - (2)].codeb)->frag); - free((char *)(yyvsp[(2) - (2)].codeb)->filename); - free((yyvsp[(2) - (2)].codeb)); - ;} + free(yyvsp[0].codeb->frag); + free((char *)yyvsp[0].codeb->filename); + free(yyvsp[0].codeb); + } break; case 129: @@ -3206,37 +2873,37 @@ yyreduce: if (sectionFlags != 0 && (sectionFlags & ~(SECT_IS_PUBLIC | SECT_IS_PROT)) != 0) yyerror("Class enums must be in the public or protected sections"); - currentEnum = newEnum(currentSpec,currentModule,(yyvsp[(2) - (3)].text),&(yyvsp[(3) - (3)].optflags),sectionFlags); + currentEnum = newEnum(currentSpec,currentModule,yyvsp[-1].text,&yyvsp[0].optflags,sectionFlags); } - ;} + } break; case 131: #line 1064 "parser.y" { - (yyval.text) = NULL; - ;} + yyval.text = NULL; + } break; case 132: #line 1067 "parser.y" { - (yyval.text) = (yyvsp[(1) - (1)].text); - ;} + yyval.text = yyvsp[0].text; + } break; case 133: #line 1072 "parser.y" { - (yyval.text) = NULL; - ;} + yyval.text = NULL; + } break; case 134: #line 1075 "parser.y" { - (yyval.text) = (yyvsp[(1) - (1)].text); - ;} + yyval.text = yyvsp[0].text; + } break; case 141: @@ -3255,8 +2922,8 @@ yyreduce: emd = sipMalloc(sizeof (enumMemberDef)); - emd -> pyname = cacheName(currentSpec, getPythonName(&(yyvsp[(3) - (4)].optflags), (yyvsp[(1) - (4)].text))); - emd -> cname = (yyvsp[(1) - (4)].text); + emd -> pyname = cacheName(currentSpec, getPythonName(&yyvsp[-1].optflags, yyvsp[-3].text)); + emd -> cname = yyvsp[-3].text; emd -> ed = currentEnum; emd -> next = NULL; @@ -3271,138 +2938,138 @@ yyreduce: if (inMainModule()) setIsUsedName(emd -> pyname); } - ;} + } break; case 146: #line 1131 "parser.y" { - (yyval.valp) = NULL; - ;} + yyval.valp = NULL; + } break; case 147: #line 1134 "parser.y" { - (yyval.valp) = (yyvsp[(2) - (2)].valp); - ;} + yyval.valp = yyvsp[0].valp; + } break; case 149: #line 1140 "parser.y" { valueDef *vd; - - if ((yyvsp[(1) - (3)].valp) -> vtype == string_value || (yyvsp[(3) - (3)].valp) -> vtype == string_value) + + if (yyvsp[-2].valp -> vtype == string_value || yyvsp[0].valp -> vtype == string_value) yyerror("Invalid binary operator for string"); - + /* Find the last value in the existing expression. */ - - for (vd = (yyvsp[(1) - (3)].valp); vd -> next != NULL; vd = vd -> next) + + for (vd = yyvsp[-2].valp; vd -> next != NULL; vd = vd -> next) ; + + vd -> vbinop = yyvsp[-1].qchar; + vd -> next = yyvsp[0].valp; - vd -> vbinop = (yyvsp[(2) - (3)].qchar); - vd -> next = (yyvsp[(3) - (3)].valp); - - (yyval.valp) = (yyvsp[(1) - (3)].valp); - ;} + yyval.valp = yyvsp[-2].valp; + } break; case 150: #line 1158 "parser.y" { - (yyval.qchar) = '-'; - ;} + yyval.qchar = '-'; + } break; case 151: #line 1161 "parser.y" { - (yyval.qchar) = '+'; - ;} + yyval.qchar = '+'; + } break; case 152: #line 1164 "parser.y" { - (yyval.qchar) = '*'; - ;} + yyval.qchar = '*'; + } break; case 153: #line 1167 "parser.y" { - (yyval.qchar) = '/'; - ;} + yyval.qchar = '/'; + } break; case 154: #line 1170 "parser.y" { - (yyval.qchar) = '&'; - ;} + yyval.qchar = '&'; + } break; case 155: #line 1173 "parser.y" { - (yyval.qchar) = '|'; - ;} + yyval.qchar = '|'; + } break; case 156: #line 1178 "parser.y" { - (yyval.qchar) = '\0'; - ;} + yyval.qchar = '\0'; + } break; case 157: #line 1181 "parser.y" { - (yyval.qchar) = '!'; - ;} + yyval.qchar = '!'; + } break; case 158: #line 1184 "parser.y" { - (yyval.qchar) = '~'; - ;} + yyval.qchar = '~'; + } break; case 159: #line 1187 "parser.y" { - (yyval.qchar) = '-'; - ;} + yyval.qchar = '-'; + } break; case 160: #line 1190 "parser.y" { - (yyval.qchar) = '+'; - ;} + yyval.qchar = '+'; + } break; case 161: #line 1195 "parser.y" { - if ((yyvsp[(1) - (2)].qchar) != '\0' && (yyvsp[(2) - (2)].value).vtype == string_value) + if (yyvsp[-1].qchar != '\0' && yyvsp[0].value.vtype == string_value) yyerror("Invalid unary operator for string"); - + /* * Convert the value to a simple expression on the * heap. */ - - (yyval.valp) = sipMalloc(sizeof (valueDef)); - - *(yyval.valp) = (yyvsp[(2) - (2)].value); - (yyval.valp) -> vunop = (yyvsp[(1) - (2)].qchar); - (yyval.valp) -> vbinop = '\0'; - (yyval.valp) -> next = NULL; - ;} + + yyval.valp = sipMalloc(sizeof (valueDef)); + + *yyval.valp = yyvsp[0].value; + yyval.valp -> vunop = yyvsp[-1].qchar; + yyval.valp -> vbinop = '\0'; + yyval.valp -> next = NULL; + } break; case 163: @@ -3411,15 +3078,15 @@ yyreduce: if (currentSpec -> genc) yyerror("Scoped names are not allowed in a C module"); - appendScopedName(&(yyvsp[(1) - (3)].scpvalp),(yyvsp[(3) - (3)].scpvalp)); - ;} + appendScopedName(&yyvsp[-2].scpvalp,yyvsp[0].scpvalp); + } break; case 164: #line 1222 "parser.y" { - (yyval.scpvalp) = text2scopePart((yyvsp[(1) - (1)].text)); - ;} + yyval.scpvalp = text2scopePart(yyvsp[0].text); + } break; case 165: @@ -3431,9 +3098,9 @@ yyreduce: * here. */ - (yyval.value).vtype = scoped_value; - (yyval.value).u.vscp = (yyvsp[(1) - (1)].scpvalp); - ;} + yyval.value.vtype = scoped_value; + yyval.value.u.vscp = yyvsp[0].scpvalp; + } break; case 166: @@ -3442,68 +3109,68 @@ yyreduce: fcallDef *fcd; fcd = sipMalloc(sizeof (fcallDef)); - *fcd = (yyvsp[(3) - (4)].fcall); - fcd -> type = (yyvsp[(1) - (4)].memArg); + *fcd = yyvsp[-1].fcall; + fcd -> type = yyvsp[-3].memArg; - (yyval.value).vtype = fcall_value; - (yyval.value).u.fcd = fcd; - ;} + yyval.value.vtype = fcall_value; + yyval.value.u.fcd = fcd; + } break; case 167: #line 1247 "parser.y" { - (yyval.value).vtype = real_value; - (yyval.value).u.vreal = (yyvsp[(1) - (1)].real); - ;} + yyval.value.vtype = real_value; + yyval.value.u.vreal = yyvsp[0].real; + } break; case 168: #line 1251 "parser.y" { - (yyval.value).vtype = numeric_value; - (yyval.value).u.vnum = (yyvsp[(1) - (1)].number); - ;} + yyval.value.vtype = numeric_value; + yyval.value.u.vnum = yyvsp[0].number; + } break; case 169: #line 1255 "parser.y" { - (yyval.value).vtype = numeric_value; - (yyval.value).u.vnum = 1; - ;} + yyval.value.vtype = numeric_value; + yyval.value.u.vnum = 1; + } break; case 170: #line 1259 "parser.y" { - (yyval.value).vtype = numeric_value; - (yyval.value).u.vnum = 0; - ;} + yyval.value.vtype = numeric_value; + yyval.value.u.vnum = 0; + } break; case 171: #line 1263 "parser.y" { - (yyval.value).vtype = numeric_value; - (yyval.value).u.vnum = 0; - ;} + yyval.value.vtype = numeric_value; + yyval.value.u.vnum = 0; + } break; case 172: #line 1267 "parser.y" { - (yyval.value).vtype = string_value; - (yyval.value).u.vstr = (yyvsp[(1) - (1)].text); - ;} + yyval.value.vtype = string_value; + yyval.value.u.vstr = yyvsp[0].text; + } break; case 173: #line 1271 "parser.y" { - (yyval.value).vtype = qchar_value; - (yyval.value).u.vqchar = (yyvsp[(1) - (1)].qchar); - ;} + yyval.value.vtype = qchar_value; + yyval.value.u.vqchar = yyvsp[0].qchar; + } break; case 174: @@ -3511,8 +3178,8 @@ yyreduce: { /* No values. */ - (yyval.fcall).nrArgs = 0; - ;} + yyval.fcall.nrArgs = 0; + } break; case 175: @@ -3520,9 +3187,9 @@ yyreduce: { /* The single or first expression. */ - (yyval.fcall).args[0] = (yyvsp[(1) - (1)].valp); - (yyval.fcall).nrArgs = 1; - ;} + yyval.fcall.args[0] = yyvsp[0].valp; + yyval.fcall.nrArgs = 1; + } break; case 176: @@ -3530,27 +3197,27 @@ yyreduce: { /* Check that it wasn't ...(,expression...). */ - if ((yyval.fcall).nrArgs == 0) + if (yyval.fcall.nrArgs == 0) yyerror("First argument to function call is missing"); /* Check there is room. */ - if ((yyvsp[(1) - (3)].fcall).nrArgs == MAX_NR_ARGS) + if (yyvsp[-2].fcall.nrArgs == MAX_NR_ARGS) yyerror("Too many arguments to function call"); - (yyval.fcall) = (yyvsp[(1) - (3)].fcall); + yyval.fcall = yyvsp[-2].fcall; - (yyval.fcall).args[(yyval.fcall).nrArgs] = (yyvsp[(3) - (3)].valp); - (yyval.fcall).nrArgs++; - ;} + yyval.fcall.args[yyval.fcall.nrArgs] = yyvsp[0].valp; + yyval.fcall.nrArgs++; + } break; case 177: #line 1306 "parser.y" { if (notSkipping()) - newTypedef(currentSpec,currentModule,(yyvsp[(3) - (4)].text),&(yyvsp[(2) - (4)].memArg)); - ;} + newTypedef(currentSpec,currentModule,yyvsp[-1].text,&yyvsp[-2].memArg); + } break; case 178: @@ -3563,19 +3230,19 @@ yyreduce: /* Create the full signature on the heap. */ sig = sipMalloc(sizeof (signatureDef)); - *sig = (yyvsp[(8) - (10)].signature); - sig -> result = (yyvsp[(2) - (10)].memArg); + *sig = yyvsp[-2].signature; + sig -> result = yyvsp[-8].memArg; /* Create the full type. */ ftype.atype = function_type; ftype.argflags = 0; - ftype.nrderefs = (yyvsp[(4) - (10)].number); + ftype.nrderefs = yyvsp[-6].number; ftype.defval = NULL; ftype.u.sa = sig; - newTypedef(currentSpec,currentModule,(yyvsp[(5) - (10)].text),&ftype); + newTypedef(currentSpec,currentModule,yyvsp[-5].text,&ftype); } - ;} + } break; case 179: @@ -3585,13 +3252,13 @@ yyreduce: { classDef *cd; - cd = newClass(currentSpec,class_iface,text2scopedName((yyvsp[(2) - (2)].text))); + cd = newClass(currentSpec,class_iface,text2scopedName(yyvsp[0].text)); pushScope(cd); sectionFlags = SECT_IS_PUBLIC; } - ;} + } break; case 180: @@ -3599,15 +3266,15 @@ yyreduce: { if (notSkipping()) { - finishClass(currentSpec, currentModule, currentScope(), &(yyvsp[(4) - (8)].optflags)); + finishClass(currentSpec, currentModule, currentScope(), &yyvsp[-4].optflags); popScope(); } - ;} + } break; case 181: #line 1353 "parser.y" - {currentIsTemplate = TRUE;;} + {currentIsTemplate = TRUE;} break; case 182: @@ -3624,26 +3291,26 @@ yyreduce: * Make sure there is room for the extra class * name argument. */ - if ((yyvsp[(1) - (3)].signature).nrArgs == MAX_NR_ARGS) + if (yyvsp[-2].signature.nrArgs == MAX_NR_ARGS) yyerror("Internal error - increase the value of MAX_NR_ARGS"); tcd = sipMalloc(sizeof (classTmplDef)); - tcd->sig = (yyvsp[(1) - (3)].signature); - tcd->cd = (yyvsp[(3) - (3)].klass); + tcd->sig = yyvsp[-2].signature; + tcd->cd = yyvsp[0].klass; tcd->next = currentSpec->classtemplates; currentSpec->classtemplates = tcd; } currentIsTemplate = FALSE; - ;} + } break; case 183: #line 1380 "parser.y" { - (yyval.signature) = (yyvsp[(3) - (4)].signature); - ;} + yyval.signature = yyvsp[-1].signature; + } break; case 184: @@ -3656,13 +3323,13 @@ yyreduce: { classDef *cd; - cd = newClass(currentSpec, class_iface, scopeScopedName((yyvsp[(2) - (2)].scpvalp))); + cd = newClass(currentSpec, class_iface, scopeScopedName(yyvsp[0].scpvalp)); pushScope(cd); sectionFlags = SECT_IS_PRIVATE; } - ;} + } break; case 185: @@ -3676,9 +3343,9 @@ yyreduce: * See if the class was defined or just * declared. */ - if ((yyvsp[(6) - (7)].boolean)) + if (yyvsp[-1].boolean) { - if ((yyvsp[(2) - (7)].scpvalp)->next != NULL) + if (yyvsp[-5].scpvalp->next != NULL) yyerror("A scoped name cannot be given in a class definition"); } @@ -3687,7 +3354,7 @@ yyreduce: else setIsOpaque(cd); - finishClass(currentSpec, currentModule, cd, &(yyvsp[(5) - (7)].optflags)); + finishClass(currentSpec, currentModule, cd, &yyvsp[-2].optflags); popScope(); /* @@ -3697,9 +3364,9 @@ yyreduce: if (isExternal(cd) && currentScope() != NULL) yyerror("External classes can only be declared in the global scope"); - (yyval.klass) = cd; + yyval.klass = cd; } - ;} + } break; case 190: @@ -3709,7 +3376,7 @@ yyreduce: { argDef ad; classDef *super; - scopedNameDef *snd = (yyvsp[(1) - (1)].scpvalp); + scopedNameDef *snd = yyvsp[0].scpvalp; /* * This is a hack to allow typedef'ed classes to be used before @@ -3739,37 +3406,37 @@ yyreduce: super = findClass(currentSpec, class_iface, snd); appendToClassList(&currentScope()->supers, super); } - ;} + } break; case 191: #line 1480 "parser.y" { - (yyval.boolean) = FALSE; - ;} + yyval.boolean = FALSE; + } break; case 192: #line 1483 "parser.y" { - (yyval.boolean) = TRUE; - ;} + yyval.boolean = TRUE; + } break; case 203: #line 1500 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentScope()->cppcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentScope()->cppcode, yyvsp[0].codeb); + } break; case 204: #line 1504 "parser.y" { if (notSkipping()) - appendCodeBlock(&currentScope()->iff->hdrcode, (yyvsp[(1) - (1)].codeb)); - ;} + appendCodeBlock(&currentScope()->iff->hdrcode, yyvsp[0].codeb); + } break; case 205: @@ -3782,9 +3449,9 @@ yyreduce: if (scope->travcode != NULL) yyerror("%GCTraverseCode already given for class"); - scope->travcode = (yyvsp[(1) - (1)].codeb); + scope->travcode = yyvsp[0].codeb; } - ;} + } break; case 206: @@ -3797,9 +3464,9 @@ yyreduce: if (scope->clearcode != NULL) yyerror("%GCClearCode already given for class"); - scope->clearcode = (yyvsp[(1) - (1)].codeb); + scope->clearcode = yyvsp[0].codeb; } - ;} + } break; case 207: @@ -3812,9 +3479,9 @@ yyreduce: if (scope->readbufcode != NULL) yyerror("%BIGetReadBufferCode already given for class"); - scope->readbufcode = (yyvsp[(1) - (1)].codeb); + scope->readbufcode = yyvsp[0].codeb; } - ;} + } break; case 208: @@ -3827,9 +3494,9 @@ yyreduce: if (scope->writebufcode != NULL) yyerror("%BIGetWriteBufferCode already given for class"); - scope->writebufcode = (yyvsp[(1) - (1)].codeb); + scope->writebufcode = yyvsp[0].codeb; } - ;} + } break; case 209: @@ -3842,9 +3509,9 @@ yyreduce: if (scope->segcountcode != NULL) yyerror("%BIGetSegCountCode already given for class"); - scope->segcountcode = (yyvsp[(1) - (1)].codeb); + scope->segcountcode = yyvsp[0].codeb; } - ;} + } break; case 210: @@ -3857,9 +3524,9 @@ yyreduce: if (scope->charbufcode != NULL) yyerror("%BIGetCharBufferCode already given for class"); - scope->charbufcode = (yyvsp[(1) - (1)].codeb); + scope->charbufcode = yyvsp[0].codeb; } - ;} + } break; case 211: @@ -3872,9 +3539,9 @@ yyreduce: if (scope->picklecode != NULL) yyerror("%PickleCode already given for class"); - scope->picklecode = (yyvsp[(1) - (1)].codeb); + scope->picklecode = yyvsp[0].codeb; } - ;} + } break; case 215: @@ -3887,9 +3554,9 @@ yyreduce: if (scope->convtosubcode != NULL) yyerror("Class has more than one %ConvertToSubClassCode directive"); - scope->convtosubcode = (yyvsp[(2) - (2)].codeb); + scope->convtosubcode = yyvsp[0].codeb; } - ;} + } break; case 216: @@ -3902,9 +3569,9 @@ yyreduce: if (scope->convtocode != NULL) yyerror("Class has more than one %ConvertToTypeCode directive"); - scope->convtocode = (yyvsp[(2) - (2)].codeb); + scope->convtocode = yyvsp[0].codeb; } - ;} + } break; case 217: @@ -3914,8 +3581,8 @@ yyreduce: yyerror("public section not allowed in a C module"); if (notSkipping()) - sectionFlags = SECT_IS_PUBLIC | (yyvsp[(2) - (3)].number); - ;} + sectionFlags = SECT_IS_PUBLIC | yyvsp[-1].number; + } break; case 218: @@ -3925,8 +3592,8 @@ yyreduce: yyerror("protected section not allowed in a C module"); if (notSkipping()) - sectionFlags = SECT_IS_PROT | (yyvsp[(2) - (3)].number); - ;} + sectionFlags = SECT_IS_PROT | yyvsp[-1].number; + } break; case 219: @@ -3936,8 +3603,8 @@ yyreduce: yyerror("private section not allowed in a C module"); if (notSkipping()) - sectionFlags = SECT_IS_PRIVATE | (yyvsp[(2) - (3)].number); - ;} + sectionFlags = SECT_IS_PRIVATE | yyvsp[-1].number; + } break; case 220: @@ -3948,21 +3615,21 @@ yyreduce: if (notSkipping()) sectionFlags = SECT_IS_SIGNAL; - ;} + } break; case 221: #line 1640 "parser.y" { - (yyval.number) = 0; - ;} + yyval.number = 0; + } break; case 222: #line 1643 "parser.y" { - (yyval.number) = SECT_IS_SLOT; - ;} + yyval.number = SECT_IS_SLOT; + } break; case 223: @@ -3974,23 +3641,23 @@ yyreduce: { classDef *cd = currentScope(); - if (strcmp(classBaseName(cd),(yyvsp[(3) - (11)].text)) != 0) + if (strcmp(classBaseName(cd),yyvsp[-8].text) != 0) yyerror("Destructor doesn't have the same name as its class"); if (isDtor(cd)) yyerror("Destructor has already been defined"); - if (currentSpec -> genc && (yyvsp[(10) - (11)].codeb) == NULL) + if (currentSpec -> genc && yyvsp[-1].codeb == NULL) yyerror("Destructor in C modules must include %MethodCode"); - cd -> dealloccode = (yyvsp[(10) - (11)].codeb); - cd -> dtorcode = (yyvsp[(11) - (11)].codeb); - cd -> dtorexceptions = (yyvsp[(6) - (11)].throwlist); + cd -> dealloccode = yyvsp[-1].codeb; + cd -> dtorcode = yyvsp[0].codeb; + cd -> dtorexceptions = yyvsp[-5].throwlist; cd -> classflags |= sectionFlags; - if ((yyvsp[(7) - (11)].number)) + if (yyvsp[-4].number) { - if (!(yyvsp[(1) - (11)].number)) + if (!yyvsp[-10].number) yyerror("Abstract destructor must be virtual"); setIsAbstractClass(cd); @@ -4000,7 +3667,7 @@ yyreduce: * The class has a shadow if we have a virtual dtor or some * dtor code. */ - if ((yyvsp[(1) - (11)].number) || (yyvsp[(11) - (11)].codeb) != NULL) + if (yyvsp[-10].number || yyvsp[0].codeb != NULL) { if (currentSpec -> genc) yyerror("Virtual destructor or %VirtualCatcherCode not allowed in a C module"); @@ -4008,17 +3675,17 @@ yyreduce: setHasShadow(cd); } - if (getReleaseGIL(&(yyvsp[(8) - (11)].optflags))) + if (getReleaseGIL(&yyvsp[-3].optflags)) setIsReleaseGILDtor(cd); - else if (getHoldGIL(&(yyvsp[(8) - (11)].optflags))) + else if (getHoldGIL(&yyvsp[-3].optflags)) setIsHoldGILDtor(cd); } - ;} + } break; case 224: #line 1697 "parser.y" - {currentCtorIsExplicit = TRUE;;} + {currentCtorIsExplicit = TRUE;} break; case 227: @@ -4030,7 +3697,7 @@ yyreduce: { if (currentSpec -> genc) { - if ((yyvsp[(9) - (9)].codeb) == NULL && (yyvsp[(3) - (9)].signature).nrArgs != 0) + if (yyvsp[0].codeb == NULL && yyvsp[-6].signature.nrArgs != 0) yyerror("Constructors with arguments in C modules must include %MethodCode"); if (currentCtorIsExplicit) @@ -4040,60 +3707,60 @@ yyreduce: if ((sectionFlags & (SECT_IS_PUBLIC | SECT_IS_PROT | SECT_IS_PRIVATE)) == 0) yyerror("Constructor must be in the public, private or protected sections"); - newCtor((yyvsp[(1) - (9)].text),sectionFlags,&(yyvsp[(3) - (9)].signature),&(yyvsp[(6) - (9)].optflags),(yyvsp[(9) - (9)].codeb),(yyvsp[(5) - (9)].throwlist),(yyvsp[(7) - (9)].optsignature),currentCtorIsExplicit); + newCtor(yyvsp[-8].text,sectionFlags,&yyvsp[-6].signature,&yyvsp[-3].optflags,yyvsp[0].codeb,yyvsp[-4].throwlist,yyvsp[-2].optsignature,currentCtorIsExplicit); } - free((yyvsp[(1) - (9)].text)); + free(yyvsp[-8].text); currentCtorIsExplicit = FALSE; - ;} + } break; case 228: #line 1727 "parser.y" { - (yyval.optsignature) = NULL; - ;} + yyval.optsignature = NULL; + } break; case 229: #line 1730 "parser.y" { - (yyval.optsignature) = sipMalloc(sizeof (signatureDef)); + yyval.optsignature = sipMalloc(sizeof (signatureDef)); - *(yyval.optsignature) = (yyvsp[(3) - (5)].signature); - ;} + *yyval.optsignature = yyvsp[-2].signature; + } break; case 230: #line 1737 "parser.y" { - (yyval.optsignature) = NULL; - ;} + yyval.optsignature = NULL; + } break; case 231: #line 1740 "parser.y" { - (yyval.optsignature) = sipMalloc(sizeof (signatureDef)); + yyval.optsignature = sipMalloc(sizeof (signatureDef)); - *(yyval.optsignature) = (yyvsp[(4) - (6)].signature); - (yyval.optsignature) -> result = (yyvsp[(2) - (6)].memArg); - ;} + *yyval.optsignature = yyvsp[-2].signature; + yyval.optsignature -> result = yyvsp[-4].memArg; + } break; case 232: #line 1748 "parser.y" { - (yyval.number) = FALSE; - ;} + yyval.number = FALSE; + } break; case 233: #line 1751 "parser.y" { - (yyval.number) = TRUE; - ;} + yyval.number = TRUE; + } break; case 234: @@ -4104,17 +3771,17 @@ yyreduce: if (sectionFlags != 0 && (sectionFlags & (SECT_IS_PUBLIC | SECT_IS_PROT | SECT_IS_PRIVATE | SECT_IS_SLOT | SECT_IS_SIGNAL)) == 0) yyerror("Class function must be in the public, private, protected, slot or signal sections"); - (yyvsp[(4) - (13)].signature).result = (yyvsp[(1) - (13)].memArg); + yyvsp[-9].signature.result = yyvsp[-12].memArg; newFunction(currentSpec,currentModule, sectionFlags,currentIsStatic, currentOverIsVirt, - (yyvsp[(2) - (13)].text),&(yyvsp[(4) - (13)].signature),(yyvsp[(6) - (13)].number),(yyvsp[(8) - (13)].number),&(yyvsp[(9) - (13)].optflags),(yyvsp[(12) - (13)].codeb),(yyvsp[(13) - (13)].codeb),(yyvsp[(7) - (13)].throwlist),(yyvsp[(10) - (13)].optsignature)); + yyvsp[-11].text,&yyvsp[-9].signature,yyvsp[-7].number,yyvsp[-5].number,&yyvsp[-4].optflags,yyvsp[-1].codeb,yyvsp[0].codeb,yyvsp[-6].throwlist,yyvsp[-3].optsignature); } currentIsStatic = FALSE; currentOverIsVirt = FALSE; - ;} + } break; case 235: @@ -4125,25 +3792,25 @@ yyreduce: classDef *cd = currentScope(); /* Handle the unary '+' and '-' operators. */ - if ((cd != NULL && (yyvsp[(5) - (14)].signature).nrArgs == 0) || (cd == NULL && (yyvsp[(5) - (14)].signature).nrArgs == 1)) + if ((cd != NULL && yyvsp[-9].signature.nrArgs == 0) || (cd == NULL && yyvsp[-9].signature.nrArgs == 1)) { - if (strcmp((yyvsp[(3) - (14)].text), "__add__") == 0) - (yyvsp[(3) - (14)].text) = "__pos__"; - else if (strcmp((yyvsp[(3) - (14)].text), "__sub__") == 0) - (yyvsp[(3) - (14)].text) = "__neg__"; + if (strcmp(yyvsp[-11].text, "__add__") == 0) + yyvsp[-11].text = "__pos__"; + else if (strcmp(yyvsp[-11].text, "__sub__") == 0) + yyvsp[-11].text = "__neg__"; } - (yyvsp[(5) - (14)].signature).result = (yyvsp[(1) - (14)].memArg); + yyvsp[-9].signature.result = yyvsp[-13].memArg; newFunction(currentSpec,currentModule, sectionFlags,currentIsStatic, currentOverIsVirt, - (yyvsp[(3) - (14)].text),&(yyvsp[(5) - (14)].signature),(yyvsp[(7) - (14)].number),(yyvsp[(9) - (14)].number),&(yyvsp[(10) - (14)].optflags),(yyvsp[(13) - (14)].codeb),(yyvsp[(14) - (14)].codeb),(yyvsp[(8) - (14)].throwlist),(yyvsp[(11) - (14)].optsignature)); + yyvsp[-11].text,&yyvsp[-9].signature,yyvsp[-7].number,yyvsp[-5].number,&yyvsp[-4].optflags,yyvsp[-1].codeb,yyvsp[0].codeb,yyvsp[-6].throwlist,yyvsp[-3].optsignature); } currentIsStatic = FALSE; currentOverIsVirt = FALSE; - ;} + } break; case 236: @@ -4154,10 +3821,10 @@ yyreduce: char *sname; classDef *scope = currentScope(); - if (scope == NULL || (yyvsp[(4) - (13)].signature).nrArgs != 0) + if (scope == NULL || yyvsp[-9].signature.nrArgs != 0) yyerror("Operator casts must be specified in a class and have no arguments"); - switch ((yyvsp[(2) - (13)].memArg).atype) + switch (yyvsp[-11].memArg.atype) { case defined_type: sname = NULL; @@ -4193,14 +3860,14 @@ yyreduce: if (sname != NULL) { - (yyvsp[(4) - (13)].signature).result = (yyvsp[(2) - (13)].memArg); + yyvsp[-9].signature.result = yyvsp[-11].memArg; newFunction(currentSpec, currentModule, sectionFlags, currentIsStatic, currentOverIsVirt, sname, - &(yyvsp[(4) - (13)].signature), (yyvsp[(6) - (13)].number), (yyvsp[(8) - (13)].number), &(yyvsp[(9) - (13)].optflags), (yyvsp[(12) - (13)].codeb), (yyvsp[(13) - (13)].codeb), - (yyvsp[(7) - (13)].throwlist), (yyvsp[(10) - (13)].optsignature)); + &yyvsp[-9].signature, yyvsp[-7].number, yyvsp[-5].number, &yyvsp[-4].optflags, yyvsp[-1].codeb, yyvsp[0].codeb, + yyvsp[-6].throwlist, yyvsp[-3].optsignature); } else { @@ -4208,11 +3875,11 @@ yyreduce: /* Check it doesn't already exist. */ for (al = scope->casts; al != NULL; al = al->next) - if (sameScopedName((yyvsp[(2) - (13)].memArg).u.snd, al->arg.u.snd)) + if (sameScopedName(yyvsp[-11].memArg.u.snd, al->arg.u.snd)) yyerror("This operator cast has already been specified in this class"); al = sipMalloc(sizeof (argList)); - al->arg = (yyvsp[(2) - (13)].memArg); + al->arg = yyvsp[-11].memArg; al->next = scope->casts; scope->casts = al; @@ -4221,205 +3888,205 @@ yyreduce: currentIsStatic = FALSE; currentOverIsVirt = FALSE; - ;} + } break; case 237: #line 1874 "parser.y" - {(yyval.text) = "__add__";;} + {yyval.text = "__add__";} break; case 238: #line 1875 "parser.y" - {(yyval.text) = "__sub__";;} + {yyval.text = "__sub__";} break; case 239: #line 1876 "parser.y" - {(yyval.text) = "__mul__";;} + {yyval.text = "__mul__";} break; case 240: #line 1877 "parser.y" - {(yyval.text) = "__div__";;} + {yyval.text = "__div__";} break; case 241: #line 1878 "parser.y" - {(yyval.text) = "__mod__";;} + {yyval.text = "__mod__";} break; case 242: #line 1879 "parser.y" - {(yyval.text) = "__and__";;} + {yyval.text = "__and__";} break; case 243: #line 1880 "parser.y" - {(yyval.text) = "__or__";;} + {yyval.text = "__or__";} break; case 244: #line 1881 "parser.y" - {(yyval.text) = "__xor__";;} + {yyval.text = "__xor__";} break; case 245: #line 1882 "parser.y" - {(yyval.text) = "__lshift__";;} + {yyval.text = "__lshift__";} break; case 246: #line 1883 "parser.y" - {(yyval.text) = "__rshift__";;} + {yyval.text = "__rshift__";} break; case 247: #line 1884 "parser.y" - {(yyval.text) = "__iadd__";;} + {yyval.text = "__iadd__";} break; case 248: #line 1885 "parser.y" - {(yyval.text) = "__isub__";;} + {yyval.text = "__isub__";} break; case 249: #line 1886 "parser.y" - {(yyval.text) = "__imul__";;} + {yyval.text = "__imul__";} break; case 250: #line 1887 "parser.y" - {(yyval.text) = "__idiv__";;} + {yyval.text = "__idiv__";} break; case 251: #line 1888 "parser.y" - {(yyval.text) = "__imod__";;} + {yyval.text = "__imod__";} break; case 252: #line 1889 "parser.y" - {(yyval.text) = "__iand__";;} + {yyval.text = "__iand__";} break; case 253: #line 1890 "parser.y" - {(yyval.text) = "__ior__";;} + {yyval.text = "__ior__";} break; case 254: #line 1891 "parser.y" - {(yyval.text) = "__ixor__";;} + {yyval.text = "__ixor__";} break; case 255: #line 1892 "parser.y" - {(yyval.text) = "__ilshift__";;} + {yyval.text = "__ilshift__";} break; case 256: #line 1893 "parser.y" - {(yyval.text) = "__irshift__";;} + {yyval.text = "__irshift__";} break; case 257: #line 1894 "parser.y" - {(yyval.text) = "__invert__";;} + {yyval.text = "__invert__";} break; case 258: #line 1895 "parser.y" - {(yyval.text) = "__call__";;} + {yyval.text = "__call__";} break; case 259: #line 1896 "parser.y" - {(yyval.text) = "__getitem__";;} + {yyval.text = "__getitem__";} break; case 260: #line 1897 "parser.y" - {(yyval.text) = "__lt__";;} + {yyval.text = "__lt__";} break; case 261: #line 1898 "parser.y" - {(yyval.text) = "__le__";;} + {yyval.text = "__le__";} break; case 262: #line 1899 "parser.y" - {(yyval.text) = "__eq__";;} + {yyval.text = "__eq__";} break; case 263: #line 1900 "parser.y" - {(yyval.text) = "__ne__";;} + {yyval.text = "__ne__";} break; case 264: #line 1901 "parser.y" - {(yyval.text) = "__gt__";;} + {yyval.text = "__gt__";} break; case 265: #line 1902 "parser.y" - {(yyval.text) = "__ge__";;} + {yyval.text = "__ge__";} break; case 266: #line 1905 "parser.y" { - (yyval.number) = FALSE; - ;} + yyval.number = FALSE; + } break; case 267: #line 1908 "parser.y" { - (yyval.number) = TRUE; - ;} + yyval.number = TRUE; + } break; case 268: #line 1913 "parser.y" { - (yyval.number) = 0; - ;} + yyval.number = 0; + } break; case 269: #line 1916 "parser.y" { - if ((yyvsp[(2) - (2)].number) != 0) + if (yyvsp[0].number != 0) yyerror("Abstract virtual function '= 0' expected"); - (yyval.number) = TRUE; - ;} + yyval.number = TRUE; + } break; case 270: #line 1924 "parser.y" { - (yyval.optflags).nrFlags = 0; - ;} + yyval.optflags.nrFlags = 0; + } break; case 271: #line 1927 "parser.y" { - (yyval.optflags) = (yyvsp[(2) - (3)].optflags); - ;} + yyval.optflags = yyvsp[-1].optflags; + } break; case 272: #line 1933 "parser.y" { - (yyval.optflags).flags[0] = (yyvsp[(1) - (1)].flag); - (yyval.optflags).nrFlags = 1; - ;} + yyval.optflags.flags[0] = yyvsp[0].flag; + yyval.optflags.nrFlags = 1; + } break; case 273: @@ -4427,81 +4094,81 @@ yyreduce: { /* Check there is room. */ - if ((yyvsp[(1) - (3)].optflags).nrFlags == MAX_NR_FLAGS) + if (yyvsp[-2].optflags.nrFlags == MAX_NR_FLAGS) yyerror("Too many optional flags"); - (yyval.optflags) = (yyvsp[(1) - (3)].optflags); + yyval.optflags = yyvsp[-2].optflags; - (yyval.optflags).flags[(yyval.optflags).nrFlags++] = (yyvsp[(3) - (3)].flag); - ;} + yyval.optflags.flags[yyval.optflags.nrFlags++] = yyvsp[0].flag; + } break; case 274: #line 1949 "parser.y" { - (yyval.flag).ftype = bool_flag; - (yyval.flag).fname = (yyvsp[(1) - (1)].text); - ;} + yyval.flag.ftype = bool_flag; + yyval.flag.fname = yyvsp[0].text; + } break; case 275: #line 1953 "parser.y" { - (yyval.flag) = (yyvsp[(3) - (3)].flag); - (yyval.flag).fname = (yyvsp[(1) - (3)].text); - ;} + yyval.flag = yyvsp[0].flag; + yyval.flag.fname = yyvsp[-2].text; + } break; case 276: #line 1959 "parser.y" { - (yyval.flag).ftype = name_flag; - (yyval.flag).fvalue.sval = (yyvsp[(1) - (1)].text); - ;} + yyval.flag.ftype = name_flag; + yyval.flag.fvalue.sval = yyvsp[0].text; + } break; case 277: #line 1963 "parser.y" { - (yyval.flag).ftype = string_flag; - (yyval.flag).fvalue.sval = (yyvsp[(1) - (1)].text); - ;} + yyval.flag.ftype = string_flag; + yyval.flag.fvalue.sval = yyvsp[0].text; + } break; case 278: #line 1967 "parser.y" { - (yyval.flag).ftype = integer_flag; - (yyval.flag).fvalue.ival = (yyvsp[(1) - (1)].number); - ;} + yyval.flag.ftype = integer_flag; + yyval.flag.fvalue.ival = yyvsp[0].number; + } break; case 279: #line 1973 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 280: #line 1976 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 281: #line 1981 "parser.y" { - (yyval.codeb) = NULL; - ;} + yyval.codeb = NULL; + } break; case 282: #line 1984 "parser.y" { - (yyval.codeb) = (yyvsp[(2) - (2)].codeb); - ;} + yyval.codeb = yyvsp[0].codeb; + } break; case 283: @@ -4511,9 +4178,9 @@ yyreduce: nrrxcon = nrrxdis = nrslotcon = nrslotdis = nrarray = nrarraysize = 0; - for (a = 0; a < (yyvsp[(1) - (1)].signature).nrArgs; ++a) + for (a = 0; a < yyvsp[0].signature.nrArgs; ++a) { - argDef *ad = &(yyvsp[(1) - (1)].signature).args[a]; + argDef *ad = &yyvsp[0].signature.args[a]; switch (ad -> atype) { @@ -4550,8 +4217,8 @@ yyreduce: if (nrarray != nrarraysize || nrarray > 1) yyerror("/Array/ and /ArraySize/ must both be given and at most once"); - (yyval.signature) = (yyvsp[(1) - (1)].signature); - ;} + yyval.signature = yyvsp[0].signature; + } break; case 284: @@ -4559,8 +4226,8 @@ yyreduce: { /* No arguments. */ - (yyval.signature).nrArgs = 0; - ;} + yyval.signature.nrArgs = 0; + } break; case 285: @@ -4568,170 +4235,170 @@ yyreduce: { /* The single or first argument. */ - (yyval.signature).args[0] = (yyvsp[(1) - (1)].memArg); - (yyval.signature).nrArgs = 1; - ;} + yyval.signature.args[0] = yyvsp[0].memArg; + yyval.signature.nrArgs = 1; + } break; case 286: #line 2048 "parser.y" { /* Check that it wasn't ...(,arg...). */ - if ((yyvsp[(1) - (3)].signature).nrArgs == 0) + if (yyvsp[-2].signature.nrArgs == 0) yyerror("First argument of the list is missing"); /* Check there is nothing after an ellipsis. */ - if ((yyvsp[(1) - (3)].signature).args[(yyvsp[(1) - (3)].signature).nrArgs - 1].atype == ellipsis_type) + if (yyvsp[-2].signature.args[yyvsp[-2].signature.nrArgs - 1].atype == ellipsis_type) yyerror("An ellipsis must be at the end of the argument list"); /* * If this argument has no default value, then the * previous one mustn't either. */ - if ((yyvsp[(3) - (3)].memArg).defval == NULL && (yyvsp[(1) - (3)].signature).args[(yyvsp[(1) - (3)].signature).nrArgs - 1].defval != NULL) + if (yyvsp[0].memArg.defval == NULL && yyvsp[-2].signature.args[yyvsp[-2].signature.nrArgs - 1].defval != NULL) yyerror("Compulsory argument given after optional argument"); /* Check there is room. */ - if ((yyvsp[(1) - (3)].signature).nrArgs == MAX_NR_ARGS) + if (yyvsp[-2].signature.nrArgs == MAX_NR_ARGS) yyerror("Internal error - increase the value of MAX_NR_ARGS"); - (yyval.signature) = (yyvsp[(1) - (3)].signature); + yyval.signature = yyvsp[-2].signature; - (yyval.signature).args[(yyval.signature).nrArgs] = (yyvsp[(3) - (3)].memArg); - (yyval.signature).nrArgs++; - ;} + yyval.signature.args[yyval.signature.nrArgs] = yyvsp[0].memArg; + yyval.signature.nrArgs++; + } break; case 287: #line 2075 "parser.y" { - (yyval.memArg).atype = signal_type; - (yyval.memArg).argflags = ARG_IS_CONST; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (4)].text); - (yyval.memArg).defval = (yyvsp[(4) - (4)].valp); + yyval.memArg.atype = signal_type; + yyval.memArg.argflags = ARG_IS_CONST; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-2].text; + yyval.memArg.defval = yyvsp[0].valp; currentSpec -> sigslots = TRUE; - ;} + } break; case 288: #line 2084 "parser.y" { - (yyval.memArg).atype = slot_type; - (yyval.memArg).argflags = ARG_IS_CONST; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (4)].text); - (yyval.memArg).defval = (yyvsp[(4) - (4)].valp); + yyval.memArg.atype = slot_type; + yyval.memArg.argflags = ARG_IS_CONST; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-2].text; + yyval.memArg.defval = yyvsp[0].valp; currentSpec -> sigslots = TRUE; - ;} + } break; case 289: #line 2093 "parser.y" { - (yyval.memArg).atype = anyslot_type; - (yyval.memArg).argflags = ARG_IS_CONST; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (4)].text); - (yyval.memArg).defval = (yyvsp[(4) - (4)].valp); + yyval.memArg.atype = anyslot_type; + yyval.memArg.argflags = ARG_IS_CONST; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-2].text; + yyval.memArg.defval = yyvsp[0].valp; currentSpec -> sigslots = TRUE; - ;} + } break; case 290: #line 2102 "parser.y" { - (yyval.memArg).atype = rxcon_type; - (yyval.memArg).argflags = 0; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (3)].text); + yyval.memArg.atype = rxcon_type; + yyval.memArg.argflags = 0; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-1].text; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags), "SingleShot", bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_SINGLE_SHOT; + if (findOptFlag(&yyvsp[0].optflags, "SingleShot", bool_flag) != NULL) + yyval.memArg.argflags |= ARG_SINGLE_SHOT; currentSpec -> sigslots = TRUE; - ;} + } break; case 291: #line 2113 "parser.y" { - (yyval.memArg).atype = rxdis_type; - (yyval.memArg).argflags = 0; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (3)].text); + yyval.memArg.atype = rxdis_type; + yyval.memArg.argflags = 0; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-1].text; currentSpec -> sigslots = TRUE; - ;} + } break; case 292: #line 2121 "parser.y" { - (yyval.memArg).atype = slotcon_type; - (yyval.memArg).argflags = ARG_IS_CONST; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(5) - (6)].text); + yyval.memArg.atype = slotcon_type; + yyval.memArg.argflags = ARG_IS_CONST; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-1].text; - (yyvsp[(3) - (6)].signature).result.atype = void_type; - (yyvsp[(3) - (6)].signature).result.argflags = 0; - (yyvsp[(3) - (6)].signature).result.nrderefs = 0; + yyvsp[-3].signature.result.atype = void_type; + yyvsp[-3].signature.result.argflags = 0; + yyvsp[-3].signature.result.nrderefs = 0; - (yyval.memArg).u.sa = sipMalloc(sizeof (signatureDef)); - *(yyval.memArg).u.sa = (yyvsp[(3) - (6)].signature); + yyval.memArg.u.sa = sipMalloc(sizeof (signatureDef)); + *yyval.memArg.u.sa = yyvsp[-3].signature; currentSpec -> sigslots = TRUE; - ;} + } break; case 293: #line 2136 "parser.y" { - (yyval.memArg).atype = slotdis_type; - (yyval.memArg).argflags = ARG_IS_CONST; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(5) - (6)].text); + yyval.memArg.atype = slotdis_type; + yyval.memArg.argflags = ARG_IS_CONST; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-1].text; - (yyvsp[(3) - (6)].signature).result.atype = void_type; - (yyvsp[(3) - (6)].signature).result.argflags = 0; - (yyvsp[(3) - (6)].signature).result.nrderefs = 0; + yyvsp[-3].signature.result.atype = void_type; + yyvsp[-3].signature.result.argflags = 0; + yyvsp[-3].signature.result.nrderefs = 0; - (yyval.memArg).u.sa = sipMalloc(sizeof (signatureDef)); - *(yyval.memArg).u.sa = (yyvsp[(3) - (6)].signature); + yyval.memArg.u.sa = sipMalloc(sizeof (signatureDef)); + *yyval.memArg.u.sa = yyvsp[-3].signature; currentSpec -> sigslots = TRUE; - ;} + } break; case 294: #line 2151 "parser.y" { - (yyval.memArg).atype = qobject_type; - (yyval.memArg).argflags = 0; - (yyval.memArg).nrderefs = 0; - (yyval.memArg).name = (yyvsp[(2) - (3)].text); - ;} + yyval.memArg.atype = qobject_type; + yyval.memArg.argflags = 0; + yyval.memArg.nrderefs = 0; + yyval.memArg.name = yyvsp[-1].text; + } break; case 295: #line 2157 "parser.y" { - (yyval.memArg) = (yyvsp[(1) - (2)].memArg); - (yyval.memArg).defval = (yyvsp[(2) - (2)].valp); - ;} + yyval.memArg = yyvsp[-1].memArg; + yyval.memArg.defval = yyvsp[0].valp; + } break; case 296: #line 2163 "parser.y" - {currentIsStatic = TRUE;;} + {currentIsStatic = TRUE;} break; case 301: #line 2171 "parser.y" - {currentOverIsVirt = TRUE;;} + {currentOverIsVirt = TRUE;} break; case 304: @@ -4746,116 +4413,116 @@ yyreduce: if ((sectionFlags & SECT_IS_PUBLIC) == 0) yyerror("Class variables must be in the public section"); - if (!currentIsStatic && (yyvsp[(5) - (7)].codeb) != NULL) + if (!currentIsStatic && yyvsp[-2].codeb != NULL) yyerror("%AccessCode cannot be specified for non-static class variables"); } if (currentIsStatic && currentSpec -> genc) yyerror("Cannot have static members in a C structure"); - if ((yyvsp[(6) - (7)].codeb) != NULL || (yyvsp[(7) - (7)].codeb) != NULL) + if (yyvsp[-1].codeb != NULL || yyvsp[0].codeb != NULL) { - if ((yyvsp[(5) - (7)].codeb) != NULL) + if (yyvsp[-2].codeb != NULL) yyerror("Cannot mix %AccessCode and %GetCode or %SetCode"); if (currentScope() == NULL) yyerror("Cannot specify %GetCode or %SetCode for global variables"); } - newVar(currentSpec,currentModule,(yyvsp[(2) - (7)].text),currentIsStatic,&(yyvsp[(1) - (7)].memArg),&(yyvsp[(3) - (7)].optflags),(yyvsp[(5) - (7)].codeb),(yyvsp[(6) - (7)].codeb),(yyvsp[(7) - (7)].codeb)); + newVar(currentSpec,currentModule,yyvsp[-5].text,currentIsStatic,&yyvsp[-6].memArg,&yyvsp[-4].optflags,yyvsp[-2].codeb,yyvsp[-1].codeb,yyvsp[0].codeb); } currentIsStatic = FALSE; - ;} + } break; case 305: #line 2208 "parser.y" { - (yyval.memArg) = (yyvsp[(2) - (4)].memArg); - (yyval.memArg).nrderefs = (yyvsp[(3) - (4)].number); - (yyval.memArg).argflags = ARG_IS_CONST | (yyvsp[(4) - (4)].number); - (yyval.memArg).name = NULL; - ;} + yyval.memArg = yyvsp[-2].memArg; + yyval.memArg.nrderefs = yyvsp[-1].number; + yyval.memArg.argflags = ARG_IS_CONST | yyvsp[0].number; + yyval.memArg.name = NULL; + } break; case 306: #line 2214 "parser.y" { - (yyval.memArg) = (yyvsp[(1) - (3)].memArg); - (yyval.memArg).nrderefs = (yyvsp[(2) - (3)].number); - (yyval.memArg).argflags = (yyvsp[(3) - (3)].number); - (yyval.memArg).name = NULL; - ;} + yyval.memArg = yyvsp[-2].memArg; + yyval.memArg.nrderefs = yyvsp[-1].number; + yyval.memArg.argflags = yyvsp[0].number; + yyval.memArg.name = NULL; + } break; case 307: #line 2222 "parser.y" { - (yyval.memArg) = (yyvsp[(1) - (3)].memArg); - (yyval.memArg).name = (yyvsp[(2) - (3)].text); + yyval.memArg = yyvsp[-2].memArg; + yyval.memArg.name = yyvsp[-1].text; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"AllowNone",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_ALLOW_NONE; + if (findOptFlag(&yyvsp[0].optflags,"AllowNone",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_ALLOW_NONE; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"GetWrapper",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_GET_WRAPPER; + if (findOptFlag(&yyvsp[0].optflags,"GetWrapper",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_GET_WRAPPER; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"Array",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_ARRAY; + if (findOptFlag(&yyvsp[0].optflags,"Array",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_ARRAY; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"ArraySize",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_ARRAY_SIZE; + if (findOptFlag(&yyvsp[0].optflags,"ArraySize",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_ARRAY_SIZE; - if (getTransfer(&(yyvsp[(3) - (3)].optflags))) - (yyval.memArg).argflags |= ARG_XFERRED; + if (getTransfer(&yyvsp[0].optflags)) + yyval.memArg.argflags |= ARG_XFERRED; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"TransferThis",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_THIS_XFERRED; + if (findOptFlag(&yyvsp[0].optflags,"TransferThis",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_THIS_XFERRED; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"TransferBack",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_XFERRED_BACK; + if (findOptFlag(&yyvsp[0].optflags,"TransferBack",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_XFERRED_BACK; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"In",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_IN; + if (findOptFlag(&yyvsp[0].optflags,"In",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_IN; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"Out",bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_OUT; + if (findOptFlag(&yyvsp[0].optflags,"Out",bool_flag) != NULL) + yyval.memArg.argflags |= ARG_OUT; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags), "ResultSize", bool_flag) != NULL) - (yyval.memArg).argflags |= ARG_RESULT_SIZE; + if (findOptFlag(&yyvsp[0].optflags, "ResultSize", bool_flag) != NULL) + yyval.memArg.argflags |= ARG_RESULT_SIZE; - if (findOptFlag(&(yyvsp[(3) - (3)].optflags),"Constrained",bool_flag) != NULL) + if (findOptFlag(&yyvsp[0].optflags,"Constrained",bool_flag) != NULL) { - (yyval.memArg).argflags |= ARG_CONSTRAINED; + yyval.memArg.argflags |= ARG_CONSTRAINED; - switch ((yyval.memArg).atype) + switch (yyval.memArg.atype) { case bool_type: - (yyval.memArg).atype = cbool_type; + yyval.memArg.atype = cbool_type; break; case int_type: - (yyval.memArg).atype = cint_type; + yyval.memArg.atype = cint_type; break; case float_type: - (yyval.memArg).atype = cfloat_type; + yyval.memArg.atype = cfloat_type; break; case double_type: - (yyval.memArg).atype = cdouble_type; + yyval.memArg.atype = cdouble_type; break; } } - ;} + } break; case 308: #line 2282 "parser.y" { - (yyval.number) = 0; - ;} + yyval.number = 0; + } break; case 309: @@ -4864,30 +4531,30 @@ yyreduce: if (currentSpec -> genc) yyerror("References not allowed in a C module"); - (yyval.number) = ARG_IS_REF; - ;} + yyval.number = ARG_IS_REF; + } break; case 310: #line 2293 "parser.y" { - (yyval.number) = 0; - ;} + yyval.number = 0; + } break; case 311: #line 2296 "parser.y" { - (yyval.number) = (yyvsp[(1) - (2)].number) + 1; - ;} + yyval.number = yyvsp[-1].number + 1; + } break; case 312: #line 2301 "parser.y" { - (yyval.memArg).atype = defined_type; - (yyval.memArg).u.snd = (yyvsp[(1) - (1)].scpvalp); - ;} + yyval.memArg.atype = defined_type; + yyval.memArg.u.snd = yyvsp[0].scpvalp; + } break; case 313: @@ -4896,12 +4563,12 @@ yyreduce: templateDef *td; td = sipMalloc(sizeof(templateDef)); - td -> fqname = (yyvsp[(1) - (4)].scpvalp); - td -> types = (yyvsp[(3) - (4)].signature); + td -> fqname = yyvsp[-3].scpvalp; + td -> types = yyvsp[-1].signature; - (yyval.memArg).atype = template_type; - (yyval.memArg).u.td = td; - ;} + yyval.memArg.atype = template_type; + yyval.memArg.u.td = td; + } break; case 314: @@ -4910,190 +4577,190 @@ yyreduce: /* In a C module all structures must be defined. */ if (currentSpec -> genc) { - (yyval.memArg).atype = defined_type; - (yyval.memArg).u.snd = (yyvsp[(2) - (2)].scpvalp); + yyval.memArg.atype = defined_type; + yyval.memArg.u.snd = yyvsp[0].scpvalp; } else { - (yyval.memArg).atype = struct_type; - (yyval.memArg).u.sname = (yyvsp[(2) - (2)].scpvalp); + yyval.memArg.atype = struct_type; + yyval.memArg.u.sname = yyvsp[0].scpvalp; } - ;} + } break; case 315: #line 2328 "parser.y" { - (yyval.memArg).atype = ushort_type; - ;} + yyval.memArg.atype = ushort_type; + } break; case 316: #line 2331 "parser.y" { - (yyval.memArg).atype = short_type; - ;} + yyval.memArg.atype = short_type; + } break; case 317: #line 2334 "parser.y" { - (yyval.memArg).atype = uint_type; - ;} + yyval.memArg.atype = uint_type; + } break; case 318: #line 2337 "parser.y" { - (yyval.memArg).atype = uint_type; - ;} + yyval.memArg.atype = uint_type; + } break; case 319: #line 2340 "parser.y" { - (yyval.memArg).atype = int_type; - ;} + yyval.memArg.atype = int_type; + } break; case 320: #line 2343 "parser.y" { - (yyval.memArg).atype = long_type; - ;} + yyval.memArg.atype = long_type; + } break; case 321: #line 2346 "parser.y" { - (yyval.memArg).atype = ulong_type; - ;} + yyval.memArg.atype = ulong_type; + } break; case 322: #line 2349 "parser.y" { - (yyval.memArg).atype = longlong_type; - ;} + yyval.memArg.atype = longlong_type; + } break; case 323: #line 2352 "parser.y" { - (yyval.memArg).atype = ulonglong_type; - ;} + yyval.memArg.atype = ulonglong_type; + } break; case 324: #line 2355 "parser.y" { - (yyval.memArg).atype = float_type; - ;} + yyval.memArg.atype = float_type; + } break; case 325: #line 2358 "parser.y" { - (yyval.memArg).atype = double_type; - ;} + yyval.memArg.atype = double_type; + } break; case 326: #line 2361 "parser.y" { - (yyval.memArg).atype = bool_type; - ;} + yyval.memArg.atype = bool_type; + } break; case 327: #line 2364 "parser.y" { - (yyval.memArg).atype = sstring_type; - ;} + yyval.memArg.atype = sstring_type; + } break; case 328: #line 2367 "parser.y" { - (yyval.memArg).atype = ustring_type; - ;} + yyval.memArg.atype = ustring_type; + } break; case 329: #line 2370 "parser.y" { - (yyval.memArg).atype = string_type; - ;} + yyval.memArg.atype = string_type; + } break; case 330: #line 2373 "parser.y" { - (yyval.memArg).atype = wstring_type; - ;} + yyval.memArg.atype = wstring_type; + } break; case 331: #line 2376 "parser.y" { - (yyval.memArg).atype = void_type; - ;} + yyval.memArg.atype = void_type; + } break; case 332: #line 2379 "parser.y" { - (yyval.memArg).atype = pyobject_type; - ;} + yyval.memArg.atype = pyobject_type; + } break; case 333: #line 2382 "parser.y" { - (yyval.memArg).atype = pytuple_type; - ;} + yyval.memArg.atype = pytuple_type; + } break; case 334: #line 2385 "parser.y" { - (yyval.memArg).atype = pylist_type; - ;} + yyval.memArg.atype = pylist_type; + } break; case 335: #line 2388 "parser.y" { - (yyval.memArg).atype = pydict_type; - ;} + yyval.memArg.atype = pydict_type; + } break; case 336: #line 2391 "parser.y" { - (yyval.memArg).atype = pycallable_type; - ;} + yyval.memArg.atype = pycallable_type; + } break; case 337: #line 2394 "parser.y" { - (yyval.memArg).atype = pyslice_type; - ;} + yyval.memArg.atype = pyslice_type; + } break; case 338: #line 2397 "parser.y" { - (yyval.memArg).atype = pytype_type; - ;} + yyval.memArg.atype = pytype_type; + } break; case 339: #line 2400 "parser.y" { - (yyval.memArg).atype = ellipsis_type; - ;} + yyval.memArg.atype = ellipsis_type; + } break; case 340: @@ -5101,34 +4768,34 @@ yyreduce: { /* The single or first type. */ - (yyval.signature).args[0] = (yyvsp[(1) - (1)].memArg); - (yyval.signature).nrArgs = 1; - ;} + yyval.signature.args[0] = yyvsp[0].memArg; + yyval.signature.nrArgs = 1; + } break; case 341: #line 2411 "parser.y" { /* Check there is nothing after an ellipsis. */ - if ((yyvsp[(1) - (3)].signature).args[(yyvsp[(1) - (3)].signature).nrArgs - 1].atype == ellipsis_type) + if (yyvsp[-2].signature.args[yyvsp[-2].signature.nrArgs - 1].atype == ellipsis_type) yyerror("An ellipsis must be at the end of the argument list"); /* Check there is room. */ - if ((yyvsp[(1) - (3)].signature).nrArgs == MAX_NR_ARGS) + if (yyvsp[-2].signature.nrArgs == MAX_NR_ARGS) yyerror("Internal error - increase the value of MAX_NR_ARGS"); - (yyval.signature) = (yyvsp[(1) - (3)].signature); + yyval.signature = yyvsp[-2].signature; - (yyval.signature).args[(yyval.signature).nrArgs] = (yyvsp[(3) - (3)].memArg); - (yyval.signature).nrArgs++; - ;} + yyval.signature.args[yyval.signature.nrArgs] = yyvsp[0].memArg; + yyval.signature.nrArgs++; + } break; case 342: #line 2427 "parser.y" { - (yyval.throwlist) = NULL; - ;} + yyval.throwlist = NULL; + } break; case 343: @@ -5137,8 +4804,8 @@ yyreduce: if (currentSpec->genc) yyerror("Exceptions not allowed in a C module"); - (yyval.throwlist) = (yyvsp[(3) - (4)].throwlist); - ;} + yyval.throwlist = yyvsp[-1].throwlist; + } break; case 344: @@ -5146,9 +4813,9 @@ yyreduce: { /* Empty list so use a blank. */ - (yyval.throwlist) = sipMalloc(sizeof (throwArgs)); - (yyval.throwlist) -> nrArgs = 0; - ;} + yyval.throwlist = sipMalloc(sizeof (throwArgs)); + yyval.throwlist -> nrArgs = 0; + } break; case 345: @@ -5156,10 +4823,10 @@ yyreduce: { /* The only or first exception. */ - (yyval.throwlist) = sipMalloc(sizeof (throwArgs)); - (yyval.throwlist) -> nrArgs = 1; - (yyval.throwlist) -> args[0] = findException(currentSpec, (yyvsp[(1) - (1)].scpvalp), FALSE); - ;} + yyval.throwlist = sipMalloc(sizeof (throwArgs)); + yyval.throwlist -> nrArgs = 1; + yyval.throwlist -> args[0] = findException(currentSpec, yyvsp[0].scpvalp, FALSE); + } break; case 346: @@ -5167,28 +4834,29 @@ yyreduce: { /* Check that it wasn't ...(,arg...). */ - if ((yyvsp[(1) - (3)].throwlist) -> nrArgs == 0) + if (yyvsp[-2].throwlist -> nrArgs == 0) yyerror("First exception of throw specifier is missing"); /* Check there is room. */ - if ((yyvsp[(1) - (3)].throwlist) -> nrArgs == MAX_NR_ARGS) + if (yyvsp[-2].throwlist -> nrArgs == MAX_NR_ARGS) yyerror("Internal error - increase the value of MAX_NR_ARGS"); - (yyval.throwlist) = (yyvsp[(1) - (3)].throwlist); - (yyval.throwlist) -> args[(yyval.throwlist) -> nrArgs++] = findException(currentSpec, (yyvsp[(3) - (3)].scpvalp), FALSE); - ;} + yyval.throwlist = yyvsp[-2].throwlist; + yyval.throwlist -> args[yyval.throwlist -> nrArgs++] = findException(currentSpec, yyvsp[0].scpvalp, FALSE); + } break; -/* Line 1267 of yacc.c. */ -#line 5186 "parser.tab.c" - default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - YYPOPSTACK (yylen); - yylen = 0; +/* Line 1010 of yacc.c. */ +#line 4855 "parser.c" +* + yyvsp -= yylen; + yyssp -= yylen; + + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -5217,65 +4885,99 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else - { - 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 +#if YYERROR_VERBOSE + yyn = yypact[yystate]; + + if (YYPACT_NINF < yyn && yyn < YYLAST) + { + YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); + const char* yyprefix; + char *yymsg; + int yyx; + + /* 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; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 0; + + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) + { + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) + { + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + yyp = yystpcpy (yyp, yyprefix); + yyp = yystpcpy (yyp, yytname[yyx]); + yyprefix = " or "; + } + } + yyerror (yymsg); + YYSTACK_FREE (yymsg); + } + else + yyerror ("syntax error; also virtual memory exhausted"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror ("syntax error"); } 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) - { - /* Return failure if at end of input. */ + { + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ if (yychar == YYEOF) - YYABORT; - } + for (;;) + { + YYPOPSTACK; + if (yyssp == yyss) + YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + } + } else { - yydestruct ("Error: discarding", - yytoken, &yylval); + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); yychar = YYEMPTY; + } } - /* 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; @@ -5285,17 +4987,15 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) goto yyerrorlab; +#endif - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); + yyvsp -= yylen; + yyssp -= yylen; yystate = *yyssp; goto yyerrlab1; @@ -5324,10 +5024,9 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -5335,11 +5034,10 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - *++yyvsp = yylval; + YYDPRINTF ((stderr, "Shifting error token, ")); + *++yyvsp = yylval; - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -5360,39 +5058,21 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } @@ -5409,7 +5089,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl, classTmplDef *tcd; /* Initialise the spec. */ - + spec -> modules = NULL; spec -> namecache = NULL; spec -> ifacefiles = NULL; @@ -5959,7 +5639,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of) /* Provide a default ctor. */ cd->ctors = sipMalloc(sizeof (ctorDef)); - + cd->ctors->ctorflags = SECT_IS_PUBLIC; cd->ctors->pysig.nrArgs = 0; cd->ctors->cppsig = &cd -> ctors -> pysig; @@ -6962,8 +6642,6 @@ static void newVar(sipSpec *pt,moduleDef *mod,char *name,int isstatic, var -> accessfunc = acode; var -> getcode = gcode; var -> setcode = scode; - var -> getter = NULL; - var -> setter = NULL; var -> next = pt -> vars; if (isstatic || (escope != NULL && escope->iff->type == namespace_iface)) @@ -7278,11 +6956,6 @@ static const char *getPythonName(optFlags *optflgs, const char *cname) if ((of = findOptFlag(optflgs, "PyName", name_flag)) != NULL) pname = of -> fvalue.sval; - else if (optFind(currentSpec, "RenameWx") && - strlen(cname) > 2 && - cname[0] == 'w' && - cname[1] == 'x') - pname = cname + 2; else pname = cname; @@ -8085,14 +7758,6 @@ int optQ_OBJECT4(sipSpec *pt) return optFind(pt, "Qt4Q_OBJECT"); } -/* - * Return TRUE if property auto generation is enabled. - */ -int optAutoProperties(sipSpec *pt) -{ - return optFind(pt, "AutoProperties"); -} - /* * Return TRUE if the AssignmentHelpers option was specified. @@ -8102,13 +7767,6 @@ int optAssignmentHelpers(sipSpec *pt) return optFind(pt, "AssignmentHelpers"); } -/* - * Return TRUE if the ThreadChecking option was specified. - */ -int optThreadChecking(sipSpec *pt) -{ - return optFind(pt, "ThreadChecking"); -} /* * Return TRUE if a particular option was specified with %SIPOptions. sipgen/parser.c @@ -1,9 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 1.875d. */ -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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 @@ -17,21 +15,13 @@ 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. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - 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. + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ /* Tokens. */ #ifndef YYTOKENTYPE @@ -143,7 +133,6 @@ TK_ELLIPSIS = 359 }; #endif -/* Tokens. */ #define TK_OPTIONS 258 #define TK_NOEMITTERS 259 #define TK_DOC 260 @@ -250,10 +239,9 @@ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #line 105 "parser.y" -{ +typedef union YYSTYPE { char qchar; char *text; long number; @@ -272,10 +260,9 @@ typedef union YYSTYPE int boolean; exceptionDef exceptionbase; classDef *klass; -} -/* Line 1489 of yacc.c. */ -#line 278 "parser.h" - YYSTYPE; +} YYSTYPE; +/* Line 1241 of yacc.c. */ +#line 266 "parser.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -283,3 +270,5 @@ typedef union YYSTYPE extern YYSTYPE yylval; + + sipgen/parser.h @@ -2,12 +2,12 @@ * The SIP parser. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -777,15 +777,15 @@ license: TK_LICENSE optflags { currentModule -> license -> type = of -> fvalue.sval; - currentModule -> license -> licensee = + currentModule -> license -> licensee = ((of = findOptFlag(&$2,"Licensee",string_flag)) != NULL) ? of -> fvalue.sval : NULL; - currentModule -> license -> timestamp = + currentModule -> license -> timestamp = ((of = findOptFlag(&$2,"Timestamp",string_flag)) != NULL) ? of -> fvalue.sval : NULL; - currentModule -> license -> sig = + currentModule -> license -> sig = ((of = findOptFlag(&$2,"Signature",string_flag)) != NULL) ? of -> fvalue.sval : NULL; } @@ -1139,15 +1139,15 @@ optassign: { expr: value | expr binop value { valueDef *vd; - + if ($1 -> vtype == string_value || $3 -> vtype == string_value) yyerror("Invalid binary operator for string"); - + /* Find the last value in the existing expression. */ - + for (vd = $1; vd -> next != NULL; vd = vd -> next) ; - + vd -> vbinop = $2; vd -> next = $3; @@ -1195,14 +1195,14 @@ optunop: { value: optunop simplevalue { if ($1 != '\0' && $2.vtype == string_value) yyerror("Invalid unary operator for string"); - + /* * Convert the value to a simple expression on the * heap. */ - + $$ = sipMalloc(sizeof (valueDef)); - + *$$ = $2; $$ -> vunop = $1; $$ -> vbinop = '\0'; @@ -1436,7 +1436,7 @@ superclasses: ; superlist: superclass - | superlist ',' superclass + | superlist ',' superclass ; superclass: scopedname { @@ -2476,7 +2476,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl, classTmplDef *tcd; /* Initialise the spec. */ - + spec -> modules = NULL; spec -> namecache = NULL; spec -> ifacefiles = NULL; @@ -3026,7 +3026,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, optFlags *of) /* Provide a default ctor. */ cd->ctors = sipMalloc(sizeof (ctorDef)); - + cd->ctors->ctorflags = SECT_IS_PUBLIC; cd->ctors->pysig.nrArgs = 0; cd->ctors->cppsig = &cd -> ctors -> pysig; @@ -4029,8 +4029,6 @@ static void newVar(sipSpec *pt,moduleDef *mod,char *name,int isstatic, var -> accessfunc = acode; var -> getcode = gcode; var -> setcode = scode; - var -> getter = NULL; - var -> setter = NULL; var -> next = pt -> vars; if (isstatic || (escope != NULL && escope->iff->type == namespace_iface)) @@ -4345,11 +4343,6 @@ static const char *getPythonName(optFlags *optflgs, const char *cname) if ((of = findOptFlag(optflgs, "PyName", name_flag)) != NULL) pname = of -> fvalue.sval; - else if (optFind(currentSpec, "RenameWx") && - strlen(cname) > 2 && - cname[0] == 'w' && - cname[1] == 'x') - pname = cname + 2; else pname = cname; @@ -5152,14 +5145,6 @@ int optQ_OBJECT4(sipSpec *pt) return optFind(pt, "Qt4Q_OBJECT"); } -/* - * Return TRUE if property auto generation is enabled. - */ -int optAutoProperties(sipSpec *pt) -{ - return optFind(pt, "AutoProperties"); -} - /* * Return TRUE if the AssignmentHelpers option was specified. @@ -5169,13 +5154,6 @@ int optAssignmentHelpers(sipSpec *pt) return optFind(pt, "AssignmentHelpers"); } -/* - * Return TRUE if the ThreadChecking option was specified. - */ -int optThreadChecking(sipSpec *pt) -{ - return optFind(pt, "ThreadChecking"); -} /* * Return TRUE if a particular option was specified with %SIPOptions. sipgen/parser.y @@ -2,12 +2,12 @@ * The main header file for SIP. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -275,14 +275,11 @@ #define VAR_IS_STATIC 0x01 /* It is a static variable. */ #define VAR_NEEDS_HANDLER 0x02 /* It the variable needs a handler. */ -#define VAR_IS_PROPERTY 0x04 /* It is a Getter/Setter wrapper. */ #define isStaticVar(v) ((v)->varflags & VAR_IS_STATIC) #define setIsStaticVar(v) ((v)->varflags |= VAR_IS_STATIC) #define needsHandler(v) ((v)->varflags & VAR_NEEDS_HANDLER) #define setNeedsHandler(v) ((v)->varflags |= VAR_NEEDS_HANDLER) -#define isProperty(v) ((v)->varflags & VAR_IS_PROPERTY) -#define setIsProperty(v) ((v)->varflags |= VAR_IS_PROPERTY) /* Handle argument flags. */ @@ -791,8 +788,6 @@ typedef struct _varDef { codeBlock *accessfunc; /* The access function. */ codeBlock *getcode; /* The get code. */ codeBlock *setcode; /* The set code. */ - struct _overDef* getter; /* The name of the getter function. */ - struct _overDef* setter; /* The name of the setter function. */ struct _varDef *next; /* Next in the list. */ } varDef; @@ -1050,8 +1045,6 @@ int optNoEmitters(sipSpec *pt); int optRegisterTypes(sipSpec *pt); int optQ_OBJECT4(sipSpec *pt); int optAssignmentHelpers(sipSpec *pt); -int optThreadChecking(sipSpec *pt); -int optAutoProperties(sipSpec *pt); void yywarning(char *); nameDef *cacheName(sipSpec *pt, const char *name); sipgen/sip.h @@ -82,9 +82,6 @@ static void addComplementarySlot(sipSpec *pt, classDef *cd, memberDef *md, slotType cslot, const char *cslot_name); static void resolveInstantiatedClassTemplate(sipSpec *pt, argDef *type); -static void generateProperties(sipSpec *pt, moduleDef *mod, classDef *cd); -static void resolveInstantiatedClassTemplate(sipSpec *pt, argDef *type); - /* * Transform the parse tree. @@ -289,12 +286,6 @@ void transform(sipSpec *pt) for (cd = pt->classes; cd != NULL; cd = cd->next) if (generatingCodeForModule(pt, cd->iff->module)) registerMetaType(cd); - - /* Autogenerate properties */ - if (optAutoProperties(pt)) - for (cd = pt->classes; cd != NULL; cd = cd->next) - if (generatingCodeForModule(pt, cd->iff->module)) - generateProperties(pt, cd->iff->module, cd); } @@ -332,9 +323,6 @@ static void addComplementarySlots(sipSpec *pt, classDef *cd) case ne_slot: addComplementarySlot(pt, cd, md, eq_slot, "__eq__"); break; - - default: - break; } } @@ -1827,9 +1815,6 @@ static void resolveVariableType(sipSpec *pt, varDef *vd) if (!isReference(vtype) && vtype->nrderefs == 1) bad = FALSE; break; - - default: - break; } if (bad && (vd->getcode == NULL || vd->setcode == NULL)) @@ -2023,9 +2008,6 @@ static int supportedType(classDef *cd,overDef *od,argDef *ad,int outputs) } break; - - default: - break; } /* Unsupported if we got this far. */ @@ -2334,9 +2316,6 @@ int sameBaseType(argDef *a1, argDef *a2) return FALSE; break; - - default: - break; } /* Must be the same if we've got this far. */ @@ -3079,210 +3058,3 @@ static int generatingCodeForModule(sipSpec *pt, moduleDef *mod) return (pt->module == mod); } - -/* - * Fail with a message on stderr. - */ -static void exitmsg(char* msg) -{ - fprintf(stderr, msg); - exit(-1); -} - -static varDef* findProperty(sipSpec *pt, moduleDef *module, classDef *cd, overDef *over, nameDef* propertyName) -{ - varDef *var = NULL; - for(var = pt->vars; var != NULL; var = var->next) - { - if(var->ecd == cd && - var->module == module && - var->pyname == propertyName) - { - if (!isProperty(var)) - exitmsg("found property-like overload with no property flag set!"); - return var; - } - } - - return NULL; -} - -/* - * Returns the number of arguments without default values in an array of - * argDefs. - */ -static int countNonDefaultArgs(argDef args[], int nrArgs) -{ - int count = 0; - int i; - - for (i = 0; i < nrArgs; ++i) - if (args[i].defval == NULL) - ++count; - else - break; - - return count; -} - -/* - * Add a varDef representing a property for a given getter or setter method. - */ -static varDef* addOrFindProperty(sipSpec* pt, moduleDef* module, classDef* cd, overDef* over) -{ - int num_args; - nameDef* propertyName; - varDef* var; - scopedNameDef* varname; - scopedNameDef* scopedname; - - if (over->cppname == NULL || strlen(over->cppname) < 4) - exitmsg("error creating property"); - else if (strncmp("Get", over->cppname, 3) && strncmp("Set", over->cppname, 3)) - exitmsg("error creating property"); - - /* Propertes must start with Get or Set */ - propertyName = cacheName(pt, over->cppname + 3); - - /* Find the property if it already exists. */ - var = findProperty(pt, module, cd, over, propertyName); - if (var != NULL) - return var; - - /* We didn't find one, so make a new one. */ - var = sipMalloc(sizeof(varDef)); - setIsUsedName(propertyName); - var->pyname = propertyName; - - /* Create a scoped name for the property. */ - varname = text2scopePart(propertyName->text); - scopedname = copyScopedName(classFQCName(cd)); - appendScopedName(&scopedname, varname); - var->fqcname = scopedname; - - /* TODO: use newVar from parser.c if possible here. */ - /* also actually verify Get/Set pair takes and receives the same type of argument */ - num_args = countNonDefaultArgs(over->cppsig->args, over->cppsig->nrArgs); - if (num_args == 1) - /* its a setter */ - var->type = over->cppsig->args[0]; - else if (num_args == 0) - /* its a getter */ - var->type = over->cppsig->result; - else - { - fprintf("num_args: %d\n", num_args); - exitmsg("num_args was not 1 or 0"); - } - - var->ecd = cd; - var->module = module; - - var->varflags = 0; - var->accessfunc = 0; - var->getcode = 0; - var->setcode = 0; - - var->getter = 0; - var->setter = 0; - - /* Set properties on the new varDef. */ - setIsProperty(var); - setNeedsHandler(var); - setHasVarHandlers(cd); - if (isStatic(over)) - setIsStaticVar(var); - - /* Append the new variable to the module. */ - var->next = pt->vars; - pt->vars = var; - return var; -} - -static void addGetter(sipSpec* pt, moduleDef* module, classDef* cd, overDef* over) -{ - varDef* prop = addOrFindProperty(pt, module, cd, over); - if (prop->getter == NULL) - prop->getter = over; - -} - -static void addSetter(sipSpec* pt, moduleDef* module, classDef* cd, overDef* over) -{ - varDef* prop = addOrFindProperty(pt, module, cd, over); - if (prop->setter == NULL) - prop->setter = over; -} - -static int isAccessor(overDef* over) -{ - return isPublic(over) && - /* 0 == over->methodcode && */ - 0 == over->virthandler && - over->cppname != NULL && - strlen(over->cppname) > 3; -} - -/* - TODO: make these actually check for collisions with existing methods -*/ -static int isGetter(moduleDef* module, classDef* cd, overDef* over) -{ - /* starts with Get, looks like an accessor, and has no non default - arguments */ - return 0 == strncmp(over->cppname, "Get", 3) && - isAccessor(over) && - 0 == countNonDefaultArgs(over->cppsig->args, over->cppsig->nrArgs); -} - -static int isSetter(moduleDef* module, classDef* cd, overDef* over) -{ - /* starts with Set, looks like an accessor, and has one non default - argument */ - return 0 == strncmp(over->cppname, "Set", 3) && - isAccessor(over) && - 1 == countNonDefaultArgs(over->cppsig->args, over->cppsig->nrArgs); -} - -static void filterPropertiesWithoutGetters(sipSpec *pt) -{ - /* Clear out properties without getters. */ - varDef* var = pt->vars; - varDef* next; - varDef* prev; - while (var != NULL) - { - next = var->next; - - if (isProperty(var) && var->getter == NULL) - { - if (pt->vars == var) - pt->vars = next; - else - prev->next = next; - - free(var); - } - else - { - prev = var; - } - - var = next; - } -} - -static void generateProperties(sipSpec *pt, moduleDef *mod, classDef *cd) -{ - /* Create necessary getters and setters */ - overDef* over; - for (over = cd->overs; over != NULL; over = over->next) - { - if (isGetter(mod, cd, over)) - addGetter(pt, mod, cd, over); - else if (isSetter(mod, cd, over)) - addSetter(pt, mod, cd, over); - } - - filterPropertiesWithoutGetters(pt); -} sipgen/transform.c @@ -2,12 +2,12 @@ * The SIP module interface. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -50,8 +50,8 @@ extern "C" { /* * Define the SIP version number. */ -#define SIP_VERSION 0x040706 -#define SIP_VERSION_STR "4.7.6" +#define SIP_VERSION 0x040707 +#define SIP_VERSION_STR "4.7.7-snapshot-20080530" /* @@ -1266,7 +1266,6 @@ typedef struct _sipAPIDef { SIP_SSIZE_T size); PyObject *(*api_convert_from_const_void_ptr_and_size)(const void *val, SIP_SSIZE_T size); - int (*api_thread_check)(); /* * The following may be used by Qt support code but no other handwritten siplib/sip.h @@ -88,7 +88,6 @@ int sip_api_same_connection(sipSlotConnection *conn, void *tx, const char *sig, PyObject *rxObj, const char *slot); PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs); void sip_api_parse_type(const char *type, sipSigArg *arg); -void sip_api_threadcheck(); /* siplib/sipint.h @@ -2,12 +2,12 @@ * SIP library code. * * Copyright (c) 2008 Riverbank Computing Limited <info@riverbankcomputing.com> - * + * * This file is part of SIP. - * + * * This copy of SIP is licensed for use under the terms of the SIP License * Agreement. See the file LICENSE for more details. - * + * * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ @@ -129,7 +129,6 @@ static PyObject *sip_api_convert_from_void_ptr_and_size(void *val, SIP_SSIZE_T size); static PyObject *sip_api_convert_from_const_void_ptr_and_size(const void *val, SIP_SSIZE_T size); -static int sip_api_thread_check(); static int sip_api_is_exact_wrapped_type(sipWrapperType *wt); static int sip_api_assign_instance(void *dst, const void *src, sipWrapperType *wt); @@ -255,7 +254,6 @@ static const sipAPIDef sip_api = { sip_api_convert_from_const_void_ptr, sip_api_convert_from_void_ptr_and_size, sip_api_convert_from_const_void_ptr_and_size, - sip_api_thread_check, /* * The following may be used by Qt support code but by no other handwritten * code. @@ -436,7 +434,6 @@ static PyObject *transfer(PyObject *self, PyObject *args); static PyObject *transferBack(PyObject *self, PyObject *args); static PyObject *transferTo(PyObject *self, PyObject *args); static void print_wrapper(const char *label, sipWrapper *w); -static PyObject* wrapper_isPyOwned(PyObject* self, PyObject* args); static int sipWrapperType_Check(PyObject *op); static void addToParent(sipWrapper *self, sipWrapper *owner); static void removeFromParent(sipWrapper *self); @@ -485,7 +482,6 @@ PyMODINIT_FUNC initsip(void) {"cast", cast, METH_VARARGS, NULL}, {"delete", callDtor, METH_VARARGS, NULL}, {"dump", dumpWrapper, METH_VARARGS, NULL}, - {"ispyowned", wrapper_isPyOwned, METH_VARARGS, NULL}, {"isdeleted", isDeleted, METH_VARARGS, NULL}, {"setdeleted", setDeleted, METH_VARARGS, NULL}, {"settracemask", setTraceMask, METH_VARARGS, NULL}, @@ -641,18 +637,6 @@ static PyObject *dumpWrapper(PyObject *self, PyObject *args) return NULL; } -/* - * Returns True if the sipWrapper object is owned by Python, and False if it's - * owned by C++. - */ -static PyObject* wrapper_isPyOwned(PyObject* self, PyObject* args) -{ - sipWrapper* w; - if (!PyArg_ParseTuple(args, "O!:ispyowned", &sipWrapper_Type, &w)) - return NULL; - - return PyBool_FromLong(sipIsPyOwned(w)); -} /* * Write a reference to a wrapper to stdout. @@ -2800,24 +2784,24 @@ static int parsePass1(sipWrapper **selfp, int *selfargp, int *argsParsedp, case 'F': { /* Python callable object. */ - + if (PyCallable_Check(arg)) *va_arg(va,PyObject **) = arg; else valid = PARSE_TYPE; - + break; } case 'H': { /* Python callable object or None. */ - + if (arg == Py_None || PyCallable_Check(arg)) *va_arg(va,PyObject **) = arg; else valid = PARSE_TYPE; - + break; } @@ -4391,7 +4375,7 @@ static PyObject *handleGetLazyAttr(PyObject *nameobj,sipWrapperType *wt, return res; } - PyErr_Format(PyExc_AttributeError, "'%s' object has no attribute '%s'", ((PyTypeObject*)wt)->tp_name, name); + PyErr_SetObject(PyExc_AttributeError,nameobj); return NULL; } @@ -5894,26 +5878,26 @@ void sipSaveMethod(sipPyMethod *pm, PyObject *meth) static void sip_api_call_hook(const char *hookname) { PyObject *dictofmods, *mod, *dict, *hook, *res; - + /* Get the dictionary of modules. */ if ((dictofmods = PyImport_GetModuleDict()) == NULL) return; - + /* Get the __builtin__ module. */ if ((mod = PyDict_GetItemString(dictofmods,"__builtin__")) == NULL) return; - + /* Get it's dictionary. */ if ((dict = PyModule_GetDict(mod)) == NULL) return; - + /* Get the function hook. */ if ((hook = PyDict_GetItemString(dict,hookname)) == NULL) return; - + /* Call the hook and discard any result. */ res = PyObject_CallObject(hook,NULL); - + Py_XDECREF(res); } @@ -6724,57 +6708,6 @@ static PyObject *sip_api_convert_from_const_void_ptr_and_size(const void *val, return make_voidptr((void *)val, size, FALSE); } -/* - * Check that the current thread is the main thread. - */ -static int sip_api_thread_check() -{ - int result = FALSE; - int gotThreadName = 0; - char* threadNameCString; - - PyObject *module, *module_dict, *currentThreadFunc, *currentThread, - *threadName; - - SIP_BLOCK_THREADS - module = PyImport_ImportModule("threading"); - if (module) - { - module_dict = PyModule_GetDict(module); // borrowed reference - if (module_dict) - { - currentThreadFunc = PyDict_GetItemString(module_dict, "currentThread"); // borrowed - if (currentThreadFunc) - { - currentThread = PyObject_CallFunction(currentThreadFunc, NULL); - if (currentThread) - { - threadName = PyObject_CallMethod(currentThread, "getName", NULL); - if (threadName) - { - gotThreadName = TRUE; - threadNameCString = PyString_AsString(threadName); - if (threadNameCString && 0 == strcmp("MainThread", threadNameCString)) - result = TRUE; - else - PyErr_Format(PyExc_AssertionError, "Called from the wrong thread: %s", threadNameCString); - Py_DECREF(threadName); - } - Py_DECREF(currentThread); - } - } - } - Py_DECREF(module); - } - - if (!gotThreadName && !PyErr_Occurred()) - PyErr_SetString(PyExc_AssertionError, "Unknown error getting the current thread name"); - - SIP_UNBLOCK_THREADS - - return result; -} - /* * Do the work of converting a void pointer. @@ -7127,7 +7060,7 @@ static PyObject *sipWrapper_new(sipWrapperType *wt,PyObject *args,PyObject *kwds /* Check sip.wrapper is not being used directly. */ if (wt == &sipWrapper_Type) { - PyErr_Format(PyExc_TypeError,"the %s type cannot be instantiated or sub-classed (wt == &sipWrapper_Type)", ((PyTypeObject *)wt)->tp_name); + PyErr_Format(PyExc_TypeError,"the %s type cannot be instantiated or sub-classed", ((PyTypeObject *)wt)->tp_name); return NULL; } @@ -7152,7 +7085,7 @@ static PyObject *sipWrapper_new(sipWrapperType *wt,PyObject *args,PyObject *kwds */ if (wt->type->td_init == NULL) { - PyErr_Format(PyExc_TypeError,"%s cannot be instantiated or sub-classed (type->td_init == NULL)", wt->type->td_name); + PyErr_Format(PyExc_TypeError,"%s cannot be instantiated or sub-classed", wt->type->td_name); return NULL; } @@ -7206,12 +7139,13 @@ static int sipWrapper_init(sipWrapper *self,PyObject *args,PyObject *kwds) sipInitExtenderDef *ie = wt->iextend; /* - * If the parse was successful but no C/C++ object was created then - * we assume that handwritten code decided after the parse that - * it didn't want to handle the signature. + * If the parse was successful, and no exception has been raised, + * but no C/C++ object was created then we assume that handwritten + * code decided after the parse that it didn't want to handle the + * signature. */ - if (pstate == PARSE_OK) - pstate = PARSE_TYPE; + if (pstate == PARSE_OK && !PyErr_Occurred()) + pstate = argsparsed = PARSE_TYPE; /* * While we just have signature errors, try any initialiser @@ -7230,11 +7164,11 @@ static int sipWrapper_init(sipWrapper *self,PyObject *args,PyObject *kwds) if (sipNew == NULL) { - /* - * If the arguments were parsed without error then assume an - * exception has already been raised for why the instance - * wasn't created. - */ + /* + * If the arguments were parsed without error then assume an + * exception has already been raised for why the instance + * wasn't created. + */ if (pstate == PARSE_OK) argsparsed = PARSE_RAISED; siplib/siplib.c @@ -19,7 +19,7 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zm200 QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 -QMAKE_CFLAGS_RELEASE = -O1 -MD /Zi +QMAKE_CFLAGS_RELEASE = -O1 -MD QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = specs/win32-msvc @@ -19,7 +19,7 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zm200 QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 -QMAKE_CFLAGS_RELEASE = -Ox -MD -Zi -GL +QMAKE_CFLAGS_RELEASE = -O2 -MD QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = @@ -49,8 +49,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO /DEBUG -QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /LTCG +QMAKE_LFLAGS = /NOLOGO +QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS specs/win32-msvc.net @@ -16,7 +16,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- -Zi +QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD @@ -49,7 +49,7 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO /DEBUG +QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE specs/win32-msvc2008 d76fd426baee9d6a743da0d4f711e75c2e34f276 Kevin Watters kevinwatters@gmail.com http://github.com/kevinw/sip/commit/6d00ac1a1d9a9919463817724ea8aad404283e7a 6d00ac1a1d9a9919463817724ea8aad404283e7a 2008-06-02T08:15:17-07:00 2008-06-02T08:15:17-07:00 sip-4.7.7-snapshot-20080530 48cd04af6bd1ab2aac5bf1c08b9d1ea7d7b02d0c Kevin Watters kevinwatters@gmail.com