Loading...
--- xnu/xnu-2422.100.13/libkern/c++/OSUnserializeXML.cpp
+++ xnu/xnu-1228/libkern/c++/OSUnserializeXML.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 1999-2007 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -159,8 +159,6 @@
#include <libkern/c++/OSContainers.h>
#include <libkern/c++/OSLib.h>
-#define MAX_OBJECTS 65535
-
#define YYSTYPE object_t *
#define YYPARSE_PARAM state
#define YYLEX_PARAM (parser_state_t *)state
@@ -172,7 +170,7 @@
struct object *free;
struct object *elements;
OSObject *object;
- OSSymbol *key; // for dictionary
+ OSString *key; // for dictionary
int size;
void *data; // for data
char *string; // for string & symbol
@@ -191,16 +189,16 @@
OSDictionary *tags; // used to remember "ID" tags
OSString **errorString; // parse error with line
OSObject *parsedObject; // resultant object of parsed text
- int parsedObjectCount;
} parser_state_t;
#define STATE ((parser_state_t *)state)
#undef yyerror
#define yyerror(s) OSUnserializeerror(STATE, (s))
-static int OSUnserializeerror(parser_state_t *state, const char *s);
+static int OSUnserializeerror(parser_state_t *state, char *s);
static int yylex(YYSTYPE *lvalp, parser_state_t *state);
+static int yyparse(void * state);
static object_t *newObject(parser_state_t *state);
static void freeObject(parser_state_t *state, object_t *o);
@@ -212,7 +210,6 @@
static object_t *buildArray(parser_state_t *state, object_t *o);
static object_t *buildSet(parser_state_t *state, object_t *o);
static object_t *buildString(parser_state_t *state, object_t *o);
-static object_t *buildSymbol(parser_state_t *state, object_t *o);
static object_t *buildData(parser_state_t *state, object_t *o);
static object_t *buildNumber(parser_state_t *state, object_t *o);
static object_t *buildBoolean(parser_state_t *state, object_t *o);
@@ -221,6 +218,10 @@
extern void *kern_os_malloc(size_t size);
extern void *kern_os_realloc(void * addr, size_t size);
extern void kern_os_free(void * addr);
+
+//XXX shouldn't have to define these
+extern long strtol(const char *, char **, int);
+extern unsigned long strtoul(const char *, char **, int);
} /* extern "C" */
@@ -261,7 +262,7 @@
/* Line 216 of yacc.c. */
-#line 215 "OSUnserializeXML.tab.c"
+#line 216 "OSUnserializeXML.tab.c"
#ifdef short
# undef short
@@ -311,7 +312,7 @@
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -551,12 +552,12 @@
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const yytype_uint16 yyrline[] =
-{
- 0, 149, 149, 152, 157, 162, 170, 178, 186, 194,
- 202, 210, 218, 237, 240, 243, 246, 247, 262, 271,
- 283, 286, 289, 292, 295, 298, 301, 304, 311, 314,
- 317, 320, 323
+static const yytype_uint8 yyrline[] =
+{
+ 0, 150, 150, 153, 158, 163, 164, 165, 166, 167,
+ 168, 169, 170, 183, 186, 189, 192, 193, 198, 207,
+ 212, 215, 218, 221, 224, 227, 230, 233, 240, 243,
+ 246, 249, 252
};
#endif
@@ -753,7 +754,7 @@
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1497,14 +1498,14 @@
switch (yyn)
{
case 2:
-#line 149 "OSUnserializeXML.y"
+#line 150 "OSUnserializeXML.y"
{ yyerror("unexpected end of buffer");
YYERROR;
;}
break;
case 3:
-#line 152 "OSUnserializeXML.y"
+#line 153 "OSUnserializeXML.y"
{ STATE->parsedObject = (yyvsp[(1) - (1)])->object;
(yyvsp[(1) - (1)])->object = 0;
freeObject(STATE, (yyvsp[(1) - (1)]));
@@ -1513,98 +1514,49 @@
break;
case 4:
-#line 157 "OSUnserializeXML.y"
+#line 158 "OSUnserializeXML.y"
{ yyerror("syntax error");
YYERROR;
;}
break;
case 5:
-#line 162 "OSUnserializeXML.y"
- { (yyval) = buildDictionary(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
+#line 163 "OSUnserializeXML.y"
+ { (yyval) = buildDictionary(STATE, (yyvsp[(1) - (1)])); ;}
break;
case 6:
+#line 164 "OSUnserializeXML.y"
+ { (yyval) = buildArray(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 7:
+#line 165 "OSUnserializeXML.y"
+ { (yyval) = buildSet(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 8:
+#line 166 "OSUnserializeXML.y"
+ { (yyval) = buildString(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 9:
+#line 167 "OSUnserializeXML.y"
+ { (yyval) = buildData(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 10:
+#line 168 "OSUnserializeXML.y"
+ { (yyval) = buildNumber(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 11:
+#line 169 "OSUnserializeXML.y"
+ { (yyval) = buildBoolean(STATE, (yyvsp[(1) - (1)])); ;}
+ break;
+
+ case 12:
#line 170 "OSUnserializeXML.y"
- { (yyval) = buildArray(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 7:
-#line 178 "OSUnserializeXML.y"
- { (yyval) = buildSet(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 8:
-#line 186 "OSUnserializeXML.y"
- { (yyval) = buildString(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 9:
-#line 194 "OSUnserializeXML.y"
- { (yyval) = buildData(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 10:
-#line 202 "OSUnserializeXML.y"
- { (yyval) = buildNumber(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 11:
-#line 210 "OSUnserializeXML.y"
- { (yyval) = buildBoolean(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
- ;}
- break;
-
- case 12:
-#line 218 "OSUnserializeXML.y"
{ (yyval) = retrieveObject(STATE, (yyvsp[(1) - (1)])->idref);
if ((yyval)) {
(yyval)->object->retain();
@@ -1613,50 +1565,34 @@
YYERROR;
}
freeObject(STATE, (yyvsp[(1) - (1)]));
-
- STATE->parsedObjectCount++;
- if (STATE->parsedObjectCount > MAX_OBJECTS) {
- yyerror("maximum object count");
- YYERROR;
- }
;}
break;
case 13:
-#line 237 "OSUnserializeXML.y"
+#line 183 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (2)]);
(yyval)->elements = NULL;
;}
break;
case 14:
-#line 240 "OSUnserializeXML.y"
+#line 186 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (3)]);
(yyval)->elements = (yyvsp[(2) - (3)]);
;}
break;
case 17:
-#line 247 "OSUnserializeXML.y"
+#line 193 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(2) - (2)]);
(yyval)->next = (yyvsp[(1) - (2)]);
-
- object_t *o;
- o = (yyval)->next;
- while (o) {
- if (o->key == (yyval)->key) {
- yyerror("duplicate dictionary key");
- YYERROR;
- }
- o = o->next;
- }
;}
break;
case 18:
-#line 262 "OSUnserializeXML.y"
+#line 198 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (2)]);
- (yyval)->key = (OSSymbol *)(yyval)->object;
+ (yyval)->key = (OSString *)(yyval)->object;
(yyval)->object = (yyvsp[(2) - (2)])->object;
(yyval)->next = NULL;
(yyvsp[(2) - (2)])->object = 0;
@@ -1665,54 +1601,47 @@
break;
case 19:
-#line 271 "OSUnserializeXML.y"
- { (yyval) = buildSymbol(STATE, (yyvsp[(1) - (1)]));
-
-// STATE->parsedObjectCount++;
-// if (STATE->parsedObjectCount > MAX_OBJECTS) {
-// yyerror("maximum object count");
-// YYERROR;
-// }
- ;}
+#line 207 "OSUnserializeXML.y"
+ { (yyval) = buildString(STATE, (yyvsp[(1) - (1)])); ;}
break;
case 20:
-#line 283 "OSUnserializeXML.y"
+#line 212 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (2)]);
(yyval)->elements = NULL;
;}
break;
case 21:
-#line 286 "OSUnserializeXML.y"
+#line 215 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (3)]);
(yyval)->elements = (yyvsp[(2) - (3)]);
;}
break;
case 23:
-#line 292 "OSUnserializeXML.y"
+#line 221 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (2)]);
(yyval)->elements = NULL;
;}
break;
case 24:
-#line 295 "OSUnserializeXML.y"
+#line 224 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (3)]);
(yyval)->elements = (yyvsp[(2) - (3)]);
;}
break;
case 26:
-#line 301 "OSUnserializeXML.y"
+#line 230 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(1) - (1)]);
(yyval)->next = NULL;
;}
break;
case 27:
-#line 304 "OSUnserializeXML.y"
+#line 233 "OSUnserializeXML.y"
{ (yyval) = (yyvsp[(2) - (2)]);
(yyval)->next = (yyvsp[(1) - (2)]);
;}
@@ -1720,7 +1649,7 @@
/* Line 1267 of yacc.c. */
-#line 1671 "OSUnserializeXML.tab.c"
+#line 1600 "OSUnserializeXML.tab.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1934,18 +1863,19 @@
}
-#line 326 "OSUnserializeXML.y"
+#line 255 "OSUnserializeXML.y"
int
-OSUnserializeerror(parser_state_t * state, const char *s) /* Called by yyparse on errors */
-{
+OSUnserializeerror(parser_state_t * state, char *s) /* Called by yyparse on errors */
+{
+ char tempString[128];
+
if (state->errorString) {
- char tempString[128];
snprintf(tempString, 128, "OSUnserializeXML: %s near line %d\n", s, state->lineNumber);
*(state->errorString) = OSString::withCString(tempString);
}
-
+
return 0;
}
@@ -1955,7 +1885,7 @@
#define TAG_START 1
#define TAG_END 2
#define TAG_EMPTY 3
-#define TAG_IGNORE 4
+#define TAG_COMMENT 4
#define currentChar() (state->parseBuffer[state->parseBufferIndex])
#define nextChar() (state->parseBuffer[++state->parseBufferIndex])
@@ -1984,50 +1914,16 @@
if (c != '<') return TAG_BAD;
c = nextChar(); // skip '<'
-
- // <!TAG declarations >
- // <!-- comments -->
- if (c == '!') {
- c = nextChar();
- bool isComment = (c == '-') && ((c = nextChar()) != 0) && (c == '-');
- if (!isComment && !isAlpha(c)) return TAG_BAD; // <!1, <!-A, <!eos
-
- while (c && (c = nextChar()) != 0) {
- if (c == '\n') state->lineNumber++;
- if (isComment) {
- if (c != '-') continue;
- c = nextChar();
- if (c != '-') continue;
- c = nextChar();
- }
- if (c == '>') {
- (void)nextChar();
- return TAG_IGNORE;
- }
- if (isComment) break;
- }
- return TAG_BAD;
- }
-
- else
-
- // <? Processing Instructions ?>
- if (c == '?') {
- while ((c = nextChar()) != 0) {
- if (c == '\n') state->lineNumber++;
- if (c != '?') continue;
- c = nextChar();
- if (c == '>') {
- (void)nextChar();
- return TAG_IGNORE;
- }
- }
- return TAG_BAD;
- }
-
- else
-
- // </ end tag >
+ if (c == '?' || c == '!') {
+ while ((c = nextChar()) != 0) {
+ if (c == '\n') state->lineNumber++;
+ if (c == '>') {
+ (void)nextChar();
+ return TAG_COMMENT;
+ }
+ }
+ }
+
if (c == '/') {
c = nextChar(); // skip '/'
tagType = TAG_END;
@@ -2362,7 +2258,7 @@
tagType = getTag(STATE, tag, &attributeCount, attributes, values);
if (tagType == TAG_BAD) return SYNTAX_ERROR;
- if (tagType == TAG_IGNORE) goto top;
+ if (tagType == TAG_COMMENT) goto top;
// handle allocation and check for "ID" and "IDREF" tags up front
*lvalp = object = newObject(STATE);
@@ -2736,21 +2632,6 @@
};
object_t *
-buildSymbol(parser_state_t *state, object_t *o)
-{
- OSSymbol *symbol;
-
- symbol = (OSSymbol *)OSSymbol::withCString(o->string);
- if (o->idref >= 0) rememberObject(state, o->idref, symbol);
-
- free(o->string);
- o->string = 0;
- o->object = symbol;
-
- return o;
-};
-
-object_t *
buildData(parser_state_t *state, object_t *o)
{
OSData *data;
@@ -2780,7 +2661,7 @@
};
object_t *
-buildBoolean(parser_state_t *state __unused, object_t *o)
+buildBoolean(parser_state_t *state, object_t *o)
{
o->object = ((o->number == 0) ? kOSBooleanFalse : kOSBooleanTrue);
o->object->retain();
@@ -2806,7 +2687,6 @@
state->tags = OSDictionary::withCapacity(128);
state->errorString = errorString;
state->parsedObject = 0;
- state->parsedObjectCount = 0;
(void)yyparse((void *)state);
@@ -2817,17 +2697,6 @@
free(state);
return object;
-}
-
-OSObject*
-OSUnserializeXML(const char *buffer, size_t bufferSize, OSString **errorString)
-{
- if ((!buffer) || (!bufferSize)) return 0;
-
- // XML must be null terminated
- if (buffer[bufferSize - 1] || strnlen(buffer, bufferSize) == bufferSize) return 0;
-
- return OSUnserializeXML(buffer, errorString);
}