resolved merge conflict

2 files changed, 10 insertions, 5 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index bec2955..eca7c32 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 4006bc2..bc05f87 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -62,203 +62,208 @@ IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
 INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT

 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH

 DAMAGE.

 

 EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,

 INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE

 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 PURPOSE.

 

 The software is provided with RESTRICTED RIGHTS.  Use, duplication, or

 disclosure by the government are subject to restrictions set forth in

 DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.

 

 ***************************************************************************/

 

 /*

  * src: vcc.c

  * doc: Parser for vCard and vCalendar. Note that this code is

  * generated by a yacc parser generator. Generally it should not

  * be edited by hand. The real source is vcc.y. The #line directives

  * can be commented out here to make it easier to trace through

  * in a debugger. However, if a bug is found it should

  * be fixed in vcc.y and this file regenerated.

  */

 

 

 /* debugging utilities */

 #if __DEBUG

 #define DBG_(x) printf x

 #else

 #define DBG_(x)

 #endif

 

 /****  External Functions  ****/

 

 /* assign local name to parser variables and functions so that

    we can use more than one yacc based parser.

 */

 

 #if 0

 #define yyparse mime_parse

 #define yylex mime_lex

 #define yyerror mime_error

 #define yychar mime_char

 /* #define p_yyval p_mime_val */

 #undef yyval

 #define yyval mime_yyval

 /* #define p_yylval p_mime_lval */

 #undef yylval

 #define yylval mime_yylval

 #define yydebug mime_debug

 #define yynerrs mime_nerrs

 #define yyerrflag mime_errflag

 #define yyss mime_ss

 #define yyssp mime_ssp

 #define yyvs mime_vs

 #define yyvsp mime_vsp

 #define yylhs mime_lhs

 #define yylen mime_len

 #define yydefred mime_defred

 #define yydgoto mime_dgoto

 #define yysindex mime_sindex

 #define yyrindex mime_rindex

 #define yygindex mime_gindex

 #define yytable mime_table

 #define yycheck mime_check

 #define yyname mime_name

 #define yyrule mime_rule

 #ifdef YYPREFIX

 #undef YYPREFIX

 #endif

 #define YYPREFIX "mime_"

 #endif

 

 

 #ifndef _NO_LINE_FOLDING

 #define _SUPPORT_LINE_FOLDING 1

 #endif

 

 /* undef below if compile with MFC */

 /* #define INCLUDEMFC 1 */

 

 #if defined(WIN32) || defined(_WIN32)

 #ifdef INCLUDEMFC

 #include <afx.h>

 #endif

 #endif

 

 #include <string.h>

 #ifndef __MWERKS__

 #include <stdlib.h>

 #endif

 #include <stdio.h>

 #include <stdlib.h>

 #include <ctype.h>

 

-/*#ifdef PALMTOPCENTER
*/
-/*#include <qpe/vobject_p.h>
*/
-/*#else
*/
+/*#ifdef PALMTOPCENTER
+*/
+/*#include <qpe/vobject_p.h>
+*/
+/*#else
+*/
 #include "vobject_p.h"

-/*#endif
*/
+/*#endif
+*/
 

 /****  Types, Constants  ****/

 

 #define YYDEBUG		0	/* 1 to compile in some debugging code */

 #define MAXTOKEN	256	/* maximum token (line) length */

-#define YYSTACKSIZE 	100	/* ~unref ?
*/
+#define YYSTACKSIZE 	100	/* ~unref ?
+*/
 #define MAXLEVEL	10	/* max # of nested objects parseable */

 				/* (includes outermost) */

 

 

 /****  Global Variables  ****/

 int mime_lineNum, mime_numErrors; /* yyerror() can use these */

 static VObject* vObjList;

 static VObject *curProp;

 static VObject *curObj;

 static VObject* ObjStack[MAXLEVEL];

 static int ObjStackTop;

 

 

 /* A helpful utility for the rest of the app. */

 #if __CPLUSPLUS__

 extern "C" {

 #endif

 

     extern void yyerror(char *s);

 

 #if __CPLUSPLUS__

     };

 #endif

 

 int yyparse();

 

 enum LexMode {

 	L_NORMAL,

 	L_VCARD,

 	L_VCAL,

 	L_VEVENT,

 	L_VTODO,

 	L_VALUES,

 	L_BASE64,

 	L_QUOTED_PRINTABLE

 	};

 

 /****  Private Forward Declarations  ****/

 static int pushVObject(const char *prop);

 static VObject* popVObject();

 static void lexPopMode(int top);

 static int lexWithinMode(enum LexMode mode);

 static void lexPushMode(enum LexMode mode);

 static void enterProps(const char *s);

 static void enterAttr(const char *s1, const char *s2);

 static void enterValues(const char *value);

 #define mime_error yyerror

 void mime_error(char *s);

 void mime_error_(char *s);

 

 #line 189 "backend/vcc.y"
 typedef union {

     char *str;

     VObject *vobj;

     } YYSTYPE;
 #line 225 "y.tab.c"
 #define EQ 257
 #define COLON 258
 #define DOT 259
 #define SEMICOLON 260
 #define SPACE 261
 #define HTAB 262
 #define LINESEP 263
 #define NEWLINE 264
 #define BEGIN_VCARD 265
 #define END_VCARD 266
 #define BEGIN_VCAL 267
 #define END_VCAL 268
 #define BEGIN_VEVENT 269
 #define END_VEVENT 270
 #define BEGIN_VTODO 271
 #define END_VTODO 272
 #define ID 273
 #define STRING 274
 #define YYERRCODE 256
 short vcclhs[] = {                                        -1,
     0,    6,    6,    5,    5,    8,    3,    9,    3,    7,
     7,   13,   10,   10,   15,   11,   11,   14,   14,   16,
    17,   17,    1,   18,   12,   12,    2,    2,   20,    4,
    21,    4,   19,   19,   22,   22,   22,   25,   23,   26,
    23,   27,   24,   28,   24,
 };
 short vcclen[] = {                                         2,
     1,    2,    1,    1,    1,    0,    4,    0,    3,    2,
     1,    0,    5,    1,    0,    3,    1,    2,    1,    2,
     1,    3,    1,    0,    4,    1,    1,    0,    0,    4,
     0,    3,    2,    1,    1,    1,    1,    0,    4,    0,
     3,    0,    4,    0,    3,
 };
 short vccdefred[] = {                                      0,
     0,    0,    0,    4,    5,    3,    0,    0,    0,    0,
     0,    2,   14,   23,    0,    0,   11,    0,    9,    0,
     0,    0,    0,   34,   35,   36,   32,    0,    7,   10,
    12,    0,    0,    0,    0,   30,   33,    0,    0,   19,
     0,    0,   41,    0,   45,    0,   20,   18,   27,    0,
     0,   39,   43,    0,   24,   13,   22,    0,   25,